This commit was manufactured by cvs2svn to create tag 'v200409231600'. Sprout from master 2004-09-23 12:34:26 UTC Markus Keller <mkeller> '74568: Convert for loop QA too sensitive on caret position' Cherrypick from master 2004-09-23 14:34:55 UTC Markus Keller <mkeller> '74614: Code formatter preference page: bogus preview code': org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java Delete: org.eclipse.jdt.astview.feature/.project org.eclipse.jdt.astview.feature/build.properties org.eclipse.jdt.astview.feature/cpl-v10.html org.eclipse.jdt.astview.feature/eclipse_update_120.jpg org.eclipse.jdt.astview.feature/feature.properties org.eclipse.jdt.astview.feature/feature.xml org.eclipse.jdt.astview.feature/license.html org.eclipse.jdt.astview/.classpath org.eclipse.jdt.astview/.project org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.0.jar org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.1.jar org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.1.jar org.eclipse.jdt.astview/AST-View-Site/site.xml org.eclipse.jdt.astview/Adarrow.gif org.eclipse.jdt.astview/build.properties org.eclipse.jdt.astview/icons/c/collapseall.gif org.eclipse.jdt.astview/icons/c/expandall.gif org.eclipse.jdt.astview/icons/c/refresh.gif org.eclipse.jdt.astview/icons/c/setfocus.gif org.eclipse.jdt.astview/icons/c/synced.gif org.eclipse.jdt.astview/icons/d/collapseall.gif org.eclipse.jdt.astview/icons/d/expandall.gif org.eclipse.jdt.astview/icons/d/refresh.gif org.eclipse.jdt.astview/icons/d/setfocus.gif org.eclipse.jdt.astview/icons/d/synced.gif org.eclipse.jdt.astview/icons/e/collapseall.gif org.eclipse.jdt.astview/icons/e/expandall.gif org.eclipse.jdt.astview/icons/e/refresh.gif org.eclipse.jdt.astview/icons/e/setfocus.gif org.eclipse.jdt.astview/icons/e/synced.gif org.eclipse.jdt.astview/icons/view.gif org.eclipse.jdt.astview/index.html org.eclipse.jdt.astview/new.gif org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.1.zip org.eclipse.jdt.astview/plugin.xml org.eclipse.jdt.astview/refresh.gif org.eclipse.jdt.astview/setfocus.gif org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Binding.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/CommentsProperty.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemsProperty.java org.eclipse.jdt.astview/synced.gif org.eclipse.jdt.astview/view.gif org.eclipse.jdt.junit.core/.settings/org.eclipse.jdt.core.prefs org.eclipse.jdt.junit.core/plugin.properties org.eclipse.jdt.junit.core/plugin.xml org.eclipse.jdt.junit.core/schema/testRunListeners.exsd org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitCorePlugin.java org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.java org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.properties org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/ContainerComparator.java org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/IJUnitStatusConstants.java org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/ITestRunListener.java org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/JUnitCore.java org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/package.html org.eclipse.jdt.junit.runtime/.classpath org.eclipse.jdt.junit.runtime/.cvsignore org.eclipse.jdt.junit.runtime/.project org.eclipse.jdt.junit.runtime/.settings/org.eclipse.jdt.core.prefs org.eclipse.jdt.junit.runtime/.template org.eclipse.jdt.junit.runtime/about.html org.eclipse.jdt.junit.runtime/build.properties org.eclipse.jdt.junit.runtime/plugin.properties org.eclipse.jdt.junit.runtime/plugin.xml org.eclipse.jdt.junit.runtime/scripts/exportplugin.xml org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/JUnitMessages.java org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/JUnitMessages.properties org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/MessageIds.java org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java org.eclipse.jdt.junit/.classpath org.eclipse.jdt.junit/.cvsignore org.eclipse.jdt.junit/.project org.eclipse.jdt.junit/.settings/org.eclipse.jdt.core.prefs org.eclipse.jdt.junit/about.html org.eclipse.jdt.junit/build.properties org.eclipse.jdt.junit/icons/full/dlcl16/cfilter.gif org.eclipse.jdt.junit/icons/full/dlcl16/compare.gif org.eclipse.jdt.junit/icons/full/dlcl16/lock.gif org.eclipse.jdt.junit/icons/full/dlcl16/relaunch.gif org.eclipse.jdt.junit/icons/full/dlcl16/select_next.gif org.eclipse.jdt.junit/icons/full/dlcl16/select_prev.gif org.eclipse.jdt.junit/icons/full/dlcl16/stop.gif org.eclipse.jdt.junit/icons/full/dlcl16/th_automatic.gif org.eclipse.jdt.junit/icons/full/dlcl16/th_horizontal.gif org.eclipse.jdt.junit/icons/full/dlcl16/th_vertical.gif org.eclipse.jdt.junit/icons/full/dtool16/debugjunit.gif org.eclipse.jdt.junit/icons/full/dtool16/new_testcase.gif org.eclipse.jdt.junit/icons/full/dtool16/new_testsuite.gif org.eclipse.jdt.junit/icons/full/dtool16/runjunit.gif org.eclipse.jdt.junit/icons/full/elcl16/cfilter.gif org.eclipse.jdt.junit/icons/full/elcl16/compare.gif org.eclipse.jdt.junit/icons/full/elcl16/lock.gif org.eclipse.jdt.junit/icons/full/elcl16/relaunch.gif org.eclipse.jdt.junit/icons/full/elcl16/select_next.gif org.eclipse.jdt.junit/icons/full/elcl16/select_prev.gif org.eclipse.jdt.junit/icons/full/elcl16/stop.gif org.eclipse.jdt.junit/icons/full/elcl16/th_automatic.gif org.eclipse.jdt.junit/icons/full/elcl16/th_horizontal.gif org.eclipse.jdt.junit/icons/full/elcl16/th_vertical.gif org.eclipse.jdt.junit/icons/full/etool16/debugjunit.gif org.eclipse.jdt.junit/icons/full/etool16/new_testcase.gif org.eclipse.jdt.junit/icons/full/etool16/new_testsuite.gif org.eclipse.jdt.junit/icons/full/etool16/runjunit.gif org.eclipse.jdt.junit/icons/full/eview16/junit.gif org.eclipse.jdt.junit/icons/full/eview16/juniterr.gif org.eclipse.jdt.junit/icons/full/eview16/juniterrq.gif org.eclipse.jdt.junit/icons/full/eview16/junitsucc.gif org.eclipse.jdt.junit/icons/full/eview16/junitsuccq.gif org.eclipse.jdt.junit/icons/full/eview16/stackframe.gif org.eclipse.jdt.junit/icons/full/obj16/exc_catch.gif org.eclipse.jdt.junit/icons/full/obj16/faillist.gif org.eclipse.jdt.junit/icons/full/obj16/failures.gif org.eclipse.jdt.junit/icons/full/obj16/julaunch.gif org.eclipse.jdt.junit/icons/full/obj16/stkfrm_obj.gif org.eclipse.jdt.junit/icons/full/obj16/test.gif org.eclipse.jdt.junit/icons/full/obj16/testerr.gif org.eclipse.jdt.junit/icons/full/obj16/testfail.gif org.eclipse.jdt.junit/icons/full/obj16/testhier.gif org.eclipse.jdt.junit/icons/full/obj16/testok.gif org.eclipse.jdt.junit/icons/full/obj16/testrun.gif org.eclipse.jdt.junit/icons/full/obj16/tsuite.gif org.eclipse.jdt.junit/icons/full/obj16/tsuiteerror.gif org.eclipse.jdt.junit/icons/full/obj16/tsuitefail.gif org.eclipse.jdt.junit/icons/full/obj16/tsuiteok.gif org.eclipse.jdt.junit/icons/full/obj16/tsuiterun.gif org.eclipse.jdt.junit/icons/full/ovr16/error_ovr.gif org.eclipse.jdt.junit/icons/full/ovr16/failed_ovr.gif org.eclipse.jdt.junit/icons/full/ovr16/success_ovr.gif org.eclipse.jdt.junit/icons/full/prgss/ff1.gif org.eclipse.jdt.junit/icons/full/prgss/ff2.gif org.eclipse.jdt.junit/icons/full/prgss/ff3.gif org.eclipse.jdt.junit/icons/full/prgss/ff4.gif org.eclipse.jdt.junit/icons/full/prgss/ff5.gif org.eclipse.jdt.junit/icons/full/prgss/ff6.gif org.eclipse.jdt.junit/icons/full/prgss/ff7.gif org.eclipse.jdt.junit/icons/full/prgss/ff8.gif org.eclipse.jdt.junit/icons/full/prgss/ff9.gif org.eclipse.jdt.junit/icons/full/prgss/ss1.gif org.eclipse.jdt.junit/icons/full/prgss/ss2.gif org.eclipse.jdt.junit/icons/full/prgss/ss3.gif org.eclipse.jdt.junit/icons/full/prgss/ss4.gif org.eclipse.jdt.junit/icons/full/prgss/ss5.gif org.eclipse.jdt.junit/icons/full/prgss/ss6.gif org.eclipse.jdt.junit/icons/full/prgss/ss7.gif org.eclipse.jdt.junit/icons/full/prgss/ss8.gif org.eclipse.jdt.junit/icons/full/prgss/ss9.gif org.eclipse.jdt.junit/icons/full/wizban/newsuite_wiz.gif org.eclipse.jdt.junit/icons/full/wizban/newtest_wiz.gif org.eclipse.jdt.junit/plugin.properties org.eclipse.jdt.junit/plugin.xml org.eclipse.jdt.junit/schema/internal-testRunTabs.exsd org.eclipse.jdt.junit/schema/junitLaunchConfigs.exsd org.eclipse.jdt.junit/schema/testRunListeners.exsd org.eclipse.jdt.junit/scripts/exportplugin.xml org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/ContainerComparator.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitBaseLaunchConfiguration.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchConfiguration.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchConfigurationTab.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchShortcut.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitMainTab.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitTabGroup.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/ResourceExtender.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/TestSelectionDialog.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/JUnitRenameParticipant.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/LaunchConfigProjectChange.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/LaunchConfigTypeChange.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/ProjectRenameParticipant.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/TypeRenameParticipant.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultsAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CopyFailureListAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CopyTraceAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CounterPanel.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/EnableStackFilterAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTab.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/GotoReferencedTestAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/IJUnitHelpContextIds.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/IJUnitPreferencesConstants.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ITestRunListener2.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ITestRunListener3.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitHomeInitializer.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JavaTypeExtender.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAtLineAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ProgressImages.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/RemoteTestRunnerClient.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/RerunAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ScrollLockAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ShowNextFailureAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ShowPreviousFailureAction.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TabFolderLayout.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestHierarchyTab.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestMethodSelectionDialog.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunInfo.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunTab.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/ExceptionHandler.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/IJUnitStatusConstants.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStatus.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStubUtility.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/LayoutUtil.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/PixelConverter.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/Resources.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/SWTUtil.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/IAboutToRunOperation.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/JUnitWizard.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/MethodStubsSelectionButtonGroup.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizard.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage2.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.properties org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/ITestRunListener.java org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/JUnitCore.java org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/package.html org.eclipse.jdt.text.tests/.classpath org.eclipse.jdt.text.tests/.cvsignore org.eclipse.jdt.text.tests/.options org.eclipse.jdt.text.tests/.project org.eclipse.jdt.text.tests/.settings/org.eclipse.jdt.core.prefs org.eclipse.jdt.text.tests/OpenEditorTestSetup.launch org.eclipse.jdt.text.tests/OpenJavaEditorTest (upload).launch org.eclipse.jdt.text.tests/OpenTextEditorTest (upload).launch org.eclipse.jdt.text.tests/RevertJavaEditorTest (upload).launch org.eclipse.jdt.text.tests/RevertTextEditorTest (upload).launch org.eclipse.jdt.text.tests/about.html org.eclipse.jdt.text.tests/build.properties org.eclipse.jdt.text.tests/plugin.properties org.eclipse.jdt.text.tests/plugin.xml org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakIteratorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/CompilationUnitDocumentProviderTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/HTML2TextReaderTester.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JUnitProjectTestSetup.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaBreakIteratorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaColoringTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaDoc2HTMLTextReaderTester.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaHeuristicScannerTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaLineSegmentationTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaParameterListValidatorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerExtensionTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaWordIteratorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestPlugin.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PairMatcherTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PartitionTokenScannerTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/SemanticHighlightingTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/SmartSemicolonAutoEditStrategyTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/StringsTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/TestCase.txt org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/TestCase2.txt org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentFormatterUtil.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentTestCase.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentsTestSuite.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/JavaDocTestCase.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/MultiLineTestCase.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/SingleLineTestCase.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/Condition.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EditorTestHelper.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EmptyTestCase.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/FileTool.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/JavaIndenterTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollJavaEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollTextEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/NonInitialTypingTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorStressTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorTestSetup.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenPreferencePageTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenQuickOutlineTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenTextEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenTextEditorTestSetup.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestCase.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestSetup.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestSuite.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ResourceTestHelper.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertJavaEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertTextEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/SWTEventHelper.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollAnnotatedJavaEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollJavaEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollTextEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ToggleCommentTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoJavaEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoTextEditorTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/spelling/SpellCheckEngineTestCase.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/spelling/SpellingTestSuite.java org.eclipse.jdt.text.tests/test.xml org.eclipse.jdt.text.tests/testResources/folderLinkTarget1/.project org.eclipse.jdt.text.tests/testResources/folderLinkTarget1/test1/test2/C.java org.eclipse.jdt.text.tests/testResources/org.eclipse.swt-R3_0.zip org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/SHTest.java org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/test/ExternalClass.java org.eclipse.jdt.ui.examples.javafamily/.classpath org.eclipse.jdt.ui.examples.javafamily/.cvsignore org.eclipse.jdt.ui.examples.javafamily/.project org.eclipse.jdt.ui.examples.javafamily/.settings/org.eclipse.jdt.core.prefs org.eclipse.jdt.ui.examples.javafamily/ReleaseNotes.html org.eclipse.jdt.ui.examples.javafamily/about.html org.eclipse.jdt.ui.examples.javafamily/build.properties org.eclipse.jdt.ui.examples.javafamily/icons/full/clcl16/search_sortmatch.gif org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/brkp_obj.gif org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsearch_obj.gif org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsp_obj.gif org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/tomcat_obj.gif org.eclipse.jdt.ui.examples.javafamily/plugin.properties org.eclipse.jdt.ui.examples.javafamily/plugin.xml org.eclipse.jdt.ui.examples.javafamily/sample/Date2.java org.eclipse.jdt.ui.examples.javafamily/sample/easy.jsp org.eclipse.jdt.ui.examples.javafamily/scripts/exportplugin.xml org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndex.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexQuery.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexer.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/ISearchResultCollector.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationAdapter.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationTextHover.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DefaultAnnotationHover.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DocumentAdapter.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JavaReconcileStep.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandlerFactory.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspEditor.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspSourceViewerConfiguration.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspTranslatorResultCollector.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchOperation.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchPage2.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchResultCollector.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchMessages.properties org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchUtil.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewActionGroup.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewAdapter.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewSiteAdapter.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandler.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandlerFactory.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslator.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslatorResultCollector.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/TagHandlerFactory.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/AbstractJspParser.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JavaFamilyExamplePreferencePage.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspIndexParser.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMatchLocatorParser.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.properties org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspPluginImages.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/Util.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.properties org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointRulerActionDelegate.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatLaunchDelegate.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTabGroup.java org.eclipse.jdt.ui.examples.javafamily/stuff/Search.java org.eclipse.jdt.ui.examples.javafamily/stuff/easy.jsp org.eclipse.jdt.ui.examples.javafamily/stuff/easy_jsp.java org.eclipse.jdt.ui.examples.javafamily/stuff/exampleJspProject.zip org.eclipse.jdt.ui.examples.javafamily/stuff/index-format11 org.eclipse.jdt.ui.examples.projects/.classpath org.eclipse.jdt.ui.examples.projects/.cvsignore org.eclipse.jdt.ui.examples.projects/.project org.eclipse.jdt.ui.examples.projects/.settings/org.eclipse.jdt.core.prefs org.eclipse.jdt.ui.examples.projects/about.html org.eclipse.jdt.ui.examples.projects/archive/junit/junit381src.jar org.eclipse.jdt.ui.examples.projects/build.properties org.eclipse.jdt.ui.examples.projects/doc-html/cpy.gif org.eclipse.jdt.ui.examples.projects/doc-html/jdt_projects_ex.html org.eclipse.jdt.ui.examples.projects/doc-html/notices.html org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationOperation.java org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationWizard.java org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationWizardPage.java org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectMessages.java org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectMessages.properties org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectsPlugin.java org.eclipse.jdt.ui.examples.projects/icons/full/dtool16/newjprjex_wiz.gif org.eclipse.jdt.ui.examples.projects/icons/full/etool16/newjprjex_wiz.gif org.eclipse.jdt.ui.examples.projects/icons/full/wizban/newjprjex_wiz.gif org.eclipse.jdt.ui.examples.projects/plugin.properties org.eclipse.jdt.ui.examples.projects/plugin.xml org.eclipse.jdt.ui.examples.projects/scripts/exportplugin.xml org.eclipse.jdt.ui.tests.refactoring/.classpath org.eclipse.jdt.ui.tests.refactoring/.cvsignore org.eclipse.jdt.ui.tests.refactoring/.project org.eclipse.jdt.ui.tests.refactoring/.settings/org.eclipse.jdt.core.prefs org.eclipse.jdt.ui.tests.refactoring/about.html org.eclipse.jdt.ui.tests.refactoring/build.properties org.eclipse.jdt.ui.tests.refactoring/plugin.properties org.eclipse.jdt.ui.tests.refactoring/plugin.xml org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/cannot/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test10_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test10_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test11_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test11_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test12_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test12_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test13_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test13_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test14_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test14_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test15_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test15_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test16_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test16_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test17_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test17_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test18_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test18_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test19_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test19_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test20_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test20_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test21_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test21_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test22_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test22_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test23_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test23_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test24_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test24_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test25_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test25_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test26_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test26_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test6_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test6_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test7_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test7_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test8_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test8_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test9_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test9_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd28_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd28_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd29_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd29_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd30_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd30_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd31_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd31_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd32_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd32_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd33_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd33_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddRecursive1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddRecursive1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddReorderRename34_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddReorderRename34_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll35_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll35_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll36_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll36_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll37_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll37_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll38_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll38_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll39_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll39_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll40_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll40_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll41_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll41_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll42_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll42_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll43_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll43_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll44_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll44_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll45_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll45_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll46_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll46_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll47_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll47_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll48_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll48_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll49_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll49_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll50_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll50_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll51_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll51_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll52_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll52_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll53_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll53_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll54_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll54_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll55_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll55_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll56_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll56_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll57_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll57_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll58_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll58_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll59_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll59_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll60_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll60_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll61_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll61_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException01_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException01_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException02_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException02_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException03_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException03_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException04_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException04_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport01_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport01_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport02_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport02_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport03_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport03_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport04_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport04_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport05_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport05_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport06_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport06_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport08_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport08_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic01_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic01_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic02_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic02_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName01_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName01_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName02_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName02_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder26_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder26_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder27_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder27_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFail1.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd2.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd3.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd4.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll5.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll6.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll7.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll8.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailImport01.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testArray_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testArray_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testBogusSelection_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testBogusSelection_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testFieldOfLocalType_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testFieldOfLocalType_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testInvalidSelection_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testInvalidSelection_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testMultiDeclaration_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testMultiDeclaration_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testObjectReturnType_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testObjectReturnType_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testOverriddenBinaryMethod_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testOverriddenBinaryMethod_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testPrimitive_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testPrimitive_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testUpdateNotPossible_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testUpdateNotPossible_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testArray_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDeclSubtypesOfList_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDeclSubtypesOfList_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDecl_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDecl_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldName_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldName_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldType_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldType_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldUseSubtypesOfList_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldUseSubtypesOfList_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess2.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testHashMap_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testHashMap_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testImport_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testImport_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testInterfaceTypes_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testInterfaceTypes_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalSuperTypesOfArrayList_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalSuperTypesOfArrayList_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarCast_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarCast_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarDecl_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarDecl_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarName_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarName_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarType_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarType_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarUse_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarUse_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUClass1.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUClass2.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUInterface1.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUInterface2.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCU_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCU_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDeclWithOverride_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDeclWithOverride_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDecl_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDecl_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterNameWithOverride_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterNameWithOverride_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterName_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterName_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverride_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverride_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding2.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterType_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterType_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType2.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnTypeWithCall_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnTypeWithCall_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testString_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testString_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test10_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test10_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test11_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test11_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test12_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test12_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test13_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test13_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test14_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test14_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test15_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test15_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test16_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test16_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test17_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test17_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test18_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test18_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test19_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test19_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test20_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test20_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test21_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test21_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test22_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test22_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test23_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test23_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test24_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test24_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test25_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test25_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test26_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test26_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test27_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test27_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test28_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test28_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test6_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test6_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test7_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test7_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test8_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test8_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test9_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test9_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail1.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail2.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail3.java org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail4.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_declared_in_multi_yes_type/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_declared_in_multi_yes_type/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_yes_field/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_yes_field/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type_1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type_1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_method/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_method/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_type/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_type/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_field/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_field/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_initializer/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_initializer/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_itself/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_itself/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_other_method/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_other_method/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_type/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_type/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/CopyPackageChange/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail10.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail11.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail12.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail13.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail14.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail15.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail2.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail3.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail4.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail5.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail6.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail7.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName0.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral0.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/Inter.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/Inter.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Inter.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Outer.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Inter.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Outer.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/As.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/As.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/As.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/As.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/As.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/As.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/As.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/As.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/OldInterface.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/OldInterface.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/OldInterface.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/OldInterface.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Bar.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Foo.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Bar.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Foo.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/X.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/X.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/X.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/X.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/Bag.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.classpath org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.project org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A_test450.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/BBB.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_5690.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/C.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/E.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/L.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/MyTest.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Philippe.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10031.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10245.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337_1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T4165.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T7368.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T9815.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Wcf.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/X.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Z.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test750.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test751.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test752.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test753.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test754.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test755.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test750.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test751.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test752.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test753.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test754.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test755.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1050.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1051.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1050.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1051.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test950.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test951.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test952.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test953.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test954.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test955.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test956.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test957.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test958.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test959.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test960.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test961.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test962.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test963.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test964.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test950.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test951.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test952.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test953.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test954.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test955.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test956.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test957.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test958.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test959.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test960.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test961.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test962.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test963.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test964.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test800.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test801.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test802.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test800.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test801.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test802.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test600.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test601.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test602.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test603.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test604.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test605.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test606.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test607.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test608.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test609.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test610.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test611.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test612.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test613.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test615.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test616.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test617.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test618.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test619.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test620.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test621.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test622.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test600.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test601.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test602.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test603.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test604.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test605.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test606.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test607.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test608.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test609.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test610.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test611.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test612.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test613.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test614.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test615.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test616.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test617.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test618.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test619.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test620.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test621.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test622.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/handTests/Comments.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1000.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1001.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1002.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1003.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1000.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1001.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1002.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1003.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test010.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test011.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test012.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test013.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test014.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test015.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test020.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test021.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test022.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test030.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test031.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test040.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test041.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test042.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test043.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test044.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test045.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test046.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test047.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test048.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test050.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test051.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test052.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test060.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test061.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test062.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test063.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test070.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test071.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test072.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test073.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test080.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test081.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test082.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test083.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test084.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test085.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test090.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test091.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test092.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test093.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test094.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test095.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test096.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test100.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test101.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test102.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test103.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test104.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test105.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test106.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test107.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test108.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test109.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test110.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test111.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test112.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test113.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test114.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test115.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test116.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test120.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test121.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test122.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test123.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test130.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test131.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test140.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test141.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test142.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test143.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test144.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test145.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test146.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test147.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test148.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test149.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test150.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test151.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test152.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test153.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test160.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test161.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test170.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test171.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test172.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test173.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test180.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test181.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test190.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test191.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test192.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test193.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test194.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test500.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test501.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test502.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test503.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test504.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test505.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test506.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test507.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test508.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test509.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test510.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test511.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test512.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test513.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test514.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test515.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test516.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test517.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test518.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test519.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test520.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test521.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test522.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test523.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test524.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test525.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test526.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test527.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test528.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test530.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test531.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test532.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test533.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test534.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test535.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test536.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test537.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test538.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test539.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test540.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test541.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test542.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test543.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test550.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test551.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test552.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test553.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test554.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test555.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test556.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test557.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test558.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test559.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test560.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test561.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test562.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test563.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test564.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test565.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test566.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test567.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test568.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test569.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test500.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test501.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test502.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test503.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test504.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test505.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test506.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test507.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test508.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test509.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test510.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test511.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test512.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test513.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test514.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test515.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test516.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test517.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test518.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test519.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test520.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test521.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test522.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test523.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test524.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test525.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test526.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test527.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test528.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test530.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test531.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test532.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test533.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test534.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test535.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test536.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test537.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test538.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test539.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test540.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test541.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test542.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test543.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test550.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test551.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test552.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test553.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test554.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test555.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test556.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test557.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test558.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test559.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test560.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test561.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test562.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test563.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test564.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test565.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test566.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test567.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test568.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test569.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test650.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test651.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test652.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test653.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test654.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test650.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test651.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test652.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test653.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test654.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test900.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test901.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test902.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test903.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test904.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test905.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test906.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test903.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test904.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test905.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test906.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test700.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test701.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test702.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test703.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test704.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test705.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test706.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test707.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test708.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test709.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test710.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test711.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test712.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test713.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test714.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test715.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test716.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test717.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test718.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test719.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test720.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test721.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test722.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test723.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test724.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test725.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test726.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test727.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test728.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test700.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test701.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test702.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test703.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test704.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test705.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test706.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test707.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test708.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test709.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test710.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test711.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test712.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test713.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test714.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test715.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test716.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test717.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test718.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test719.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test720.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test721.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test722.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test723.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test724.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test725.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test726.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test727.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test728.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test2.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test3.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test4.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test400.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test401.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test402.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test403.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test404.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test406.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test407.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test409.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test410.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test400.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test401.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test402.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test403.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test404.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test406.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test407.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test409.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test410.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/F.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test450.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test451.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test452.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test453.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test454.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test455.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test456.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test457.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test458.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test459.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test460.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test461.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test462.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test450.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test451.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test452.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test453.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test454.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test455.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test456.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test457.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test458.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test459.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test460.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test461.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test462.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test200.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test201.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test202.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test203.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test230.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test231.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test232.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test233.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test234.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test235.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test240.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test241.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test244.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test245.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test246.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test247.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test248.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test249.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test250.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test251.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test252.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test253.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test254.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test255.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test260.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test261.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test262.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test263.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test270.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test271.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test272.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test273.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test274.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test275.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test280.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test281.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test282.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test283.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test284.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test285.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test286.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test287.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test300.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test301.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test302.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test303.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test304.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test305.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test306.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test307.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test308.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test309.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test310.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test311.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test350.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test351.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test352.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test353.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test360.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test361.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test362.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test363.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test364.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test365.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test360.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test361.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test362.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test363.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test364.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test365.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2001.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2002.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2003.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2004.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2005.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2001.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2002.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2003.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2004.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2005.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail1.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail10.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail11.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail12.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail13.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail14.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail15.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail16.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail17.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail18.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail19.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail2.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail20.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail21.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail22.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail23.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail24.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail25.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail26.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail27.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail28.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail29.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail3.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail30.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail31.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail32.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail33.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail34.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail35.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail36.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail37.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail4.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail5.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail6.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail7.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail8.java org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail9.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext0.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext1.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext2.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext3.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious0.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious1.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious2.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious3.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious4.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious5.java org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious6.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/Declarer.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/InlineSite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/Declarer.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/InlineSite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/InlineSite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/InlineSite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/in/GrueziWohl.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/out/GrueziWohl.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/in/Froehlichkeit.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/out/Froehlichkeit.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/in/Klass.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/out/Klass.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/in/LeVinSuperieure.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/out/LeVinSuperieure.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/in/Klus.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/out/Klus.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/in/PartOfDeclNameSelected.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/out/PartOfDeclNameSelected.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/in/CursorPositionedInReference.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/out/CursorPositionedInReference.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/in/PartOfReferenceSelected.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/out/PartOfReferenceSelected.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/D.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/D.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/E.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail0/in/NeueZuercherZeitung.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail1/in/Fun.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.classpath org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.project org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/A.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/B.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/C.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/E.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/InlineBug.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestArray.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestFieldReference.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceRead.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferencePrefix.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceUnused.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestOneRead.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed4.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestTwoReads.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestArray.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestFieldReference.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceRead.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferencePrefix.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceUnused.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestOneRead.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed4.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestTwoReads.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatementWithReturn.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestParenthesis.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatementWithReturn.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestParenthesis.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloaded.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrimitives.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrivate.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNoCast.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotCastableOverloaded.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotOverloaded.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloaded.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloadedPrimitives.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestReceiverCast.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloaded.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrimitives.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrivate.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNoCast.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotCastableOverloaded.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotOverloaded.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloaded.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloadedPrimitives.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestReceiverCast.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentOne.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentTwo.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForEmpty.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForOne.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForTwo.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfElseTwo.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfThenTwo.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentOne.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentTwo.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForEmpty.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForOne.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForTwo.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfElseTwo.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfThenTwo.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestAssignment.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestConditionalExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestReturnStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleBody.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpressionWithStatements.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestAssignment.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestConditionalExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestReturnStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleBody.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpressionWithStatements.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/Provider.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseArray.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInArgument.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInClassLiteral.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDeclClash.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInLocalClass.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/Provider.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseArray.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInArgument.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInClassLiteral.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDeclClash.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInLocalClass.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_use/List.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestComplexBody.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestLocalInitializer.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultiLocal.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestRecursion.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestBlocks.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestFieldInType.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestLocalInType.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameLocal.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameType.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeAfter.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeInSibling.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSwitchStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestTwoCalls.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestBlocks.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestFieldInType.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestLocalInType.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameLocal.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameType.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeAfter.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeInSibling.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSwitchStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionOneImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionTwoImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionZeroImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestFieldReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameThisReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNoImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestReceiverWithStatic.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestStaticReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionOneImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionTwoImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionZeroImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestFieldReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameThisReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNoImplicitReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestReceiverWithStatic.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestStaticReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestEmptyBody.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestInitializer.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestLabeledStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestPrimitiveArray.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSuper.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTypeArray.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestEmptyBody.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestInitializer.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestLabeledStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestPrimitiveArray.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSuper.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTypeArray.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_in.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_out.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail1.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail10.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail11.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail12.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail13.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail14.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail2.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail3.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail4.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail5.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail6.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail7.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail8.java org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail9.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/TestClass.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/TestClass_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/UseTestClass.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/UseTestClass_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189/TestClass.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189/TestClass_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189B/TestClass.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189B/TestClass_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46373/ImplicitCtor.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46373/ImplicitCtor_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46374/QualifiedName.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46374/QualifiedName_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p1/TT.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p1/TT_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p2/TT.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p2/TT_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/A_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/B.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/B_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/58293/ImplicitSuperCtorCall.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/58293/ImplicitSuperCtorCall_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59280/ExplicitSuperCtorCall.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59280/ExplicitSuperCtorCall_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj1/pA/A.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj1/pA/A_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj2/pB/B.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj2/pB/B_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59284/ArgTypeImport.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59284/ArgTypeImport_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/negative/A_testFail0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/negative/NestedClass_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/CtorThrows.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/CtorThrows_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs3.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentSigs.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentSigs_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/InstanceContext_FFF.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/InstanceContext_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1A_FFF_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1A_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1B_FFF_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1B_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1C_FFF_out.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1C_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultipleCallers_FFF.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultipleCallers_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/Names_FFF.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/Names_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/SelectConstructor.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/SelectConstructor_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticContext_FFF.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticContext_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticInstance.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticInstance_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NoExpression1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NoMethodBinding.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod3.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/PartName1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/PartString.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantExpression1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantExpression2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantString.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Constructor1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Formatting1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Javadoc1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Javadoc2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/NewInstance1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/NewInstanceImport.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/StaticGetter1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantExpression1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantExpression2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantString.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Constructor1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Formatting1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Javadoc1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Javadoc2.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/NewInstance1.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/NewInstanceImport.java org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/StaticGetter1.java org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_no_methodToItself/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_fieldToOtherType/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_fieldToOtherType/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_initializerToOtherType/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_initializerToOtherType/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_methodToOtherType/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_methodToOtherType/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/out/Inner.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/P.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/TC.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/TR.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/P.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/TC.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/TR.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/in/TC.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/in/TR.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/out/TC.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/out/TR.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test16/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test16/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/in/Rectangle.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/in/Shape.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/out/Rectangle.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/out/Shape.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/in/Rectangle.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/in/Shape.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/out/Rectangle.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/out/Shape.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/in/Rectangle.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/in/Shape.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/out/Rectangle.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/out/Shape.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/StarDecorator.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/StarDecorator.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/in/Second.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/out/Second.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/in/Second.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/out/Second.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/in/Second.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/out/Second.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/StarDecorator.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/StarDecorator.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/in/Nestor.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/out/Nestor.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/N1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/N1.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail0/in/IA.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail11/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail2/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail3/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail4/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail5/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail6/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail8/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test32/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail0/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail1/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail10/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail11/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail12/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail13/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail14/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail15/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail16/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail17/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail18/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail19/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail2/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail21/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail24/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail3/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail4/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail5/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail6/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail7/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail8/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail9/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p1/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p2/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p1/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p2/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p1/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p2/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p1/B.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p2/A.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p2/C.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p1/Outer.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p1/empty.txt org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p2/empty.txt org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p3/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p1/empty.txt org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p2/Outer.java org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p2/empty.txt org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p3/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test10_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test10_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test11_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test11_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test12_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test12_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test13_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test13_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test14_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test14_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test15_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test15_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test16_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test16_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test17_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test17_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test18_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test18_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test19_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test19_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test20_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test20_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test21_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test21_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test22_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test6_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test6_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test7_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test7_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test8_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test8_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test9_in.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test9_out.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail1.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail2.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail3.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail4.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail5.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail6.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement0.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement1.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement2.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement3.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement4.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement5.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement6.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement7.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement8.java org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement9.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test29/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test30/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test31/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test32/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test33/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test34/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test35/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test36/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test37/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test38/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test39/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test40/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test41/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test41/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test42/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test42/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test43/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test43/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail10/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail11/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail12/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail6/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail7/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail8/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail9/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFailTemplate/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testField0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testField0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldMethod0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldMethod0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testTemplate/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testTemplate/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RefactoringScanner/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RefactoringScanner/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test29/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test30/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test31/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test32/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test33/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test34/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test35/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test36/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test37/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test38/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test39/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test40/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test41/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test41/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test42/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test42/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test43/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test43/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test44/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test44/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test45/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test45/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test46/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test46/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test47/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test47/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail41/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail42/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail43/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail44/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail45/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testBug5821/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testBug5821/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test0/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test0/out/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test1/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test1/out/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/in/fred/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/out/fred/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/out/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/in/fred/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/in/r/r/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/out/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/out/r/r/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/in/r/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/out/q/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/out/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test5/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test5/out/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test6/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test6/out/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail0/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail1/in/r/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail10/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail10/in/r/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail11/in/q/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail11/in/q/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail2/in/r/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail3/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail4/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail5/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail6/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail7/in/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail7/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail8/in/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail8/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail9/in/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail9/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcPrg/p/p/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/p/p/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/tests/AllTests.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcPrg/q/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/p/p/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcPrg/p/p/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/TestHelper.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/AllTests.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/QualifiedTests.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcPrg/q/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/TestHelper.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/QualifiedTests.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/in/srcPrg/p/p/ToQ.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/in/srcTest/p/p/Ref.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/out/srcPrg/q/ToQ.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/out/srcTest/p/p/Ref.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcTest/p/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcTest/p/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/in/srcPrg/p/p/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/in/srcTest/p/p/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/out/srcPrg/p/p/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/out/srcTest/q/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/in/srcPrg/p/p/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/in/srcTest/p/p/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/out/srcPrg/p/p/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/out/srcTest/cheese/ATest.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.other/pack/Namesake.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/Referer.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/man/StarImporter.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj/pack/DingsDa.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.other/pack/Namesake.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/Referer.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/man/StarImporter.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj/com/packt/DingsDa.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testReadOnly/in/r/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testReadOnly/out/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test10_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test10_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test11_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test11_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test12_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test12_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test13_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test13_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test14_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test14_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test15_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test15_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test16_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test16_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test17_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test17_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test18_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test18_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test19_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test19_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test20_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test20_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test21_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test21_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test22_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test22_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test23_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test23_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test24_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test24_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test25_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test25_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test26_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test26_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test27_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test27_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test28_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test28_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test29_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test29_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test30_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test30_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test31_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test31_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test32_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test32_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test33_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test33_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test34_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test34_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test35_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test35_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test36_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test36_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test6_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test6_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test7_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test7_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test8_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test8_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test9_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test9_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail1.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail10.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail11.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail12.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail13.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail14.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail15.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail16.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail17.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail18.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail19.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail2.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail20.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail21.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail3.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail4.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail5.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail6.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail7.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail8.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail9.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/a.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testAnon0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testAnon0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test0_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test0_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test11_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test11_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test12_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test12_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test13_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test13_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test14_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test14_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test15_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test15_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test16_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test16_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test17_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test17_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test18_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test18_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test19_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test19_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test1_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test1_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test20_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test20_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test21_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test21_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test22_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test22_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test23_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test23_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test24_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test24_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test25_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test25_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test26_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test26_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test27_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test27_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test28_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test28_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test29_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test29_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test2_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test2_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test30_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test30_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test31_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test31_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test32_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test32_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test33_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test33_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test34_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test34_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test35_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test35_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test36_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test36_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test37_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test37_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test38_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test38_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test39_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test39_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test3_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test3_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test40_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test40_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test41_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test41_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test42_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test42_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test43_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test43_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test44_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test44_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test45_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test45_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test46_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test46_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test47_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test47_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test48_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test48_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test49_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test49_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test4_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test4_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test50_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test50_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test51_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test51_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test5_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test5_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test6_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test6_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test7_in.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test7_out.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail0.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail1.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail10.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail11.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail12.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail13.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail14.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail15.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail16.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail17.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail18.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail19.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail2.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail20.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail21.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail22.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail23.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail24.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail25.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail26.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail27.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail28.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail29.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail3.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail30.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail31.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail32.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail4.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail5.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail6.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail7.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail8.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail9.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test0/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test1/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test10/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/in/AA.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/out/AA.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test12/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test13/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test14/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test15/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test16/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test17/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test18/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test19/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test2/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test20/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test21/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test22/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test23/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test24/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test25/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test26/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test27/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test28/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test3/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/in/AA.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/out/AA.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/in/AA.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/out/AA.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test32/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test33/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test34/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test35/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test36/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test37/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test38/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test39/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test4/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test40/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test41/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test41/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test42/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test42/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test43/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test43/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test44/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test44/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test45/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test45/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test47/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test47/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test48/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test48/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test49/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test49/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test5/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test50/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test50/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test52/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test52/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test53/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test53/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test54/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test54/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test55/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test55/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/default/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/default/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test57/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test57/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test58/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test58/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test59/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test59/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test6/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test60/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test60/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test61/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test61/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test62/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test62/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test7/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test8/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test9/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail00/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail01/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail02/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail03/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail04/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail20/in/AA.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail21/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail22/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/Bogus.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail24/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail25/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail26/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail27/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail32/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail37/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail4/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail41/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail42/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail43/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail44/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail45/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail46/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail47/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail48/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail49/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail50/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail51/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail52/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail53/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail54/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail55/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail56/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail57/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail58/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail59/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail60/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail61/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail62/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail63/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail64/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail65/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail66/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail67/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail68/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail69/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail70/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail71/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail72/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail73/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail74/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail75/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail76/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail77/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail78/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail79/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail8/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail80/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail81/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail82/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail83/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail84/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail85/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail86/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail87/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail88/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail89/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail90/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail91/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail92/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail93/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail94/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail95/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalInnerClass/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testNoOp/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/in/build.xml org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/out/build.xml org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test29/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test30/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test31/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test32/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test33/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test34/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test35/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test36/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test37/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test38/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test39/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test40/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testAnon0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testAnon0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testLocal0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testLocal0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/A.java org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/B.java org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/launcher.gif org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/p1/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/.project org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/X.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/Y.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestFinal.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPostfixInt.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPrefixBoolean.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPrefixInt.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestThisExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestThisExpressionInner.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestTwoFragments.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestFinal.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPostfixInt.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPrefixBoolean.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPrefixInt.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestThisExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestThisExpressionInner.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestTwoFragments.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/bb.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/invalid/TestInvalidOverwrite.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/invalid/TestPostfixExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestArrayRead.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite2.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite3.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestFinalField.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestNestedRead.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterAsReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInAssignment.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInInitialization.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleRead.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleReadWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestArrayRead.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite2.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite3.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestFinalField.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestNestedRead.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterAsReceiver.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInAssignment.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInInitialization.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleRead.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleReadWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleWrite.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test010.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test011.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test012.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test013.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test014.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test015.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test020.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test021.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test022.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test030.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test031.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test040.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test042.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test043.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test044.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test045.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test046.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test047.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test050.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test051.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test052.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test060.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test061.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test062.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test063.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test070.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test071.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test072.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test073.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test081.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test082.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test083.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test084.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test085.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test100.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test101.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test102.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test103.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test104.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test105.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test106.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test107.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test108.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test109.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test110.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test111.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test112.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test113.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test114.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test115.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test120.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test131.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test150.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test151.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test152.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test153.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test160.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test161.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test170.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test171.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test172.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test173.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test1.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test2.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test3.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test4.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test041_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test048_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test080_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test090_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test091_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test092_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test093_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test094_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test095_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test096_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test121_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test122_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test130_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test140_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test141_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test142_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test143_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test144_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test145_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test146_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test147_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test148_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test149_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test180_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test181_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test190_.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test200.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test201.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test202.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test203.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test230.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test231.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test232.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test233.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test234.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test235.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test240.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test241.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test242.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test243.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test244.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test245.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test246.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test247.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test248.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test249.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test250.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test251.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test252.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test253.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test254.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test255.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test260.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test261.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test262.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test263.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test270.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test271.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test272.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test273.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test274.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test275.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test280.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test281.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test282.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test283.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test284.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test285.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test286.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test287.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test300.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test301.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test302.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test303.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test304.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test305.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test306.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test307.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test308.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test309.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test310.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test311.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test350.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test351.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test352.java org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test353.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test0.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test0_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test1.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test10.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test10_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test11.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test11_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test12.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test12_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test13.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test13_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test14.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test14_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test15.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test15_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test16.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test16_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test17.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test17_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test18.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test18_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test19.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test19_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test1_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test2.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test20.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test20_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test21.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test21_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test22.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test22_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test23.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test23_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test24.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test24_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test25.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test25_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test26.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test26_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test27.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test27_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test28.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test28_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test29.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test29_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test2_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test3.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test30.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test30_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test31.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test31_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test32.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test32_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test33.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test33_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test34.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test34_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test35.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test35_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test36.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test36_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test37.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test37_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test38.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test38_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test39.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test39_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test3_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test4.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test40.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test40_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test4_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test5.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test5_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test6.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test6_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test7.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test7_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test8.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test8_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test9.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test9_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testWholeCu.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testWholeCu_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength0.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength0_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength1.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength1_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength2.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength2_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength3.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength3_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength4.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength4_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength5.java org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength5_out.txt org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/OffsetTest.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/.cvsignore org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/.project org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/A.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/D.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestAlreadyCaught.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestDeclarationInitializer.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExceptionOrder.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExpressionStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInitializer.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInitializerThrowsException.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInvalidParent1.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInvalidParent2.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestMultiLine.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestNested.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestNoException.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestOneLine.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestRuntimeException1.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestRuntimeException2.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSimple.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestStaticField.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSuperCall.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSuperConstructorCall.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThenStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThisConstructorCall.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThrowInCatch.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal1.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal2.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal3.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal4.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal5.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal6.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestDeclarationInitializer.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExceptionOrder.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExpression.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExpressionStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestInitializer.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestInitializerThrowsException.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestMultiLine.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestNested.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestOneLine.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestRuntimeException1.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestSimple.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestSuperCall.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestThenStatement.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestThrowInCatch.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal1.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal2.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal3.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal4.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal5.java org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal6.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints0.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints1.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints10.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints11.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints12.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints13.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints14.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints15.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints16.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints17.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints18.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints19.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints2.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints20.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints21.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints22.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints23.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints3.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints4.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints5.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints6.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints7.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints8.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints9.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber0.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber1.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber2.java org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testUpdatableExtractInterfaceRanges0.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/A1.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/Inter.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/Inter.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/Inter.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/Outer.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/Inter.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/Outer.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/As.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/As.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/As.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/As.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/in/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/out/I.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew0/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew0/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew1/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew1/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew17/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew17/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew18/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew18/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew19/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew19/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew2/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew2/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew20/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew20/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew21/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew21/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/C.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/C.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew29/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew29/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew3/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew3/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew30/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew30/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew31/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew31/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew32/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew32/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew33/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew33/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew34/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew34/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew35/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew35/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew36/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew36/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew37/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew37/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew38/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew38/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/B.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/in/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/out/Test.java org.eclipse.jdt.ui.tests.refactoring/resources/templates/test/in/A.java org.eclipse.jdt.ui.tests.refactoring/resources/templates/test/out/A.java org.eclipse.jdt.ui.tests.refactoring/resources/templates/testFail/in/A.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/AllTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/GoToNextPreviousMemberActionTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/StructureSelectionActionTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/all/AllAllTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/changes/AllTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/changes/TrackPositionTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/AllTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/CellEditorTester.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSElementTester.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSHintTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSHolderTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSScannerTester.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSSourceModifierTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSSubstitutionTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCheckFinalConditionsTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCheckInitialConditionsTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCreateChangeTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringTestHelper.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/PropertyFileDocumentModellTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/SimpleLineReaderTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AbstractSelectionTestCase.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllChangeTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllRefactoringTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AugmentRawContainerClientsTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeTypeRefactoringTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ConvertAnonymousToNestedTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/CopyPackageChangeTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractConstantTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractInterfaceTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractTempTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineConstantTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineTempTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceParameterTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/Java15Setup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/LineColumnSelectionTestCase.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToTopLevelTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveMembersTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/NullRefactoring.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ParticipantTesting.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PathTransformationTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PromoteTempToFieldTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringScannerTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameFieldTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameJavaProjectTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodInInterfaceTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameNonPrivateFieldTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePackageTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameParametersTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePrivateFieldTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePrivateMethodTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameResourceChangeTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameSourceFolderChangeTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameStaticMethodTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTempTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeParameterTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameVirtualMethodInClassTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SurroundWithTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SurroundWithTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestCreateParticipantShared.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestCreateParticipantSingle.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestDeleteParticipantShared.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestDeleteParticipantSingle.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestMoveParticipantShared.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestMoveParticipantSingle.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantShared.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantSingle.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/UndoManagerTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/UseSupertypeWherePossibleTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/AllTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/ExtensionPointTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/ExtensionPointTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/AbstractCUTestCase.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/AbstractRefactoringTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/DebugUtils.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockClipboard.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockWorkbenchSite.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringPerformanceTestCase.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringPerformanceTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestPlugin.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/SWTProjectTestSetup.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/SimpleSelectionProvider.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/TextRangeUtil.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveCompilationUnitPrefTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveStaticMemberPrefTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenameMethodPerfTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenamePackagePerfTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenameTypePerfTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AllReorgPerformanceTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests1.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests2.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests1.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests2.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests1.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests2.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodWithHidingPerfTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodWithOverloadPerfTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests1.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests2.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfAcceptanceTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests1.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests2.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/TestProject.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/AllTests.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyResourcesToClipboardActionTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyToClipboardActionTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/DeleteTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MockReorgQueries.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MoveTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MultiMoveTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/PasteActionTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/PasteResourcesFromClipboardActionTest.java org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/typeconstraints/TypeConstraintTests.java org.eclipse.jdt.ui.tests.refactoring/test.xml org.eclipse.jdt.ui.tests/.classpath org.eclipse.jdt.ui.tests/.cvsignore org.eclipse.jdt.ui.tests/.plugins-path org.eclipse.jdt.ui.tests/.project org.eclipse.jdt.ui.tests/.settings/org.eclipse.jdt.core.prefs org.eclipse.jdt.ui.tests/about.html org.eclipse.jdt.ui.tests/activation/org/eclipse/jdt/ui/tests/activation/JavaActivationTest.java org.eclipse.jdt.ui.tests/build.properties org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ChkpiiTests.java org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreErrorsUnix.txt org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreErrorsWindows.txt org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreFiles.txt org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/AddTestMarkersAction.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/CheckBoxExample.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/DialogFieldExample.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MultiElementListSelectorExample.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyProjectCreationWizard.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyQuickAssistProcessor.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyQuickFixProcessor.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TabExample.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TreeListDialogFieldExample.java org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TwoPaneElementSelectorExample.java org.eclipse.jdt.ui.tests/launchconfigs/PerformanceTestSuite.launch org.eclipse.jdt.ui.tests/leaks/LeakTestExample.launch org.eclipse.jdt.ui.tests/leaks/ProfileNatives.dll org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/LeakTestCase.java org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/LeakTestSetup.java org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfileException.java org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfileNatives.java org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfilerConnector.java org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/example/LeakTestExample.java org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/FileTool.java org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/JdtPerformanceTestCase.java org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/PerformanceTestSuite.java org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/SWTTestProject.java org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/PackageExplorerPerfTest.java org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/TypeHierarchyPerfTest.java org.eclipse.jdt.ui.tests/plugin.properties org.eclipse.jdt.ui.tests/plugin.xml org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaElementDecorator.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaProjectHelper.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaTestPlugin.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/StringAsserts.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/TestOptions.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/TestOptionsSetup.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/test/HelloWorld.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/test/JavaTestCase.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/AccessibilityTestPass.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/DialogCheck.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/FailureDialog.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/FocusTestPass.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/IDialogTestPass.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/SizingTestPass.java org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/VerifyDialog.java org.eclipse.jdt.ui.tests/test.xml org.eclipse.jdt.ui.tests/testresources/compoundtest.jar org.eclipse.jdt.ui.tests/testresources/junit37-noUI-src.zip org.eclipse.jdt.ui.tests/testresources/myinternallib.jar org.eclipse.jdt.ui.tests/testresources/mylib.jar org.eclipse.jdt.ui.tests/testresources/org.eclipse.swt-R3_0.zip org.eclipse.jdt.ui.tests/testresources/rtstubs.jar org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/AutomatedSuite.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/LeakTestSuite.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/UIInteractiveSuite.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/astrewrite/ASTRewritingCollapseTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/astrewrite/ASTRewritingTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/MockPluginView.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewContentProviderTests.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewContentProviderTests2.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewDeltaTests.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/TestDelta.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/callhierarchy/CallHierarchyContentProviderTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/callhierarchy/CallHierarchyTestHelper.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddUnimplementedConstructorsTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddUnimplementedMethodsTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AllTypesCacheTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/BindingsNameTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CallHierarchyTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ClassPathDetectorTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CodeCompletionTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CodeFormatterUtilTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CoreTests.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/HierarchicalASTVisitorTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/JavaElementLabelsTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/JavaModelUtilTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/NameProposerTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/PartialASTTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ProjectTestSetup.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ScopeAnalyzerTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeHierarchyTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeInfoTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeRulesTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/DialogsTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/DialogsTest2.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/PreferencesTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/WizardsTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests1.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests2.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests3.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests4.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests5.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/MockPluginView.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageExplorerContentProviderTests.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/TestDelta.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AdvancedQuickAssistTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ContributedQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ConvertForLoopQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/LocalCorrectionsQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/MarkerResolutionGenerator.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/MarkerResolutionTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ModifierCorrectionsQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReorgQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReturnTypeQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/SerialVersionQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/TypeMismatchQuickFixTests.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedMethodsQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedTypesQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedVariablesQuickFixTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/FileAdapterTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/JUnitSourceSetup.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/ParticipantTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchLeakTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/TestParticipant.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/TreeContentProviderTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/WorkspaceReferenceTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/WorkspaceScopeTest.java org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/wizardapi/NewJavaProjectWizardTest.java org.eclipse.jdt.ui.vcm/.classpath org.eclipse.jdt.ui.vcm/.cvsignore org.eclipse.jdt.ui.vcm/.project org.eclipse.jdt.ui.vcm/.vcm_meta org.eclipse.jdt.ui.vcm/about.html org.eclipse.jdt.ui.vcm/build.properties org.eclipse.jdt.ui.vcm/plugin.properties org.eclipse.jdt.ui.vcm/plugin.xml.off org.eclipse.jdt.ui.vcm/scripts/exportplugin.xml org.eclipse.ltk.core.refactoring.tests/.classpath org.eclipse.ltk.core.refactoring.tests/.cvsignore org.eclipse.ltk.core.refactoring.tests/.project org.eclipse.ltk.core.refactoring.tests/.settings/org.eclipse.jdt.core.prefs org.eclipse.ltk.core.refactoring.tests/.template org.eclipse.ltk.core.refactoring.tests/about.html org.eclipse.ltk.core.refactoring.tests/build.properties org.eclipse.ltk.core.refactoring.tests/plugin.properties org.eclipse.ltk.core.refactoring.tests/plugin.xml org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/AllTests.java org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/EmptySuite.java org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/RefactoringCoreTestPlugin.java org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/Element.java org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ElementRenameProcessor.java org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ElementRenameRefactoring.java org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipant.java org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipant2.java org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipantTests.java org.eclipse.ltk.core.refactoring.tests/test.xml org.eclipse.ltk.core.refactoring/.classpath org.eclipse.ltk.core.refactoring/.cvsignore org.eclipse.ltk.core.refactoring/.project org.eclipse.ltk.core.refactoring/.settings/org.eclipse.jdt.core.prefs org.eclipse.ltk.core.refactoring/about.html org.eclipse.ltk.core.refactoring/build.properties org.eclipse.ltk.core.refactoring/buildnotes_ltk-core-refactoring.html org.eclipse.ltk.core.refactoring/plugin.properties org.eclipse.ltk.core.refactoring/plugin.xml org.eclipse.ltk.core.refactoring/schema/createParticipants.exsd org.eclipse.ltk.core.refactoring/schema/deleteParticipants.exsd org.eclipse.ltk.core.refactoring/schema/moveParticipants.exsd org.eclipse.ltk.core.refactoring/schema/renameParticipants.exsd org.eclipse.ltk.core.refactoring/scripts/exportplugin.xml org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Change.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CheckConditionsOperation.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CompositeChange.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/ContentStamp.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CreateChangeOperation.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/DocumentChange.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/FileStatusContext.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IRefactoringCoreStatusCodes.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IUndoManager.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IUndoManagerListener.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IValidationCheckResultQuery.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/NullChange.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformRefactoringOperation.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Refactoring.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringCore.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatus.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatusContext.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatusEntry.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextChange.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextEditChangeGroup.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextFileChange.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/UndoManagerAdapter.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/UndoTextFileChange.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/package.html org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CreateArguments.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CreateParticipant.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteArguments.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteParticipant.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteProcessor.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteRefactoring.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/IConditionChecker.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ISharableParticipant.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveArguments.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveParticipant.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveProcessor.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveRefactoring.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ParticipantExtensionPoint.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ParticipantManager.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringArguments.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringProcessor.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameArguments.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameParticipant.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameProcessor.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameRefactoring.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/SharableParticipants.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ValidateEditChecker.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/package.html org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Assert.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/AssertionFailedException.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/BufferValidationState.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Changes.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ContentStamps.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ListenerList.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/NotCancelableProgressMonitor.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ParticipantDescriptor.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCoreMessages.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCoreMessages.properties org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCorePlugin.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCorePreferences.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Resources.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/SaveListener.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/TextChanges.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoDocumentChange.java org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoManager.java org.eclipse.ltk.ui.refactoring.tests/.classpath org.eclipse.ltk.ui.refactoring.tests/.cvsignore org.eclipse.ltk.ui.refactoring.tests/.project org.eclipse.ltk.ui.refactoring.tests/.settings/org.eclipse.jdt.core.prefs org.eclipse.ltk.ui.refactoring.tests/about.html org.eclipse.ltk.ui.refactoring.tests/build.properties org.eclipse.ltk.ui.refactoring.tests/plugin.properties org.eclipse.ltk.ui.refactoring.tests/plugin.xml org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/AllTests.java org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/EmptySuite.java org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java org.eclipse.ltk.ui.refactoring.tests/test.xml org.eclipse.ltk.ui.refactoring/.classpath org.eclipse.ltk.ui.refactoring/.cvsignore org.eclipse.ltk.ui.refactoring/.project org.eclipse.ltk.ui.refactoring/.settings/org.eclipse.jdt.core.prefs org.eclipse.ltk.ui.refactoring/about.html org.eclipse.ltk.ui.refactoring/build.properties org.eclipse.ltk.ui.refactoring/icons/full/obj16/change.gif org.eclipse.ltk.ui.refactoring/icons/full/obj16/composite_change.gif org.eclipse.ltk.ui.refactoring/icons/full/obj16/cu_change.gif org.eclipse.ltk.ui.refactoring/icons/full/obj16/error_obj.gif org.eclipse.ltk.ui.refactoring/icons/full/obj16/fatalerror_obj.gif org.eclipse.ltk.ui.refactoring/icons/full/obj16/file_change.gif org.eclipse.ltk.ui.refactoring/icons/full/obj16/info_obj.gif org.eclipse.ltk.ui.refactoring/icons/full/obj16/text_edit.gif org.eclipse.ltk.ui.refactoring/icons/full/obj16/warning_obj.gif org.eclipse.ltk.ui.refactoring/icons/full/wizban/refactor_wiz.gif org.eclipse.ltk.ui.refactoring/plugin.properties org.eclipse.ltk.ui.refactoring/plugin.xml org.eclipse.ltk.ui.refactoring/schema/changePreviewViewers.exsd org.eclipse.ltk.ui.refactoring/schema/statusContextViewers.exsd org.eclipse.ltk.ui.refactoring/scripts/exportplugin.xml org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractDescriptor.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/Assert.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AssertionFailedException.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElement.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementContentProvider.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeExceptionHandler.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangePreviewViewerDescriptor.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DefaultChangeElement.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ErrorWizardPage.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ExceptionHandler.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FileStatusContextViewer.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FinishResult.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IChangeElementChildrenCreator.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IPreviewWizardPage.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IRefactoringHelpContextIds.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/InternalAPI.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/NotCancelableProgressMonitor.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PseudoJavaChangeElement.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPreferencePage.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusContentProvider.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusDialog.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusEntryLabelProvider.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusViewer.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIMessages.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIMessages.properties org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIPlugin.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog2.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/StatusContextViewerDescriptor.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextChangePreviewViewer.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangeElement.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/UIPerformChangeOperation.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/UndoManagerAction.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/WorkbenchRunnableAdapter.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/PixelConverter.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/Strings.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/ViewerPane.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/ChangePreviewViewerInput.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IChangePreviewViewer.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IRefactoringUIStatusCodes.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IStatusContextViewer.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RedoRefactoringAction.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringUI.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizardOpenOperation.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizardPage.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/TextStatusContextViewer.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/UndoRefactoringAction.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/UserInputWizardPage.java org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/package.html org.junit/.classpath org.junit/.project org.junit/about.html org.junit/build.properties org.junit/junit.jar org.junit/junitsrc.zip org.junit/plugin.properties org.junit/plugin.xml org.junit/scripts/exportplugin.xml

commit: b172d9f9511cd18238f650ce4b73ffd32df67ec7 [log] [tgz]
author: cvs2svn <platform-releng-dev@eclipse.org> Thu Sep 23 14:34:56 2004 +0000
committer: cvs2svn <platform-releng-dev@eclipse.org> Thu Sep 23 14:34:56 2004 +0000
tree: d5db9539ef6c86677780e30c124dfb65cc69dc3f
parent: a222b4f61e4f2706e670c8cef9e6f52494012de3 [diff]
diff --git a/org.eclipse.jdt.astview.feature/.project b/org.eclipse.jdt.astview.feature/.project
deleted file mode 100644
index eec119c..0000000
--- a/org.eclipse.jdt.astview.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.astview.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.astview.feature/build.properties b/org.eclipse.jdt.astview.feature/build.properties
deleted file mode 100644
index c9dacd2..0000000
--- a/org.eclipse.jdt.astview.feature/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.property,\
-               cpl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties

diff --git a/org.eclipse.jdt.astview.feature/cpl-v10.html b/org.eclipse.jdt.astview.feature/cpl-v10.html
deleted file mode 100644
index 36aa208..0000000
--- a/org.eclipse.jdt.astview.feature/cpl-v10.html
+++ /dev/null

@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<TITLE>Common Public License - v 1.0</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" VLINK="#800000">
-
-
-<P ALIGN="CENTER"><B>Common Public License - v 1.0</B>
-<P><B></B><FONT SIZE="3"></FONT>
-<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT").  ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>1.  DEFINITIONS</B></FONT>
-<P><FONT SIZE="2">"Contribution" means:</FONT>
-
-<UL><FONT SIZE="2">a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and<BR CLEAR="LEFT">
-b) in the case of each subsequent Contributor:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i)	 	changes to the Program, and</FONT></UL>
-
-
-<UL><FONT SIZE="2">ii)		additions to the Program;</FONT></UL>
-
-
-<UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.  </FONT><FONT SIZE="2">A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf.  </FONT><FONT SIZE="2">Contributions do not include additions to the Program which:  (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.  </FONT></UL>
-
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.  </FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT>
-<P><FONT SIZE="2"><B></B></FONT>
-<P><FONT SIZE="2"><B>2.  GRANT OF RIGHTS</B></FONT>
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a)	</FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.</FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) 	Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form.  This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents.  The patent license shall not apply to any other combinations which include the Contribution.  No hardware per se is licensed hereunder.   </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">c)	Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity.  Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise.  As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any.  For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.</FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">d)	Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2"><B>3.  REQUIREMENTS</B></FONT>
-<P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT>
-
-<UL><FONT SIZE="2">a)	it complies with the terms and conditions of this Agreement; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">b)	its license agreement:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i)	effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL>
-
-
-<UL><FONT SIZE="2">ii) 	effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
-
-
-<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2">	states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">iv)	states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
-
-
-<UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2">When the Program is made available in source code form:</FONT>
-
-<UL><FONT SIZE="2">a)	it must be made available under this Agreement; and </FONT></UL>
-
-
-<UL><FONT SIZE="2">b)	a copy of this Agreement must be included with each copy of the Program.  </FONT></UL>
-
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program.  </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.  </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>4.  COMMERCIAL DISTRIBUTION</B></FONT>
-<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like.  While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors.   Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering.  The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement.  In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations.  The Indemnified Contributor may participate in any such claim at its own expense.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">For example, a Contributor might include the Program in a commercial product offering, Product X.  That Contributor is then a Commercial Contributor.  If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.  Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5.  NO WARRANTY</B></FONT>
-<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT SIZE="2"> and assumes all risks associated with its exercise of rights under this Agreement</FONT><FONT SIZE="2">, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, </FONT><FONT SIZE="2">programs or equipment, and unavailability or interruption of operations</FONT><FONT SIZE="2">.  </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6.  DISCLAIMER OF LIABILITY</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>7.  GENERAL</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed.  In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance.  If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable.  However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.  </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted  and may only be modified in the following manner. The Agreement Steward reserves the right to </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward.   IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity.  </FONT><FONT SIZE="2">Each new version of the Agreement will be given a distinguishing version number.  The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new </FONT><FONT SIZE="2">version.  </FONT><FONT SIZE="2">Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, </FONT><FONT SIZE="2">by implication, estoppel or otherwise</FONT><FONT SIZE="2">.</FONT><FONT SIZE="2">  All rights in the Program not expressly granted under this Agreement are reserved.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose.  Each party waives its rights to a jury trial in any resulting litigation.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-
-</BODY>
-
-</HTML>
\ No newline at end of file

diff --git a/org.eclipse.jdt.astview.feature/eclipse_update_120.jpg b/org.eclipse.jdt.astview.feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.jdt.astview.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview.feature/feature.properties b/org.eclipse.jdt.astview.feature/feature.properties
deleted file mode 100644
index 3fc5c9a..0000000
--- a/org.eclipse.jdt.astview.feature/feature.properties
+++ /dev/null

@@ -1,98 +0,0 @@
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse Java Development Tools AST View
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-
-# "description" property - description of the feature
-description=Java Development Tools AST View
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE.ORG SOFTWARE USER AGREEMENT\n\
-17th June, 2002\n\
-\n\
-ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Unless otherwise indicated, all Content made available by Eclipse.org\n\
-is provided to you under the terms and conditions of the Common Public\n\
-License Version 1.0 ("CPL"). A copy of the CPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/cpl-v10.html.\n\
-For purposes of the CPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by Eclipse.org is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory. The Abouts, Feature\n\
-Licenses and Feature Update Licenses may refer to the CPL or other\n\
-license agreements, notices or terms and conditions . It is your\n\
-obligation to read and accept all such all terms and conditions prior\n\
-to use of the Content. If no About, Feature License or Feature Update\n\
-License is provided, please contact Eclipse.org to determine what terms\n\
-and conditions govern that particular Content.\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
-########### end of license property ##########################################

diff --git a/org.eclipse.jdt.astview.feature/feature.xml b/org.eclipse.jdt.astview.feature/feature.xml
deleted file mode 100644
index b77871c..0000000
--- a/org.eclipse.jdt.astview.feature/feature.xml
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jdt.astview.feature"
-      label="org.eclipse.jdt.astview.feature"
-      version="1.0.1"
-      provider-name="Eclipse.org">
-
-   <install-handler/>
-
-   <description>
-      %description
-   </description>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jdt.astview"
-         download-size="0"
-         install-size="0"
-         version="1.0.1"/>
-
-</feature>

diff --git a/org.eclipse.jdt.astview.feature/license.html b/org.eclipse.jdt.astview.feature/license.html
deleted file mode 100644
index 00d784b..0000000
--- a/org.eclipse.jdt.astview.feature/license.html
+++ /dev/null

@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse.org Software User Agreement</h2>
-<p>17th June, 2002</p>
-
-<p>ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<p>Unless otherwise indicated, all Content made available by Eclipse.org is provided to you under the terms and conditions of the Common Public License Version 1.0
-   (&quot;CPL&quot;).  A copy of the CPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-   For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<p>Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named &quot;feature.xml&quot; may contain a list of the names and version numbers of  the Plug-ins and/or Fragments associated with a Feature.   Plug-ins and Fragments are located in directories
-   named &quot;plugins&quot; and Features are located in directories named &quot;features&quot;.</p>
-  
-<p>Features may also include other Features (&quot;Included Features&quot;). Files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</p>
-  
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Subdirectories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by Eclipse.org is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot;.
-Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.  The Abouts, Feature Licenses and Feature Update Licenses may refer to the CPL or other license agreements, notices or terms and conditions . It is your obligation to read and accept all such all terms and conditions prior to use of the Content.
-If no About, Feature License or Feature Update License is provided, please contact Eclipse.org to determine what terms and conditions govern that particular Content.</p>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-</body>
-</html>

diff --git a/org.eclipse.jdt.astview/.classpath b/org.eclipse.jdt.astview/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.jdt.astview/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.astview/.project b/org.eclipse.jdt.astview/.project
deleted file mode 100644
index c3d8e13..0000000
--- a/org.eclipse.jdt.astview/.project
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.astview</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.filebuffers</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jface.text</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.editors</project>
-		<project>org.eclipse.ui.ide</project>
-		<project>org.eclipse.ui.views</project>
-		<project>org.eclipse.ui.workbench.texteditor</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml b/org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml
deleted file mode 100644
index 515a8e1..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/.sitebuild/sitebuild.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site-build
-      feature-location="features"
-      plugin-location="plugins"
-      autobuild="false"
-      scrub-output="false"
-      use-console="true">
-   <feature id="org.eclipse.jdt.astview.feature" version="1.0.0"/>
-</site-build>

diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.0.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.0.jar
deleted file mode 100644
index 8cc6233..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.1.jar b/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.1.jar
deleted file mode 100644
index 6beb68f..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/features/org.eclipse.jdt.astview.feature_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar
deleted file mode 100644
index 12cf517..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.0.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.1.jar b/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.1.jar
deleted file mode 100644
index 3c1c8d3..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/plugins/org.eclipse.jdt.astview_1.0.1.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/AST-View-Site/site.xml b/org.eclipse.jdt.astview/AST-View-Site/site.xml
deleted file mode 100644
index 2b576aa..0000000
--- a/org.eclipse.jdt.astview/AST-View-Site/site.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-
-   <description>
-      Update site for AST View
-   </description>
-   <feature url="features/org.eclipse.jdt.astview.feature_1.0.1.jar" id="org.eclipse.jdt.astview.feature" version="1.0.1">
-      <category name="ast-view-1.0.1"/>
-   </feature>
-   <category-def name="ast-view-1.0.1" label="AST View">
-      <description>
-         Optional view to visualize the Java compilers abstract syntax tree generated for a Java file.
-      </description>
-   </category-def>
-</site>
-

diff --git a/org.eclipse.jdt.astview/Adarrow.gif b/org.eclipse.jdt.astview/Adarrow.gif
deleted file mode 100644
index 1848247..0000000
--- a/org.eclipse.jdt.astview/Adarrow.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/build.properties b/org.eclipse.jdt.astview/build.properties
deleted file mode 100644
index 6117bde..0000000
--- a/org.eclipse.jdt.astview/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.ASTView.jar = src/
-bin.includes = plugin.xml,\
-               *.jar,\
-               ASTView.jar,\
-               icons/,\
-               src/
-src.includes = src/

diff --git a/org.eclipse.jdt.astview/icons/c/collapseall.gif b/org.eclipse.jdt.astview/icons/c/collapseall.gif
deleted file mode 100644
index bb8ecbf..0000000
--- a/org.eclipse.jdt.astview/icons/c/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/c/expandall.gif b/org.eclipse.jdt.astview/icons/c/expandall.gif
deleted file mode 100644
index d56c0f5..0000000
--- a/org.eclipse.jdt.astview/icons/c/expandall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/c/refresh.gif b/org.eclipse.jdt.astview/icons/c/refresh.gif
deleted file mode 100644
index a063c23..0000000
--- a/org.eclipse.jdt.astview/icons/c/refresh.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/c/setfocus.gif b/org.eclipse.jdt.astview/icons/c/setfocus.gif
deleted file mode 100644
index 0533fc2..0000000
--- a/org.eclipse.jdt.astview/icons/c/setfocus.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/c/synced.gif b/org.eclipse.jdt.astview/icons/c/synced.gif
deleted file mode 100644
index f865f3a..0000000
--- a/org.eclipse.jdt.astview/icons/c/synced.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/d/collapseall.gif b/org.eclipse.jdt.astview/icons/d/collapseall.gif
deleted file mode 100644
index 83e9c92..0000000
--- a/org.eclipse.jdt.astview/icons/d/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/d/expandall.gif b/org.eclipse.jdt.astview/icons/d/expandall.gif
deleted file mode 100644
index ab2b2e6..0000000
--- a/org.eclipse.jdt.astview/icons/d/expandall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/d/refresh.gif b/org.eclipse.jdt.astview/icons/d/refresh.gif
deleted file mode 100644
index b2281b4..0000000
--- a/org.eclipse.jdt.astview/icons/d/refresh.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/d/setfocus.gif b/org.eclipse.jdt.astview/icons/d/setfocus.gif
deleted file mode 100644
index b8e29ff..0000000
--- a/org.eclipse.jdt.astview/icons/d/setfocus.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/d/synced.gif b/org.eclipse.jdt.astview/icons/d/synced.gif
deleted file mode 100644
index ae5d548..0000000
--- a/org.eclipse.jdt.astview/icons/d/synced.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/e/collapseall.gif b/org.eclipse.jdt.astview/icons/e/collapseall.gif
deleted file mode 100644
index 3409b11..0000000
--- a/org.eclipse.jdt.astview/icons/e/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/e/expandall.gif b/org.eclipse.jdt.astview/icons/e/expandall.gif
deleted file mode 100644
index ec923bb..0000000
--- a/org.eclipse.jdt.astview/icons/e/expandall.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/e/refresh.gif b/org.eclipse.jdt.astview/icons/e/refresh.gif
deleted file mode 100644
index 919423d..0000000
--- a/org.eclipse.jdt.astview/icons/e/refresh.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/e/setfocus.gif b/org.eclipse.jdt.astview/icons/e/setfocus.gif
deleted file mode 100644
index b920e33..0000000
--- a/org.eclipse.jdt.astview/icons/e/setfocus.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/e/synced.gif b/org.eclipse.jdt.astview/icons/e/synced.gif
deleted file mode 100644
index ae5d548..0000000
--- a/org.eclipse.jdt.astview/icons/e/synced.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/icons/view.gif b/org.eclipse.jdt.astview/icons/view.gif
deleted file mode 100644
index b50b2c3..0000000
--- a/org.eclipse.jdt.astview/icons/view.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/index.html b/org.eclipse.jdt.astview/index.html
deleted file mode 100644
index aa108ca..0000000
--- a/org.eclipse.jdt.astview/index.html
+++ /dev/null

@@ -1,128 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-  <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-  <title>JDT UI Component Development Resources</title>
-  <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
- type="text/css">
-</head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);">
-&nbsp;
-<table border="0" cellpadding="2" cellspacing="5" width="100%">
-  <tbody>
-    <tr>
-      <td colspan="2" align="left" bgcolor="#0080c0" valign="top"><b><font
- face="Arial,Helvetica"><font color="#ffffff">org.eclipse.jdt.astview
-- AST View<br>
-      </font></font></b></td>
-    </tr>
-    <tr>
-      <td align="right" valign="top" width="2%"><img src="Adarrow.gif"
- border="0" height="16" width="16"></td>
-      <td width="98%"><b>Purpose</b>
-      <p>A view to visualize the AST (abstract syntax tree) of a Java
-file open in the editor. Navigate from text selection to AST nodes and
-from nodes to selections.<br>
-      </p>
-      </td>
-    </tr>
-    <tr>
-      <td align="right" valign="top" width="2%"><img src="Adarrow.gif"
- border="0" height="16" width="16"></td>
-      <td width="98%"><b>Install</b><br>
-      <p>requires<b> Eclipse 3.0</b> or greater<br>
-      </p>
-      <div style="margin-left: 40px;">
-      <ul>
-        <li>use the update feature and go to
-the AST View Update Site:<br>
-          <br>
-          <span style="font-weight: bold;">http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.astview/AST-View-Site<br>
-          <br>
-          </span></li>
-        <li>manually download and install<span
- style="font-weight: bold;"><br>
-          <br>
-          <a href="org.eclipse.jdt.astview_1.0.1.zip">org.eclipse.jdt.astview_1.0.1.zip</a><br>
-          </span></li>
-      </ul>
-      </div>
-      </td>
-    </tr>
-    <tr>
-      <td align="right" valign="top" width="2%"><img src="Adarrow.gif"
- border="0" height="16" width="16"></td>
-      <td width="98%"><b>Usage</b>
-      <ol>
-        <li>Open the AST view from the view menu: Window &gt; Show View
-&gt; Other... Java &gt; AST View </li>
-        <li><font color="#000000">Open a Java file in the editor </font>
-        </li>
-        <li>Click on 'Show AST of active editor' (<img
- style="width: 16px; height: 16px;" src="setfocus.gif" alt=""> ) to
-populate the view: The view shows the AST of the file opened in the
-editor and will also reveal the element corresponding to the current
-text selection<br>
-        </li>
-        <li><font color="#000000">Enable 'Link with editor' (</font><img
- style="width: 16px; height: 16px;" src="synced.gif" alt="">) to
-automatically track the active editor and the selection in the active
-editor.<br>
-        </li>
-        <li>Double click on AST nodes to get the corresponding element
-revealed in the editor.</li>
-        <li>Double click again to see the 'extended range' of a node,
-that means the range including all comments associated with it (comment
-mapper heuristic).</li>
-        <li>When the AST's underlying document has been changed use
-'Refresh' (<img style="width: 16px; height: 16px;" src="refresh.gif"
- alt="">)&nbsp; to update the AST.<br>
-        </li>
-      </ol>
-      <b>AST View Elements</b><br>
-      <br>
-The AST view shows the following nodes<br>
-      <img alt="AST View" src="view.gif"><br>
-      <ul>
-        <li>AST nodes are shown in gray color and with source range
-information. Children of AST nodes are the node properties.<br>
-        </li>
-        <li>node properties have names that are all all capitalized.
-Node properties represent lists of child nodes, a child node or a
-primitive node attribute (String, int or boolean)<br>
-        </li>
-        <li>bindings are shown in blue. Only selected bindings are
-shown</li>
-      </ul>
-      <img alt="New" src="new.gif" style="width: 31px; height: 14px;">ASTView
-version 1.0.1 additionaly shows all binding properties, comment nodes
-attached to the root compilation unit and compiler problems detected in
-the AST.<br>
-      <br>
-      <span style="font-weight: bold;">Advanced Features</span><br>
-      <ul>
-        <li>You can toggle between the AST Level 2 and AST level 3 in
-the view menu (triangle). AST level 3 is the extended and modified AST
-that includes the new 1.5 language constructs. Note that the AST level
-3 is only available in builds greater than 3.0 (e.g. the Cheetah
-previews).<br>
-        </li>
-      </ul>
-      <span style="font-weight: bold;">Comments and Requests</span><br>
-      <ul>
-        <li>Source is included in the plugin archive</li>
-        <li>Comments to&nbsp; <a
- href="mailto:Martin_Aeschlimann%5Bat%5Dch.ibm.com">Martin_Aeschlimann[at]ch.ibm.com</a></li>
-      </ul>
-      <br>
-Thanks and credits go to Christian Hauser: The current AST view plugin
-is based his AST view implementation from the Zuerich Code Camp. Thanks
-a lot!<br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>

diff --git a/org.eclipse.jdt.astview/new.gif b/org.eclipse.jdt.astview/new.gif
deleted file mode 100644
index c406057..0000000
--- a/org.eclipse.jdt.astview/new.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip
deleted file mode 100644
index a84031f..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.0.zip
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.1.zip b/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.1.zip
deleted file mode 100644
index ff6af35..0000000
--- a/org.eclipse.jdt.astview/org.eclipse.jdt.astview_1.0.1.zip
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/plugin.xml b/org.eclipse.jdt.astview/plugin.xml
deleted file mode 100644
index 7049647..0000000
--- a/org.eclipse.jdt.astview/plugin.xml
+++ /dev/null

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.astview"
-   name="AST View Plug-in"
-   version="1.0.1"
-   provider-name="Eclipse.org"
-   class="org.eclipse.jdt.astview.ASTViewPlugin">
-
-   <runtime>
-      <library name="ASTView.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide" optional="true"/>
-      <import plugin="org.eclipse.ui.views" optional="true"/>
-      <import plugin="org.eclipse.jface.text" optional="true"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
-      <import plugin="org.eclipse.ui.editors" optional="true"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.runtime.compatibility" optional="true"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-   </requires>
-
-
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="ASTView"
-            icon="icons/view.gif"
-            category="org.eclipse.jdt.ui.java"
-            class="org.eclipse.jdt.astview.views.ASTView"
-            id="org.eclipse.jdt.astview.views.ASTView">
-      </view>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            name="ASTView"
-            description="AST View"
-            category="org.eclipse.ui.category.views"
-            id="org.eclipse.jdt.astview.views.ASTView">
-      </command>
-   </extension>
-
-</plugin>

diff --git a/org.eclipse.jdt.astview/refresh.gif b/org.eclipse.jdt.astview/refresh.gif
deleted file mode 100644
index a063c23..0000000
--- a/org.eclipse.jdt.astview/refresh.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/setfocus.gif b/org.eclipse.jdt.astview/setfocus.gif
deleted file mode 100644
index 0533fc2..0000000
--- a/org.eclipse.jdt.astview/setfocus.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java
deleted file mode 100644
index b84d210..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewImages.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-public class ASTViewImages {
-
-	private static URL fgIconBaseURL= null;
-	
-	static {
-		fgIconBaseURL= ASTViewPlugin.getDefault().getBundle().getEntry("/icons/"); //$NON-NLS-1$
-	}
-	
-	public static final String COLLAPSE= "collapseall.gif"; //$NON-NLS-1$
-	public static final String EXPAND= "expandall.gif"; //$NON-NLS-1$
-	public static final String LINK_WITH_EDITOR= "synced.gif"; //$NON-NLS-1$
-
-	public static final String SETFOCUS= "setfocus.gif"; //$NON-NLS-1$
-	public static final String REFRESH= "refresh.gif"; //$NON-NLS-1$
-
-	
-	//---- Helper methods to access icons on the file system --------------------------------------
-
-	public static void setImageDescriptors(IAction action, String type) {
-		
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("d", type)); //$NON-NLS-1$
-			if (id != null)
-				action.setDisabledImageDescriptor(id);
-		} catch (MalformedURLException e) {
-		}
-	
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("c", type)); //$NON-NLS-1$
-			if (id != null)
-				action.setHoverImageDescriptor(id);
-		} catch (MalformedURLException e) {
-		}
-	
-		action.setImageDescriptor(create("e", type)); //$NON-NLS-1$
-	}
-	
-	
-	private static ImageDescriptor create(String path, String name) {
-		try {
-			return ImageDescriptor.createFromURL(makeIconFileURL(path, name));
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	
-	private static URL makeIconFileURL(String path, String name) throws MalformedURLException {
-		StringBuffer buffer= new StringBuffer(path);
-		buffer.append('/');
-		buffer.append(name);
-		return new URL(fgIconBaseURL, buffer.toString());
-	}	
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java
deleted file mode 100644
index 0470b96..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/ASTViewPlugin.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class ASTViewPlugin extends AbstractUIPlugin {
-
-	private static ASTViewPlugin fDefault;
-
-	public ASTViewPlugin(IPluginDescriptor desc) {
-		fDefault = this;
-	}
-	
-	public static String getPluginId() {
-		return "org.eclipse.jdt.astview"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ASTViewPlugin getDefault() {
-		return fDefault;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java
deleted file mode 100644
index 3ab45a3..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/EditorUtility.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IOpenable;
-
-/**
- *
- */
-public class EditorUtility {
-	private EditorUtility() {
-		super();
-	}
-
-	public static IEditorPart getActiveEditor() {
-		IWorkbenchWindow window= ASTViewPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page= window.getActivePage();
-			if (page != null) {
-				return page.getActiveEditor();
-			}
-		}
-		return null;
-	}
-	
-	
-	public static IOpenable getJavaInput(IEditorPart part) {
-		IEditorInput editorInput= part.getEditorInput();
-		if (editorInput != null) {
-			IJavaElement input= (IJavaElement)editorInput.getAdapter(IJavaElement.class);
-			if (input instanceof IOpenable) {
-				return (IOpenable) input;
-			}
-		}
-		return null;	
-	}
-	
-	public static void selectInEditor(ITextEditor editor, int offset, int length) {
-		IEditorPart active = getActiveEditor();
-		if (active != editor) {
-			editor.getSite().getPage().activate(editor);
-		}
-		
-		editor.selectAndReveal(offset, length);
-	}
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java
deleted file mode 100644
index 771ba4d..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/GenericVisitor.java
+++ /dev/null

@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import org.eclipse.jdt.core.dom.*;
-
-public class GenericVisitor extends ASTVisitor {
-	
-	public GenericVisitor() {
-		super();
-	}
-
-	public GenericVisitor(boolean visitJavadocTags) {
-		super(visitJavadocTags);
-	}
-
-	//---- Hooks for subclasses -------------------------------------------------
-
-	protected boolean visitNode(ASTNode node) {
-		return true;
-	}
-	
-	protected void endVisitNode(ASTNode node) {
-	}
-
-	public boolean visit(AnonymousClassDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(ArrayAccess node) {
-		return visitNode(node);
-	}
-	public boolean visit(ArrayCreation node) {
-		return visitNode(node);
-	}
-	public boolean visit(ArrayInitializer node) {
-		return visitNode(node);
-	}
-	public boolean visit(ArrayType node) {
-		return visitNode(node);
-	}
-	public boolean visit(AssertStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(Assignment node) {
-		return visitNode(node);
-	}
-	public boolean visit(Block node) {
-		return visitNode(node);
-	}
-	public boolean visit(BooleanLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(BreakStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(CastExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(CatchClause node) {
-		return visitNode(node);
-	}
-	public boolean visit(CharacterLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(ClassInstanceCreation node) {
-		return visitNode(node);
-	}
-	public boolean visit(CompilationUnit node) {
-		return visitNode(node);
-	}
-	public boolean visit(ConditionalExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(ConstructorInvocation node) {
-		return visitNode(node);
-	}
-	public boolean visit(ContinueStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(DoStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(EmptyStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(ExpressionStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(FieldAccess node) {
-		return visitNode(node);
-	}
-	public boolean visit(FieldDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(ForStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(IfStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(ImportDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(InfixExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(InstanceofExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(Initializer node) {
-		return visitNode(node);
-	}
-	public boolean visit(Javadoc node) {
-		//	do not visit Javadoc tags by default. Use constructor with boolean to enable.
-		if (super.visit(node)) { 
-			return visitNode(node);
-		}
-		return false;
-	}
-	public boolean visit(LabeledStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(MethodDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(MethodInvocation node) {
-		return visitNode(node);
-	}
-	public boolean visit(NullLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(NumberLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(PackageDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(ParenthesizedExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(PostfixExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(PrefixExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(PrimitiveType node) {
-		return visitNode(node);
-	}
-	public boolean visit(QualifiedName node) {
-		return visitNode(node);
-	}
-	public boolean visit(ReturnStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(SimpleName node) {
-		return visitNode(node);
-	}
-	public boolean visit(SimpleType node) {
-		return visitNode(node);
-	}
-	public boolean visit(StringLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(SuperConstructorInvocation node) {
-		return visitNode(node);
-	}
-	public boolean visit(SuperFieldAccess node) {
-		return visitNode(node);
-	}
-	public boolean visit(SuperMethodInvocation node) {
-		return visitNode(node);
-	}
-	public boolean visit(SwitchCase node) {
-		return visitNode(node);
-	}
-	public boolean visit(SwitchStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(SynchronizedStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(ThisExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(ThrowStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(TryStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(TypeDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(TypeDeclarationStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(TypeLiteral node) {
-		return visitNode(node);
-	}
-	public boolean visit(SingleVariableDeclaration node) {
-		return visitNode(node);
-	}
-	public boolean visit(VariableDeclarationExpression node) {
-		return visitNode(node);
-	}
-	public boolean visit(VariableDeclarationStatement node) {
-		return visitNode(node);
-	}
-	public boolean visit(VariableDeclarationFragment node) {
-		return visitNode(node);
-	}
-	public boolean visit(WhileStatement node) {
-		return visitNode(node);
-	}
-
-	/* since 3.0 */
-	public boolean visit(BlockComment node) {
-		return visitNode(node);
-	}
-	public boolean visit(LineComment node) {
-		return visitNode(node);
-	}
-	public boolean visit(MemberRef node) {
-		return visitNode(node);
-	}
-	public boolean visit(MethodRef node) {
-		return visitNode(node);
-	}
-	public boolean visit(MethodRefParameter node) {
-		return visitNode(node);
-	}
-	public boolean visit(TagElement node) {
-		return visitNode(node);
-	}
-	public boolean visit(TextElement node) {
-		return visitNode(node);
-	}
-
-	public void endVisit(AnonymousClassDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ArrayAccess node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ArrayCreation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ArrayInitializer node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ArrayType node) {
-		endVisitNode(node);
-	}
-	public void endVisit(AssertStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(Assignment node) {
-		endVisitNode(node);
-	}
-	public void endVisit(Block node) {
-		endVisitNode(node);
-	}
-	public void endVisit(BooleanLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(BreakStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(CastExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(CatchClause node) {
-		endVisitNode(node);
-	}
-	public void endVisit(CharacterLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ClassInstanceCreation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(CompilationUnit node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ConditionalExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ConstructorInvocation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ContinueStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(DoStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(EmptyStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ExpressionStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(FieldAccess node) {
-		endVisitNode(node);
-	}
-	public void endVisit(FieldDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ForStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(IfStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ImportDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(InfixExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(InstanceofExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(Initializer node) {
-		endVisitNode(node);
-	}
-	public void endVisit(Javadoc node) {
-		endVisitNode(node);
-	}
-	public void endVisit(LabeledStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MethodDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MethodInvocation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(NullLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(NumberLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(PackageDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ParenthesizedExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(PostfixExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(PrefixExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(PrimitiveType node) {
-		endVisitNode(node);
-	}
-	public void endVisit(QualifiedName node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ReturnStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SimpleName node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SimpleType node) {
-		endVisitNode(node);
-	}
-	public void endVisit(StringLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SuperConstructorInvocation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SuperFieldAccess node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SuperMethodInvocation node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SwitchCase node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SwitchStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SynchronizedStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ThisExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(ThrowStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TryStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TypeDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TypeDeclarationStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TypeLiteral node) {
-		endVisitNode(node);
-	}
-	public void endVisit(SingleVariableDeclaration node) {
-		endVisitNode(node);
-	}
-	public void endVisit(VariableDeclarationExpression node) {
-		endVisitNode(node);
-	}
-	public void endVisit(VariableDeclarationStatement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(VariableDeclarationFragment node) {
-		endVisitNode(node);
-	}
-	public void endVisit(WhileStatement node) {
-		endVisitNode(node);
-	}
-	
-	/* since 3.0 */
-	public void endVisit(BlockComment node) {
-		endVisitNode(node);
-	}
-	public void endVisit(LineComment node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MemberRef node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MethodRef node) {
-		endVisitNode(node);
-	}
-	public void endVisit(MethodRefParameter node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TagElement node) {
-		endVisitNode(node);
-	}
-	public void endVisit(TextElement node) {
-		endVisitNode(node);
-	}
-
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java
deleted file mode 100644
index f2d8008..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/NodeFinder.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-
-/**
- * For a give range finds the node covered and the node covering.
- */
-public class NodeFinder extends GenericVisitor {
-
-	/**
-	 * A visitor that maps a selection to a given ASTNode. The result node is
-	 * determined as follows:
-	 * <ul>
-	 *   <li>first the visitor tries to find a node with the exact start and length</li>
-	 * 	 <li>if no such node exists than the node that encloses the range defined by
-	 *       start and end is returned.</li>
-	 *   <li>if the length is zero than also nodes are considered where the node's
-	 *       start or end position matches <code>start</code>.</li>
-	 *   <li>otherwise <code>null</code> is returned.</li>
-	 * </ul>
-	 */
-	public static ASTNode perform(ASTNode root, int start, int length) {
-		NodeFinder finder= new NodeFinder(start, length);
-		root.accept(finder);
-		ASTNode result= finder.getCoveredNode();
-		if (result == null || result.getStartPosition() != start || result.getLength() != length) {
-			return finder.getCoveringNode();
-		}
-		return result;
-	}
-		
-	private int fStart;
-	private int fEnd;
-	
-	private ASTNode fCoveringNode;
-	private ASTNode fCoveredNode;
-	
-	public NodeFinder(int offset, int length) {
-		super(true); // include Javadoc tags
-		fStart= offset;
-		fEnd= offset + length;
-	}
-
-	protected boolean visitNode(ASTNode node) {
-		int nodeStart= node.getStartPosition();
-		int nodeEnd= nodeStart + node.getLength();
-		if (nodeEnd < fStart || fEnd < nodeStart) {
-			return false;
-		}
-		if (nodeStart <= fStart && fEnd <= nodeEnd) {
-			fCoveringNode= node;
-		}
-		if (fStart <= nodeStart && nodeEnd <= fEnd) {
-			if (fCoveringNode == node) { // nodeStart == fStart && nodeEnd == fEnd
-				fCoveredNode= node;
-				return true; // look further for node with same length as parent
-			} else if (fCoveredNode == null) { // no better found
-				fCoveredNode= node;
-			}
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Returns the covered node. If more than one nodes are covered by the selection, the
-	 * returned node is first covered node found in a top-down traversal of the AST
-	 * @return ASTNode
-	 */
-	public ASTNode getCoveredNode() {
-		return fCoveredNode;
-	}
-
-	/**
-	 * Returns the covering node. If more than one nodes are covering the selection, the
-	 * returned node is last covering node found in a top-down traversal of the AST
-	 * @return ASTNode
-	 */
-	public ASTNode getCoveringNode() {
-		return fCoveringNode;
-	}
-	
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java
deleted file mode 100644
index 5db7cda..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/TreeInfoCollector.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- *
- */
-public class TreeInfoCollector {
-	
-	public static class NodeCounter extends GenericVisitor {
-
-		public int numberOfNodes= 0;
-		
-		protected boolean visitNode(ASTNode node) {
-			numberOfNodes++;
-			return true;
-		}
-	}
- 	
-	
-	private final CompilationUnit fRoot;
-
-	public TreeInfoCollector(CompilationUnit root) {
-		fRoot= root;
-	}
-
-	public int getSize() {
-		return fRoot.subtreeBytes();
-	}
-	
-	public int getNumberOfNodes() {
-		NodeCounter counter= new NodeCounter();
-		fRoot.accept(counter);
-		return counter.numberOfNodes;
-	}
-	
-
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java
deleted file mode 100644
index b69d32e..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTAttribute.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-
-/**
- *
- */
-public abstract class ASTAttribute {
-	
-	protected static final Object[] EMPTY= new Object[0];
-
-	public abstract Object getParent();
-	public abstract Object[] getChildren();
-	public abstract String getLabel();
-	public abstract Image getImage();
-	
-	public ASTNode getParentASTNode() {
-		Object parent= getParent();
-		while (parent instanceof ASTAttribute) {
-			parent= ((ASTAttribute) parent).getParent();
-		}
-		if (parent instanceof ASTNode) {
-			return (ASTNode) parent;
-		}
-		return null;
-	}
-	
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
deleted file mode 100644
index 310b94d..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
+++ /dev/null

@@ -1,772 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jdt.astview.ASTViewImages;
-import org.eclipse.jdt.astview.ASTViewPlugin;
-import org.eclipse.jdt.astview.EditorUtility;
-import org.eclipse.jdt.astview.NodeFinder;
-import org.eclipse.jdt.astview.TreeInfoCollector;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.IFileBuffer;
-import org.eclipse.core.filebuffers.IFileBufferListener;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.DrillDownAdapter;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-
-public class ASTView extends ViewPart {
-	
-	private class ASTLevelToggle extends Action {
-		private int fLevel;
-
-		public ASTLevelToggle(String label, int level) {
-			super(label, AS_RADIO_BUTTON);
-			fLevel= level;
-			if (level == getCurrentASTLevel()) {
-				setChecked(true);
-			}
-		}
-	
-		public int getLevel() {
-			return fLevel;
-		}
-		
-		public void run() {
-			setASTLevel(fLevel, true);
-		}
-	}
-	
-	private static class ListenerMix implements ISelectionListener, IFileBufferListener, IDocumentListener, ISelectionChangedListener, IDoubleClickListener, IPartListener2 {
-		
-		private boolean fASTViewVisible= true;
-		private ASTView fView;
-		
-		public ListenerMix(ASTView view) {
-			fView= view;
-		}
-		
-		public void dispose() {
-			fView= null;
-		}
-
-		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-			if (fASTViewVisible) {
-				fView.handleEditorPostSelectionChanged(part, selection);
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferCreated(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void bufferCreated(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferDisposed(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void bufferDisposed(IFileBuffer buffer) {
-			if (buffer instanceof ITextFileBuffer) {
-				fView.handleDocumentDisposed(((ITextFileBuffer) buffer).getDocument());
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentAboutToBeReplaced(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void bufferContentAboutToBeReplaced(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#bufferContentReplaced(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void bufferContentReplaced(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChanging(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void stateChanging(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#dirtyStateChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean)
-		 */
-		public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#stateValidationChanged(org.eclipse.core.filebuffers.IFileBuffer, boolean)
-		 */
-		public void stateValidationChanged(IFileBuffer buffer, boolean isStateValidated) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileMoved(org.eclipse.core.filebuffers.IFileBuffer, org.eclipse.core.runtime.IPath)
-		 */
-		public void underlyingFileMoved(IFileBuffer buffer, IPath path) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#underlyingFileDeleted(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void underlyingFileDeleted(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.filebuffers.IFileBufferListener#stateChangeFailed(org.eclipse.core.filebuffers.IFileBuffer)
-		 */
-		public void stateChangeFailed(IFileBuffer buffer) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
-		public void documentAboutToBeChanged(DocumentEvent event) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
-		public void documentChanged(DocumentEvent event) {
-			fView.handleDocumentChanged(event.getDocument());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-		 */
-		public void selectionChanged(SelectionChangedEvent event) {
-			fView.handleSelectionChanged(event.getSelection());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
-		 */
-		public void doubleClick(DoubleClickEvent event) {
-			fView.handleDoubleClick(event);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference)
-		 */
-		public void partHidden(IWorkbenchPartReference partRef) {
-			IWorkbenchPart part= partRef.getPart(false);
-			if (part == fView) {
-				fASTViewVisible= false;
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference)
-		 */
-		public void partVisible(IWorkbenchPartReference partRef) {
-			IWorkbenchPart part= partRef.getPart(false);
-			if (part == fView) {
-				fASTViewVisible= true;
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference)
-		 */
-		public void partActivated(IWorkbenchPartReference partRef) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference)
-		 */
-		public void partBroughtToTop(IWorkbenchPartReference partRef) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference)
-		 */
-		public void partClosed(IWorkbenchPartReference partRef) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference)
-		 */
-		public void partDeactivated(IWorkbenchPartReference partRef) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference)
-		 */
-		public void partOpened(IWorkbenchPartReference partRef) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference)
-		 */
-		public void partInputChanged(IWorkbenchPartReference partRef) {
-		}
-	}
-	
-	private final static String SETTINGS_LINK_WITH_EDITOR= "link_with_editor"; //$NON-NLS-1$
-	
-	private TreeViewer fViewer;
-	private DrillDownAdapter fDrillDownAdapter;
-	private Action fFocusAction;
-	private Action fRefreshAction;
-	private Action fCollapseAction;
-	private Action fExpandAction;
-	private Action fDoubleClickAction;
-	private Action fLinkWithEditor;
-	
-	private ASTLevelToggle[] fASTVersionToggleActions;
-	private int fCurrentASTLevel;
-	
-	private ITextEditor fEditor;
-	private IOpenable fOpenable;
-	private CompilationUnit fRoot;
-	private IDocument fCurrentDocument;
-	
-	private boolean fDoLinkWithEditor;
-	private Object fPreviousDouble;
-	
-	private ListenerMix fSuperListener;
-	
-	public ASTView() {
-		fSuperListener= null;
-		fDoLinkWithEditor= ASTViewPlugin.getDefault().getDialogSettings().getBoolean(SETTINGS_LINK_WITH_EDITOR);
-		fCurrentASTLevel= AST.JLS2;
-	}
-	
-	/*(non-Javadoc)
-	 * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite)
-	 */
-	public void init(IViewSite site) throws PartInitException {
-		super.setSite(site);
-		if (fSuperListener == null) {
-			fSuperListener= new ListenerMix(this);
-			
-			ISelectionService service= site.getWorkbenchWindow().getSelectionService();
-			service.addPostSelectionListener(fSuperListener);
-			site.getPage().addPartListener(fSuperListener);
-			FileBuffers.getTextFileBufferManager().addFileBufferListener(fSuperListener);
-		}
-	}
-	
-	public int getCurrentASTLevel() {
-		return fCurrentASTLevel;
-	}
-
-	public void setInput(ITextEditor editor) throws CoreException {
-		if (fEditor != null) {
-			uninstallModificationListener();
-		}
-		
-		fEditor= null;
-		fRoot= null;
-		
-		if (editor != null) {
-			IOpenable openable= EditorUtility.getJavaInput(editor);
-			if (openable == null) {
-				throw new CoreException(getErrorStatus("Editor not showing a CU or classfile", null)); //$NON-NLS-1$
-			}
-			fOpenable= openable;
-			int astLevel= getInitialASTLevel((IJavaElement) openable);
-			
-			ISelection selection= editor.getSelectionProvider().getSelection();
-			if (selection instanceof ITextSelection) {
-				ITextSelection textSelection= (ITextSelection) selection;
-				fRoot= internalSetInput(openable, textSelection.getOffset(), textSelection.getLength(), astLevel);
-				fEditor= editor;
-				setASTLevel(astLevel, false);
-			}
-			installModificationListener();
-		}
-
-	}
-	
-	private int getInitialASTLevel(IJavaElement openable) {
-		IJavaProject project= (IJavaProject) openable.getAncestor(IJavaElement.JAVA_PROJECT);
-		if (JavaCore.VERSION_1_5.equals(project.getOption(JavaCore.COMPILER_SOURCE, true))) {
-			return AST.JLS3;
-		}
-		return AST.JLS2;
-	}
-
-	private CompilationUnit internalSetInput(IOpenable input, int offset, int length, int astLevel) throws CoreException {
-		IBuffer buffer= input.getBuffer();
-		if (buffer == null) {
-			throw new CoreException(getErrorStatus("Input has no buffer", null)); //$NON-NLS-1$
-		}
-	
-		ASTParser parser= ASTParser.newParser(astLevel);
-		parser.setResolveBindings(true);
-		if (input instanceof ICompilationUnit) {
-			parser.setSource((ICompilationUnit) input);
-		} else {
-			parser.setSource((IClassFile) input);
-		}
-		try {
-			long startTime= System.currentTimeMillis();
-			CompilationUnit root= (CompilationUnit) parser.createAST(null);
-			long endTime= System.currentTimeMillis();
-			if (root == null) {
-				throw new CoreException(getErrorStatus("Could not create AST", null)); //$NON-NLS-1$
-			}
-			updateContentDescription((IJavaElement) input, root, endTime - startTime);
-			
-			fViewer.setInput(root);
-			setASTUptoDate(true);
-			
-			ASTNode node= NodeFinder.perform(root, offset, length);
-			if (node != null) {
-				fViewer.getTree().setRedraw(false);
-				fViewer.setSelection(new StructuredSelection(node), true);
-				fViewer.getTree().setRedraw(true);
-			}
-			return root;
-			
-		} catch (RuntimeException e) {
-			throw new CoreException(getErrorStatus("Could not create AST:\n" + e.getMessage(), e)); //$NON-NLS-1$
-		}
-	}
-	
-	private void updateContentDescription(IJavaElement element, CompilationUnit root, long time) {
-		String version= root.getAST().apiLevel() == AST.JLS2 ? "AST Level 2" : "AST Level 3";  //$NON-NLS-1$//$NON-NLS-2$
-		TreeInfoCollector collector= new TreeInfoCollector(root);
-
-		String msg= "{0} ({1}).  Creation time: {2,number} ms.  Size: {3,number} nodes, {4,number} bytes (AST nodes only)."; //$NON-NLS-1$
-		Object[] args= { element.getElementName(), version, new Long(time),  new Integer(collector.getNumberOfNodes()), new Integer(collector.getSize())};
-		setContentDescription(MessageFormat.format(msg, args));
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		ASTViewPlugin.getDefault().getDialogSettings().put(SETTINGS_LINK_WITH_EDITOR, fDoLinkWithEditor);
-		
-		if (fSuperListener != null) {
-			if (fEditor != null) {
-				uninstallModificationListener();
-			}
-			ISelectionService service= getSite().getWorkbenchWindow().getSelectionService();
-			service.removePostSelectionListener(fSuperListener);
-			getSite().getPage().removePartListener(fSuperListener);
-			FileBuffers.getTextFileBufferManager().removeFileBufferListener(fSuperListener);
-			fSuperListener.dispose(); // removes reference to view
-			fSuperListener= null;
-		}
-		super.dispose();
-	}
-	
-	private IStatus getErrorStatus(String message, Throwable th) {
-		return new Status(IStatus.ERROR, ASTViewPlugin.getPluginId(), IStatus.ERROR, message, th);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		fViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		fDrillDownAdapter = new DrillDownAdapter(fViewer);
-		fViewer.setContentProvider(new ASTViewContentProvider());
-		fViewer.setLabelProvider(new ASTViewLabelProvider());
-		fViewer.addSelectionChangedListener(fSuperListener);
-		fViewer.addDoubleClickListener(fSuperListener);
-		
-		makeActions();
-		hookContextMenu();
-		contributeToActionBars();
-		
-		try {
-			IEditorPart part= EditorUtility.getActiveEditor();
-			if (part instanceof ITextEditor) {
-				setInput((ITextEditor) part);
-			}
-		} catch (CoreException e) {
-			// ignore
-		}
-		if (fOpenable == null) {
-			setContentDescription("Open a Java editor and press the 'Show AST of active editor' toolbar button"); //$NON-NLS-1$
-		}
-		
-		setASTUptoDate(fOpenable != null);
-	}
-
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				ASTView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(fViewer.getControl());
-		fViewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, fViewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(fLinkWithEditor);
-		manager.add(new Separator());
-		for (int i= 0; i < fASTVersionToggleActions.length; i++) {
-			manager.add(fASTVersionToggleActions[i]);	
-		}
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		manager.add(fFocusAction);
-		manager.add(fRefreshAction);
-		manager.add(fCollapseAction);
-		manager.add(fExpandAction);
-		manager.add(new Separator());
-
-		fDrillDownAdapter.addNavigationActions(manager);
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(fFocusAction);
-		manager.add(fRefreshAction);
-		manager.add(new Separator());
-		fDrillDownAdapter.addNavigationActions(manager);
-		manager.add(new Separator());
-		manager.add(fExpandAction);
-		manager.add(fCollapseAction);
-		manager.add(fLinkWithEditor);
-	}
-	
-	private void setASTUptoDate(boolean isuptoDate) {
-		fRefreshAction.setEnabled(!isuptoDate && fOpenable != null);
-	}
-	
-
-	private void makeActions() {
-		fRefreshAction = new Action() {
-			public void run() {
-				performRefresh();
-			}
-		};
-		fRefreshAction.setText("Refresh AST"); //$NON-NLS-1$
-		fRefreshAction.setToolTipText("Refresh AST"); //$NON-NLS-1$
-		fRefreshAction.setEnabled(false);
-		ASTViewImages.setImageDescriptors(fRefreshAction, ASTViewImages.REFRESH);
-
-		
-		fFocusAction = new Action() {
-			public void run() {
-				performSetFocus();
-			}
-		};
-		fFocusAction.setText("Show AST of active editor"); //$NON-NLS-1$
-		fFocusAction.setToolTipText("Show AST of active editor"); //$NON-NLS-1$
-		ASTViewImages.setImageDescriptors(fFocusAction, ASTViewImages.SETFOCUS);
-
-		fCollapseAction = new Action() {
-			public void run() {
-				performCollapse();
-			}
-		};
-		fCollapseAction.setText("Collapse"); //$NON-NLS-1$
-		fCollapseAction.setToolTipText("Collapse Selected Node"); //$NON-NLS-1$
-		fCollapseAction.setEnabled(false);
-		ASTViewImages.setImageDescriptors(fCollapseAction, ASTViewImages.COLLAPSE);
-		
-		fExpandAction = new Action() {
-			public void run() {
-				performExpand();
-			}
-		};
-		fExpandAction.setText("Expand"); //$NON-NLS-1$
-		fExpandAction.setToolTipText("Expand Selected Node"); //$NON-NLS-1$
-		fExpandAction.setEnabled(false);
-		ASTViewImages.setImageDescriptors(fExpandAction, ASTViewImages.EXPAND);
-		
-		fDoubleClickAction = new Action() {
-			public void run() {
-				performDoubleClick();
-			}
-		};
-		
-		fLinkWithEditor = new Action() {
-			public void run() {
-				performLinkWithEditor();
-			}
-		};
-		fLinkWithEditor.setChecked(fDoLinkWithEditor);
-		fLinkWithEditor.setText("Link with editor"); //$NON-NLS-1$
-		fLinkWithEditor.setToolTipText("Link With Editor"); //$NON-NLS-1$
-		ASTViewImages.setImageDescriptors(fLinkWithEditor, ASTViewImages.LINK_WITH_EDITOR);
-			
-		fASTVersionToggleActions= new ASTLevelToggle[] {
-				new ASTLevelToggle("AST Level 2.0", AST.JLS2), //$NON-NLS-1$
-				new ASTLevelToggle("AST Level 3.0", AST.JLS3) //$NON-NLS-1$
-		};
-	}
-	
-	private void refreshAST() throws CoreException {
-		ASTNode node= getASTNodeNearSelection((IStructuredSelection) fViewer.getSelection());
-		int offset= 0;
-		int length= 0;
-		if (node != null) {
-			offset= node.getStartPosition();
-			length= node.getLength();
-		}
-
-		internalSetInput(fOpenable, offset, length, getCurrentASTLevel());
-	}
-	
-	
-	protected void setASTLevel(int level, boolean doRefresh) {
-		int oldLevel= fCurrentASTLevel;
-		fCurrentASTLevel= level;
-		if (doRefresh && fOpenable != null && oldLevel != fCurrentASTLevel) {
-			try {
-				refreshAST();
-			} catch (CoreException e) {
-				ErrorDialog.openError(getSite().getShell(), "AST View", "Could not set AST to new level.", e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-				// set back to old level
-				fCurrentASTLevel= oldLevel;
-			}
-		}
-		// update action state
-		for (int i= 0; i < fASTVersionToggleActions.length; i++) {
-			ASTLevelToggle curr= fASTVersionToggleActions[i];
-			curr.setChecked(curr.getLevel() == fCurrentASTLevel);
-		}
-	}
-	
-	
-	private ASTNode getASTNodeNearSelection(IStructuredSelection selection) {
-		Object elem= selection.getFirstElement();
-		if (elem instanceof ASTAttribute) {
-			return ((ASTAttribute) elem).getParentASTNode();
-		} else if (elem instanceof ASTNode) {
-			return (ASTNode) elem;
-		}
-		return null;
-	}
-	
-	private void installModificationListener() {
-		fCurrentDocument= fEditor.getDocumentProvider().getDocument(fEditor.getEditorInput());
-		fCurrentDocument.addDocumentListener(fSuperListener);
-	}
-	
-	private void uninstallModificationListener() {
-		if (fCurrentDocument != null) {
-			fCurrentDocument.removeDocumentListener(fSuperListener);
-			fCurrentDocument= null;
-		}
-	}
-		
-	protected void handleDocumentDisposed(IDocument document) {
-		uninstallModificationListener();
-	}
-	
-	protected void handleDocumentChanged(IDocument document) {
-		setASTUptoDate(false);
-	}
-	
-	protected void handleSelectionChanged(ISelection selection) {
-		fExpandAction.setEnabled(!selection.isEmpty());
-		fCollapseAction.setEnabled(!selection.isEmpty());
-	}
-
-	protected void handleEditorPostSelectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (!fDoLinkWithEditor || !(selection instanceof ITextSelection)) {
-			return;
-		}
-		if ((fRoot == null || part != fEditor) && part instanceof ITextEditor && (EditorUtility.getJavaInput((ITextEditor) part) != null)) {
-			try {
-				setInput((ITextEditor) part);
-			} catch (CoreException e) {
-				setContentDescription(e.getStatus().getMessage());
-			}
-			return;
-		}
-		
-		
-		ITextSelection textSelection= (ITextSelection) selection;
-		int offset= textSelection.getOffset();
-		int length= textSelection.getLength();
-		
-		NodeFinder finder= new NodeFinder(offset, length);
-		fRoot.accept(finder);
-		ASTNode covering= finder.getCoveringNode();
-		if (covering != null) {
-			fViewer.reveal(covering);
-			fViewer.setSelection(new StructuredSelection(covering));
-		}
-	}
-	
-	protected void handleDoubleClick(DoubleClickEvent event) {
-		fDoubleClickAction.run();
-	}
-	
-
-	protected void performLinkWithEditor() {
-		fDoLinkWithEditor= fLinkWithEditor.isChecked();
-	}
-
-	protected void performCollapse() {
-		IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
-		if (selection.isEmpty()) {
-			fViewer.collapseAll();
-		} else {
-			Object[] selected= selection.toArray();
-			fViewer.getTree().setRedraw(false);
-			for (int i= 0; i < selected.length; i++) {
-				fViewer.collapseToLevel(selected[i], AbstractTreeViewer.ALL_LEVELS);
-			}
-			fViewer.getTree().setRedraw(true);
-		}
-	}
-
-	protected void performExpand() {	
-		IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
-		if (selection.isEmpty()) {
-			fViewer.expandToLevel(3);
-		} else {
-			Object[] selected= selection.toArray();
-			fViewer.getTree().setRedraw(false);
-			for (int i= 0; i < selected.length; i++) {
-				fViewer.expandToLevel(selected[i], 3);
-			}
-			fViewer.getTree().setRedraw(true);
-		}
-	}
-
-	protected void performSetFocus() {
-		IEditorPart part= EditorUtility.getActiveEditor();
-		if (part instanceof ITextEditor) {
-			try {
-				setInput((ITextEditor) part);
-			} catch (CoreException e) {
-				ErrorDialog.openError(getSite().getShell(), "AST View", "Could not set AST view input ", e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-	
-	protected void performRefresh() {
-		if (fOpenable != null) {
-			try {
-				refreshAST();
-			} catch (CoreException e) {
-				ErrorDialog.openError(getSite().getShell(), "AST View", "Could not set AST view input ", e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-
-	protected void performDoubleClick() {
-		ISelection selection = fViewer.getSelection();
-		Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-		boolean isTrippleClick= (obj == fPreviousDouble);
-		fPreviousDouble= isTrippleClick ? null : obj;
-		
-		ASTNode node= null;
-		if (obj instanceof ASTNode) {
-			node= (ASTNode) obj;
-		} else if (obj instanceof NodeProperty) {
-			Object val= ((NodeProperty) obj).getNode();
-			if (val instanceof ASTNode) {
-				node= (ASTNode) val;
-			}
-		} else if (obj instanceof Binding) {
-			IBinding binding= ((Binding) obj).getBinding();
-			ASTNode declaring= fRoot.findDeclaringNode(binding);
-			if (declaring != null) {
-				fViewer.reveal(declaring);
-				fViewer.setSelection(new StructuredSelection(declaring));
-			}
-			return;
-		} else if (obj instanceof ProblemNode) {
-			ProblemNode problemNode= (ProblemNode) obj;
-			EditorUtility.selectInEditor(fEditor, problemNode.getOffset(), problemNode.getLength());
-			return;
-		}
-		
-		if (node != null) {
-			int offset= isTrippleClick ? fRoot.getExtendedStartPosition(node) : node.getStartPosition();
-			int length= isTrippleClick ? fRoot.getExtendedLength(node) : node.getLength();
-
-			EditorUtility.selectInEditor(fEditor, offset, length);
-		}
-	}
-
-	public void setFocus() {
-		fViewer.getControl().setFocus();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java
deleted file mode 100644
index 13ae647..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewContentProvider.java
+++ /dev/null

@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ClassInstanceCreation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ConstructorInvocation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldAccess;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.MemberRef;
-import org.eclipse.jdt.core.dom.MethodInvocation;
-import org.eclipse.jdt.core.dom.MethodRef;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
-import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
-import org.eclipse.jdt.core.dom.SuperFieldAccess;
-import org.eclipse.jdt.core.dom.SuperMethodInvocation;
-import org.eclipse.jdt.core.dom.Type;
-
-public class ASTViewContentProvider implements IStructuredContentProvider, ITreeContentProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-	}
-	
-	/*(non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object parent) {
-		return getChildren(parent);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object child) {
-		if (child instanceof ASTNode) {
-			ASTNode node= (ASTNode) child;
-			ASTNode parent= node.getParent();
-			if (parent != null) {
-				StructuralPropertyDescriptor prop= node.getLocationInParent();
-				return new NodeProperty(parent, prop);
-			}
-		} else if (child instanceof ASTAttribute) {
-			return ((ASTAttribute) child).getParent();
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parent) {
-		if (parent instanceof ASTAttribute) {
-			return ((ASTAttribute) parent).getChildren();
-		} else if (parent instanceof ASTNode) {
-			return getNodeChildren((ASTNode) parent);
-		}
-		return new Object[0];
-	}
-	
-	private Object[] getNodeChildren(ASTNode node) {
-		ArrayList res= new ArrayList();
-
-		if (node instanceof Name) {
-			IBinding binding= ((Name) node).resolveBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof MethodInvocation) {
-			IBinding binding= ((MethodInvocation) node).resolveMethodBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof SuperMethodInvocation) {
-			IBinding binding= ((SuperMethodInvocation) node).resolveMethodBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof ClassInstanceCreation) {
-			IBinding binding= ((ClassInstanceCreation) node).resolveConstructorBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof ConstructorInvocation) {
-			IBinding binding= ((ConstructorInvocation) node).resolveConstructorBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof SuperConstructorInvocation) {
-			IBinding binding= ((SuperConstructorInvocation) node).resolveConstructorBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof FieldAccess) {
-			IBinding binding= ((FieldAccess) node).resolveFieldBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof SuperFieldAccess) {
-			IBinding binding= ((SuperFieldAccess) node).resolveFieldBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof MethodRef) {
-			IBinding binding= ((MethodRef) node).resolveBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof MemberRef) {
-			IBinding binding= ((MemberRef) node).resolveBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof Expression) {
-			IBinding binding= ((Expression) node).resolveTypeBinding();
-			res.add(createBinding(node, binding));
-		} else if (node instanceof Type) {
-			IBinding binding= ((Type) node).resolveBinding();
-			res.add(createBinding(node, binding));
-		}
- 		
-		List list= node.structuralPropertiesForType();
-		for (int i= 0; i < list.size(); i++) {
-			StructuralPropertyDescriptor curr= (StructuralPropertyDescriptor) list.get(i);
-			res.add(new NodeProperty(node, curr));
-		}
-		
-		if (node instanceof CompilationUnit) {
-			CompilationUnit root= (CompilationUnit) node;
-			res.add(new CommentsProperty(root));
-			res.add(new ProblemsProperty(root));
-		}
-		
-		return res.toArray();
-	}
-	
-	private Binding createBinding(ASTNode parent, IBinding binding) {
-		String label;
-		if (binding == null) {
-			label= ">binding"; //$NON-NLS-1$
-		} else {
-			switch (binding.getKind()) {
-				case IBinding.VARIABLE:
-					label= "> variable binding"; //$NON-NLS-1$
-					break;
-				case IBinding.TYPE:
-					label= "> type binding"; //$NON-NLS-1$
-					break;
-				case IBinding.METHOD:
-					label= "> method binding"; //$NON-NLS-1$
-					break;
-				case IBinding.PACKAGE:
-					label= "> package binding"; //$NON-NLS-1$
-					break;
-				default:
-					label= "> unknown binding"; //$NON-NLS-1$
-			}
-		}
-		return new Binding(parent, label, binding, true);
-	}
-	
-	
-	public boolean hasChildren(Object parent) {
-		return getChildren(parent).length > 0;
-	}
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
deleted file mode 100644
index ca83ff7..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.Signature;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-
-public class ASTViewLabelProvider extends LabelProvider implements IColorProvider, IFontProvider {
-	
-	private int fSelectionStart;
-	private int fSelectionLength;
-	
-	private Color fBlue, fRed, fDarkGray, fYellow;
-	private Font fBold;
-	
-	public ASTViewLabelProvider() {
-		fSelectionStart= -1;
-		fSelectionLength= -1;
-		
-		Display display= Display.getCurrent();
-		
-		fRed= display.getSystemColor(SWT.COLOR_RED);
-		fDarkGray= display.getSystemColor(SWT.COLOR_DARK_GRAY);
-		fBlue= display.getSystemColor(SWT.COLOR_DARK_BLUE);
-		fYellow= display.getSystemColor(SWT.COLOR_YELLOW);
-		
-		fBold= PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
-
-	}
-	
-	public void setSelectedRange(int start, int length) {
-		fSelectionStart= start;
-		fSelectionLength= length;
-	}
-	
-
-	public String getText(Object obj) {
-		StringBuffer buf= new StringBuffer();
-		if (obj instanceof ASTNode) {
-			getNodeType((ASTNode) obj, buf);
-		} else if (obj instanceof ASTAttribute) {
-			buf.append(((ASTAttribute) obj).getLabel());
-		}
-		return buf.toString(); 
-	}
-	
-	private void getNodeType(ASTNode node, StringBuffer buf) {
-		buf.append(Signature.getSimpleName(node.getClass().getName()));
-		buf.append(" ["); //$NON-NLS-1$
-		buf.append(node.getStartPosition());
-		buf.append(", "); //$NON-NLS-1$
-		buf.append(node.getLength());
-		buf.append(']');
-		if ((node.getFlags() & ASTNode.MALFORMED) != 0) {
-			buf.append(" (malformed)"); //$NON-NLS-1$
-		}
-	}
-	
-	
-	public Image getImage(Object obj) {
-		if (obj instanceof ASTNode) {
-			return null;
-		} else if (obj instanceof ASTAttribute) {
-			return ((ASTAttribute) obj).getImage();
-		}
-		
-		return null;
-//		String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
-//		if (obj instanceof ASTNode) {
-//			imageKey = ISharedImages.IMG_OBJ_FOLDER;
-//		}
-//		return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-	 */
-	public Color getForeground(Object element) {
-		if (element instanceof ASTNode) {
-			ASTNode node= (ASTNode) element;
-			if ((node.getFlags() & ASTNode.MALFORMED) != 0) {
-				return fRed;
-			}
-			return fDarkGray;
-		} else if (element instanceof Binding) {
-			Binding binding= (Binding) element;
-			if (binding.isRequired() && binding.getBinding() == null) {
-				return fRed;
-			}
-			return fBlue;
-		} else if (element instanceof NodeProperty) {
-			return null; // normal color
-		} else if (element instanceof BindingProperty) {
-			return fBlue;
-		}
-		return fDarkGray; // all extra properties
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-	 */
-	public Color getBackground(Object element) {
-		if (fSelectionStart != -1 && isInside(element)) {
-			return fYellow;
-		}
-		return null;
-	}
-	
-	private boolean isInsideNode(ASTNode node) {
-		int start= node.getStartPosition();
-		int end= start + node.getLength();
-		if (start <= fSelectionStart && (fSelectionStart + fSelectionLength) < end) {
-			return true;
-		}
-		return false;
-	}
-	
-	private boolean isInside(Object element) {
-		if (element instanceof ASTNode) {
-			return isInsideNode((ASTNode) element);
-		} else if (element instanceof NodeProperty) {
-			NodeProperty property= (NodeProperty) element;
-			Object object= property.getNode();
-			if (object instanceof ASTNode) {
-				return isInsideNode((ASTNode) object);
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
-	 */
-	public Font getFont(Object element) {
-		if (element instanceof ASTNode) {
-			ASTNode node= (ASTNode) element;
-			int start= node.getStartPosition();
-			int end= start + node.getLength();
-			
-			ASTNode parent= node.getParent();
-			if (parent != null) {
-				int parentstart= parent.getStartPosition();
-				int parentend= start + parent.getLength();
-				
-				if (start < parentstart || end > parentend) {
-					return fBold;
-				}
-			}
-		}
-		return null;
-	}
-	
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Binding.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Binding.java
deleted file mode 100644
index 6978f01..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/Binding.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import java.util.ArrayList;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.Flags;
-
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.IPackageBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-
-/**
- *
- */
-public class Binding extends ASTAttribute {
-	
-	private IBinding fBinding;
-	private String fLabel;
-	private Object fParent;
-	private boolean fIsRequired;
-	
-	public Binding(Object parent, String label, IBinding binding, boolean isRequired) {
-		fParent= parent;
-		fBinding= binding;
-		fLabel= label;
-		fIsRequired= isRequired;
-	}
-	
-	/**
-	 * @return Returns the isRequired.
-	 */
-	public boolean isRequired() {
-		return fIsRequired;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
-	 */
-	public Object getParent() {
-		return fParent;
-	}
-	
-	public IBinding getBinding() {
-		return fBinding;
-	}
-	
-
-	public boolean hasBindingProperties() {
-		return fBinding != null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
-	 */
-	public Object[] getChildren() {
-		
-		if (fBinding != null) {
-			ArrayList res= new ArrayList();
-			res.add(new BindingProperty(this, "NAME", fBinding.getName())); //$NON-NLS-1$
-			res.add(new BindingProperty(this, "KEY", fBinding.getKey())); //$NON-NLS-1$
-			switch (fBinding.getKind()) {
-				case IBinding.VARIABLE:
-					IVariableBinding variableBinding= (IVariableBinding) fBinding;
-					res.add(new BindingProperty(this, "IS FIELD", variableBinding.isField())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "VARIABLE ID", variableBinding.getVariableId())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "MODIFIERS", Flags.toString(fBinding.getModifiers()))); //$NON-NLS-1$
-					res.add(new Binding(this, "TYPE", variableBinding.getType(), false)); //$NON-NLS-1$
-					res.add(new Binding(this, "DECLARING CLASS", variableBinding.getDeclaringClass(), false)); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS SYNTHETIC", fBinding.isSynthetic())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS DEPRECATED", fBinding.isDeprecated())); //$NON-NLS-1$
-					Object constVal= variableBinding.getConstantValue();
-					res.add(new BindingProperty(this, "CONSTANT VALUE", constVal == null ? "null" : constVal.toString())); //$NON-NLS-1$ //$NON-NLS-2$
-					break;
-				case IBinding.PACKAGE:
-					IPackageBinding packageBinding= (IPackageBinding) fBinding;
-					res.add(new BindingProperty(this, "IS UNNAMED", packageBinding.isUnnamed())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS SYNTHETIC", fBinding.isSynthetic())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS DEPRECATED", fBinding.isDeprecated())); //$NON-NLS-1$
-					break;
-				case IBinding.TYPE:
-					ITypeBinding typeBinding= (ITypeBinding) fBinding;
-					res.add(new BindingProperty(this, "IS TOP LEVEL", typeBinding.isTopLevel())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS NESTED", typeBinding.isNested())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS MEMBER", typeBinding.isMember())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS LOCAL", typeBinding.isLocal())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS ANONYMOUS", typeBinding.isAnonymous())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS CLASS", typeBinding.isClass())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS INTERFACE", typeBinding.isInterface())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS ENUM", typeBinding.isEnum())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS ANNOTATION", typeBinding.isAnnotation())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS PRIMITIVE", typeBinding.isPrimitive())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS NULL TYPE", typeBinding.isNullType())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS ARRAY", typeBinding.isArray())); //$NON-NLS-1$
-					res.add(new Binding(this, "ELEMENT TYPE", typeBinding.getElementType(), typeBinding.isArray())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "DIMENSIONS", typeBinding.getDimensions())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS TYPEVARIABLE", typeBinding.isTypeVariable())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "TYPE BOUNDS", typeBinding.getTypeBounds())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS PARAMETRIZED TYPE", typeBinding.isParameterizedType())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "TYPE ARGUMENTS", typeBinding.getTypeArguments())); //$NON-NLS-1$			
-					res.add(new Binding(this, "ERASURE", typeBinding.getErasure(), true)); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS RAW TYPE", typeBinding.isRawType())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS WILCARD TYPE", typeBinding.isWildcardType())); //$NON-NLS-1$
-					res.add(new Binding(this, "BOUND", typeBinding.getBound(), typeBinding.isWildcardType())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS UPPERBOUND", typeBinding.isUpperbound())); //$NON-NLS-1$
-
-					res.add(new Binding(this, "PACKAGE", typeBinding.getPackage(), true)); //$NON-NLS-1$
-
-					res.add(new Binding(this, "DECLARING CLASS", typeBinding.getDeclaringClass(), false)); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "MODIFIERS", Flags.toString(fBinding.getModifiers()))); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "BINARY NAME", typeBinding.getBinaryName())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "TYPE PARAMETERS", typeBinding.getTypeParameters())); //$NON-NLS-1$
-
-					res.add(new Binding(this, "SUPERCLASS", typeBinding.getSuperclass(), false)); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "INTERFACES", typeBinding.getInterfaces())); //$NON-NLS-1$			
-					res.add(new BindingProperty(this, "DECLARED MODIFIERS", Flags.toString(fBinding.getModifiers()))); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "DECLARED TYPES", typeBinding.getDeclaredTypes())); //$NON-NLS-1$			
-					res.add(new BindingProperty(this, "DECLARED FIELDS", typeBinding.getDeclaredFields())); //$NON-NLS-1$			
-					res.add(new BindingProperty(this, "DECLARED METHODS", typeBinding.getDeclaredMethods())); //$NON-NLS-1$			
-					res.add(new BindingProperty(this, "IS SYNTHETIC", fBinding.isSynthetic())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS DEPRECATED", fBinding.isDeprecated())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS FROM SOURCE", typeBinding.isFromSource())); //$NON-NLS-1$
-					break;
-				case IBinding.METHOD:
-					IMethodBinding methodBinding= (IMethodBinding) fBinding;
-					res.add(new BindingProperty(this, "IS CONSTRUCTOR", methodBinding.isConstructor())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS DEFAULT CONSTRUCTOR", methodBinding.isDefaultConstructor())); //$NON-NLS-1$
-					res.add(new Binding(this, "DECLARING CLASS", methodBinding.getDeclaringClass(), true)); //$NON-NLS-1$
-					res.add(new Binding(this, "RETURN TYPE", methodBinding.getReturnType(), true)); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "MODIFIERS", Flags.toString(fBinding.getModifiers()))); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "PARAMETER TYPES", methodBinding.getParameterTypes())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "EXCEPTION TYPES", methodBinding.getExceptionTypes())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "TYPE PARAMETERS", methodBinding.getTypeParameters())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS PARAMETRIZED METHOD", methodBinding.isParameterizedMethod())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "TYPE ARGUMENTS", methodBinding.getTypeArguments())); //$NON-NLS-1$			
-					res.add(new Binding(this, "ERASURE", methodBinding.getErasure(), true)); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS RAW METHOD", methodBinding.isRawMethod())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS SYNTHETIC", fBinding.isSynthetic())); //$NON-NLS-1$
-					res.add(new BindingProperty(this, "IS DEPRECATED", fBinding.isDeprecated())); //$NON-NLS-1$
-
-					break;
-			}
-			return res.toArray();
-		}
-		return EMPTY;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
-	 */
-	public String getLabel() {
-		StringBuffer buf= new StringBuffer(fLabel);
-		buf.append(": "); //$NON-NLS-1$
-		if (fBinding != null) {
-			switch (fBinding.getKind()) {
-				case IBinding.VARIABLE:
-					IVariableBinding variableBinding= (IVariableBinding) fBinding;
-					if (!variableBinding.isField()) {
-						buf.append(variableBinding.getName());
-					} else if (variableBinding.getDeclaringClass() == null) {
-						buf.append("array type"); //$NON-NLS-1$
-					} else {
-						buf.append(variableBinding.getDeclaringClass().getName());
-						buf.append('.');
-						buf.append(variableBinding.getName());				
-					}
-					break;
-				case IBinding.PACKAGE:
-					IPackageBinding packageBinding= (IPackageBinding) fBinding;
-					buf.append(packageBinding.getName());
-					break;
-				case IBinding.TYPE:
-					ITypeBinding typeBinding= (ITypeBinding) fBinding;
-					buf.append(typeBinding.getQualifiedName());
-					break;
-				case IBinding.METHOD:
-					IMethodBinding methodBinding= (IMethodBinding) fBinding;
-					buf.append(methodBinding.getDeclaringClass().getName());
-					buf.append('.');
-					buf.append(methodBinding.getName());
-					buf.append('(');
-					ITypeBinding[] parameters= methodBinding.getParameterTypes();
-					for (int i= 0; i < parameters.length; i++) {
-						if (i > 0) {
-							buf.append(", "); //$NON-NLS-1$
-						}
-						ITypeBinding parameter= parameters[i];
-						buf.append(parameter.getName());
-					}
-					buf.append(')');
-					break;
-			}
-		} else {
-			buf.append("null"); //$NON-NLS-1$
-		}
-		return buf.toString();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
-	 */
-	public Image getImage() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getLabel();
-	}
-	
-	
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java
deleted file mode 100644
index f73ad25..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/BindingProperty.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.dom.IBinding;
-
-/**
- *
- */
-public class BindingProperty extends ASTAttribute {
-
-	private final String fName;
-	private final Binding fParent;
-	private Binding[] fValues;
-
-	public BindingProperty(Binding parent, String name, String value) {
-		fParent= parent;
-		if (value.length() > 0)
-			fName= name + ": '" + value + "'"; //$NON-NLS-1$ //$NON-NLS-2$
-		else 
-			fName= name + ": (empty string)"; //$NON-NLS-1$
-		fValues= null;
-	}
-	
-	public BindingProperty(Binding parent, String name, boolean value) {
-		fParent= parent;
-		fName= name + ": " + String.valueOf(value); //$NON-NLS-1$
-		fValues= null;
-	}
-	
-	public BindingProperty(Binding parent, String name, int value) {
-		fParent= parent;
-		fName= name + ": " + String.valueOf(value); //$NON-NLS-1$
-		fValues= null;
-	}
-	
-	public BindingProperty(Binding parent, String name, IBinding[] bindings) {
-		fParent= parent;
-		if (bindings == null || bindings.length == 0) {
-			fName= name + " (0)"; //$NON-NLS-1$
-			fValues= null;
-		} else {
-			fValues= createBindings(bindings);
-			fName= name + " (" + String.valueOf(fValues.length) + ')'; //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * @param bindings
-	 * @return
-	 */
-	private Binding[] createBindings(IBinding[] bindings) {
-		Binding[] res= new Binding[bindings.length];
-		for (int i= 0; i < res.length; i++) {
-			res[i]= new Binding(this, String.valueOf(i), bindings[i], true);
-		}
-		return res;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
-	 */
-	public Object getParent() {
-		return fParent;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
-	 */
-	public Object[] getChildren() {
-		if (fValues != null) {
-			return fValues;
-		}
-		return EMPTY;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
-	 */
-	public String getLabel() {
-		return fName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
-	 */
-	public Image getImage() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getLabel();
-	}
-
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/CommentsProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/CommentsProperty.java
deleted file mode 100644
index 2e79cab..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/CommentsProperty.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- *
- */
-public class CommentsProperty extends ASTAttribute {
-	
-	private final CompilationUnit fRoot;
-
-	public CommentsProperty(CompilationUnit root) {
-		fRoot= root;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
-	 */
-	public Object getParent() {
-		return fRoot;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
-	 */
-	public Object[] getChildren() {
-		return fRoot.getCommentList().toArray();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
-	 */
-	public String getLabel() {
-		return "> comments (" +  fRoot.getCommentList().size() + ")";  //$NON-NLS-1$//$NON-NLS-2$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
-	 */
-	public Image getImage() {
-		return null;
-	}
-
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java
deleted file mode 100644
index 2602084..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/NodeProperty.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
-
-public class NodeProperty extends ASTAttribute {
-	
-	private ASTNode fParent;
-	private StructuralPropertyDescriptor fProperty;
-	
-	public NodeProperty(ASTNode parent, StructuralPropertyDescriptor property) {
-		fParent= parent;
-		fProperty= property;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
-	 */
-	public Object getParent() {
-		return fParent;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
-	 */
-	public Object[] getChildren() {
-		Object child= getNode();
-		if (child instanceof List) {
-			return ((List) child).toArray();
-		} else if (child instanceof ASTNode) {
-			return new Object[] { child };
-		}
-		return EMPTY;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
-	 */
-	public String getLabel() {
-		StringBuffer buf= new StringBuffer();
-		buf.append(getPropertyName());
-		
-		if (fProperty.isSimpleProperty()) {
-			buf.append(": "); //$NON-NLS-1$
-			Object node= getNode();
-			if (node != null) {
-				buf.append('\'');
-				buf.append(getNode().toString());
-				buf.append('\'');
-			} else {
-				buf.append("null"); //$NON-NLS-1$
-			}
-		} else if (fProperty.isChildListProperty()) {
-			List node= (List) getNode();
-			buf.append(" (").append(node.size()).append(')'); //$NON-NLS-1$
-		}
-		return buf.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
-	 */
-	public Image getImage() {
-		return null;
-	}
-	
-	public Object getNode() {
-		return fParent.getStructuralProperty(fProperty);
-	}
-	
-	public String getPropertyName() {
-		return toConstantName(fProperty.getId());
-	}
-	
-	private static String toConstantName(String string) {
-		StringBuffer buf= new StringBuffer();
-		for (int i= 0; i < string.length(); i++) {
-			char ch= string.charAt(i);
-			if (i != 0 && Character.isUpperCase(ch)) {
-				buf.append('_');
-			}
-			buf.append(Character.toUpperCase(ch));
-		}
-		return buf.toString();
-	}
-	
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || !o.getClass().equals(getClass())) {
-			return false;
-		}
-		NodeProperty castedObj= (NodeProperty) o;
-		return  fParent.equals(castedObj.fParent) && (fProperty == castedObj.fProperty);
-	}
-
-	public int hashCode() {
-		return fParent.hashCode() * 31 + fProperty.hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getLabel();
-
-	}
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java
deleted file mode 100644
index 67742e8..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.compiler.IProblem;
-
-/**
- *
- */
-public class ProblemNode extends ASTAttribute {
-
-	private final IProblem fProblem;
-	private final Object fParent;
-
-	public ProblemNode(Object parent, IProblem problem) {
-		fParent= parent;
-		fProblem= problem;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
-	 */
-	public Object getParent() {
-		return fParent;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
-	 */
-	public Object[] getChildren() {
-		return EMPTY;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
-	 */
-	public String getLabel() {
-		StringBuffer buf= new StringBuffer();
-		int id= fProblem.getID();
-		int offset= fProblem.getSourceStart();
-		int length= fProblem.getSourceEnd() + 1 - offset;
-		
-		buf.append('[').append(offset).append(", ").append(length).append(']').append(' '); //$NON-NLS-1$
-		buf.append(fProblem.getMessage()).append(' '); //$NON-NLS-1$
-		buf.append("(").append(getErrorCode(id)).append(") ");  //$NON-NLS-1$//$NON-NLS-2$
-		return buf.toString();
-	}
-	
-	private String getErrorCode(int code) {
-		StringBuffer buf= new StringBuffer();
-			
-		if ((code & IProblem.TypeRelated) != 0) {
-			buf.append("TypeRelated + "); //$NON-NLS-1$
-		}
-		if ((code & IProblem.FieldRelated) != 0) {
-			buf.append("FieldRelated + "); //$NON-NLS-1$
-		}
-		if ((code & IProblem.ConstructorRelated) != 0) {
-			buf.append("ConstructorRelated + "); //$NON-NLS-1$
-		}
-		if ((code & IProblem.MethodRelated) != 0) {
-			buf.append("MethodRelated + "); //$NON-NLS-1$
-		}
-		if ((code & IProblem.ImportRelated) != 0) {
-			buf.append("ImportRelated + "); //$NON-NLS-1$
-		}
-		if ((code & IProblem.Internal) != 0) {
-			buf.append("Internal + "); //$NON-NLS-1$
-		}
-		if ((code & IProblem.Syntax) != 0) {
-			buf.append("Syntax + "); //$NON-NLS-1$
-		}
-		if ((code & IProblem.Javadoc) != 0) {
-			buf.append("Javadoc + "); //$NON-NLS-1$
-		}
-		buf.append(code & IProblem.IgnoreCategoriesMask);
-			
-		return buf.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
-	 */
-	public Image getImage() {
-		return null;
-	}
-
-	/**
-	 * @return Returns the offset of the problem
-	 */
-	public int getOffset() {
-		return fProblem.getSourceStart();
-	}
-	
-	/**
-	 * @return Returns the length of the problem
-	 */
-	public int getLength() {
-		return fProblem.getSourceEnd() + 1 - fProblem.getSourceStart();
-	}
-
-}

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemsProperty.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemsProperty.java
deleted file mode 100644
index 04f309e..0000000
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemsProperty.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.astview.views;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.compiler.IProblem;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-/**
- *
- */
-public class ProblemsProperty extends ASTAttribute {
-	
-	private final CompilationUnit fRoot;
-
-	public ProblemsProperty(CompilationUnit root) {
-		fRoot= root;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getParent()
-	 */
-	public Object getParent() {
-		return fRoot;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getChildren()
-	 */
-	public Object[] getChildren() {
-		IProblem[] problems= fRoot.getProblems();
-		Object[] res= new Object[problems.length];
-		for (int i= 0; i < res.length; i++) {
-			res[i]= new ProblemNode(this, problems[i]);
-		}
-		return res;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getLabel()
-	 */
-	public String getLabel() {
-		return "> compiler problems (" +  fRoot.getProblems().length + ")";  //$NON-NLS-1$//$NON-NLS-2$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.astview.views.ASTAttribute#getImage()
-	 */
-	public Image getImage() {
-		return null;
-	}
-
-}

diff --git a/org.eclipse.jdt.astview/synced.gif b/org.eclipse.jdt.astview/synced.gif
deleted file mode 100644
index f865f3a..0000000
--- a/org.eclipse.jdt.astview/synced.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.astview/view.gif b/org.eclipse.jdt.astview/view.gif
deleted file mode 100644
index d9c61ee..0000000
--- a/org.eclipse.jdt.astview/view.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.junit.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7eb9e09..0000000
--- a/org.eclipse.jdt.junit.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Fri Aug 27 08:42:49 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.jdt.junit.core/plugin.properties b/org.eclipse.jdt.junit.core/plugin.properties
deleted file mode 100644
index a05af55..0000000
--- a/org.eclipse.jdt.junit.core/plugin.properties
+++ /dev/null

@@ -1,52 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Java Development Tools JUnit support
-providerName=Eclipse.org
-
-testRunListeners.name= Test Run Listeners
-junitQuickFixProcessor= JUnit Quick Fix Processor
-
-junitLaunchConfigs.name= JUnit Launch Configurations
-testRunTabs.name= JUnit Test Run Tabs
-
-View.label= JUnit
-Launch.label= JUnit
-PreferencePage.label= JUnit
-
-TestWizard.description= Create a JUnit Test Case
-SuiteWizard.description= Create a JUnit Test Suite
-UpdateSuiteAction.label= Recreate Test Suite...
-UpdateSuiteAction.tooltip= Recreate JUnit TestSuite with New Test Classes
-Task.name= JUnit Task
-WizardCategory.name= JUnit
-TestCaseWizard.name= JUnit Test Case
-TestSuiteWizard.name= JUnit Test Suite
-
-JUnitShortcut.label= JUnit Test
-
-searchMenu.label= Se&arch
-
-JUnitTabGroupDescription.debug=Create a configuration that will launch a JUnit test in debug mode.
-JUnitTabGroupDescription.run=Create a configuration that will launch a JUnit test.
-
-JUnitActionSet.label= JUnit
-
-GotoTestAction.label= Referring Tests...
-GotoTestAction.tooltip= Go to Test Referring to Selection
-
-GotoTestCommand.name= Referring Tests
-GotoTestCommand.description= Referring Tests
-
-ViewCommand.junitView.name= JUnit
-ViewCommand.junitView.description= JUnit
-
-RenameTypeParticipant.name=JUnit Launch configuration participant
-junitRenameParticipant= JUnit Project Rename Participant

diff --git a/org.eclipse.jdt.junit.core/plugin.xml b/org.eclipse.jdt.junit.core/plugin.xml
deleted file mode 100644
index ec9d72f..0000000
--- a/org.eclipse.jdt.junit.core/plugin.xml
+++ /dev/null

@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.junit"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.internal.junit.ui.JUnitPlugin">
-
-   <runtime>
-      <library name="junitsupport.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.junit.runtime"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.ltk.core.refactoring"/>
-      <import plugin="org.eclipse.core.variables"/>
-   </requires>
-
-
-   <extension-point id="testRunListeners" name="%testRunListeners.name" schema="schema/testRunListeners.exsd"/>
-   <extension-point id="junitLaunchConfigs" name="%junitLaunchConfigs.name" schema="schema/junitLaunchConfigs.exsd"/>
-   <extension-point id="internal-testRunTabs" name="%testRunTabs.name" schema="schema/internal-testRunTabs.exsd"/>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%View.label"
-            icon="icons/full/eview16/junit.gif"
-            category="org.eclipse.jdt.ui.java"
-            fastViewWidthRatio="0.40"
-            class="org.eclipse.jdt.internal.junit.ui.TestRunnerViewPart"
-            id="org.eclipse.jdt.junit.ResultView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaPerspective">
-         <view
-               relative="org.eclipse.jdt.ui.PackageExplorer"
-               visible="false"
-               id="org.eclipse.jdt.junit.ResultView"
-               relationship="stack">
-         </view>
-         <newWizardShortcut
-               id="org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard">
-         </newWizardShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaPerspective">
-         <actionSet
-               id="org.eclipse.jdt.junit.JUnitActionSet">
-         </actionSet>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-         <actionSet
-               id="org.eclipse.jdt.junit.JUnitActionSet">
-         </actionSet>
-         <newWizardShortcut
-               id="org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard">
-         </newWizardShortcut>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%PreferencePage.label"
-            category="org.eclipse.jdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.jdt.internal.junit.ui.JUnitPreferencePage"
-            id="org.eclipse.jdt.junit.preferences">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="%Launch.label"
-            delegate="org.eclipse.jdt.internal.junit.launcher.JUnitLaunchConfiguration"
-            modes="run, debug"
-            id="org.eclipse.jdt.junit.launchconfig"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-         <fileExtension
-               default="false"
-               extension="java">
-         </fileExtension>
-         <fileExtension
-               default="false"
-               extension="class">
-         </fileExtension>
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationComparators">
-      <launchConfigurationComparator
-            attribute="org.eclipse.jdt.junit.CONTAINER"
-            class="org.eclipse.jdt.internal.junit.launcher.ContainerComparator"
-            id="org.eclipse.jdt.junit.containerComparator">
-      </launchConfigurationComparator>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/full/obj16/julaunch.gif"
-            configTypeID="org.eclipse.jdt.junit.launchconfig"
-            id="org.eclipse.jdt.junit.launchimage">
-      </launchConfigurationTypeImage>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="org.eclipse.jdt.junit.launchconfig"
-            helpContextId="org.eclipse.jdt.junit.junit_tab_group"
-            class="org.eclipse.jdt.internal.junit.launcher.JUnitTabGroup"
-            id="org.eclipse.jdt.junit.launchConfigurationTabGroup.junit">
-         <launchMode
-               perspective="org.eclipse.debug.ui.DebugPerspective"
-               description="%JUnitTabGroupDescription.debug"
-               mode="debug">
-         </launchMode>
-         <launchMode
-               description="%JUnitTabGroupDescription.run"
-               mode="run">
-         </launchMode>
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%WizardCategory.name"
-            parentCategory="org.eclipse.jdt.ui.java"
-            id="org.eclipse.jdt.junit">
-      </category>
-      <wizard
-            name="%TestCaseWizard.name"
-            icon="icons/full/etool16/new_testcase.gif"
-            category="org.eclipse.jdt.ui.java/org.eclipse.jdt.junit"
-            id="org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard">
-         <class
-               class="org.eclipse.jdt.internal.junit.wizards.NewTestCaseCreationWizard">
-            <parameter
-                  name="javatype"
-                  value="true">
-            </parameter>
-         </class>
-<!-- see bug 48164 for wrong pde compiler warnings -->
-         <description>
-            %TestWizard.description
-         </description>
-      </wizard>
-      <wizard
-            name="%TestSuiteWizard.name"
-            icon="icons/full/etool16/new_testsuite.gif"
-            category="org.eclipse.jdt.ui.java/org.eclipse.jdt.junit"
-            class="org.eclipse.jdt.internal.junit.wizards.NewTestSuiteCreationWizard"
-            id="org.eclipse.jdt.junit.wizards.NewTestSuiteCreationWizard">
-         <description>
-            %SuiteWizard.description
-         </description>
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.ICompilationUnit"
-            nameFilter="AllTests.java"
-            id="org.eclipse.jdt.junit.wizards.UpdateTestSuite">
-         <action
-               label="%UpdateSuiteAction.label"
-               class="org.eclipse.jdt.internal.junit.wizards.UpdateTestSuite"
-               tooltip="%UpdateSuiteAction.tooltip"
-               enablesFor="1"
-               id="updateTestSuite">
-         </action>
-      </objectContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%JUnitActionSet.label"
-            visible="false"
-            id="org.eclipse.jdt.junit.JUnitActionSet">
-         <menu
-               label="%searchMenu.label"
-               path="navigate"
-               id="org.eclipse.search.menu">
-            <groupMarker
-                  name="internalDialogGroup">
-            </groupMarker>
-<!-- not to be used by clients  -->
-            <groupMarker
-                  name="dialogGroup">
-            </groupMarker>
-<!-- to be used by clients      -->
-            <separator
-                  name="contextMenuActionsGroup">
-            </separator>
-            <separator
-                  name="internalOccurrencesGroup">
-            </separator>
-         </menu>
-		<action
-               definitionId="org.eclipse.jdt.junit.gotoTest"
-               label="%GotoTestAction.label"
-               helpContextId="org.eclipse.jdt.junit.goto_referenced_test_action_context"
-               class="org.eclipse.jdt.internal.junit.ui.GotoReferencedTestAction"
-               tooltip="%GotoTestAction.tooltip"
-               menubarPath="org.eclipse.search.menu/internalOccurrencesGroup"
-               id="junit.actions.GotoTestAction">
-         </action>
-      </actionSet>
-   </extension>
-      <extension
-         point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation
-            targetID="org.eclipse.jdt.junit.JUnitActionSet">
-         <part
-               id="org.eclipse.jdt.ui.PackageExplorer">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.TypeHierarchy">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.CompilationUnitEditor">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.ClassFileEditor">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.ProjectsView">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.PackagesView">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.TypesView">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.MembersView">
-         </part>
-         <part
-               id="org.eclipse.search.SearchResultView">
-         </part>
-      </actionSetPartAssociation>
-   </extension>
-   <extension
-         id="junit_task"
-         name="%Task.name"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.core.resources.taskmarker">
-      </super>
-      <persistent
-            value="true">
-      </persistent>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchShortcuts">
-      <shortcut
-            label="%JUnitShortcut.label"
-            icon="icons/full/obj16/julaunch.gif"
-            helpContextId="org.eclipse.jdt.junit.launch_shortcut"
-            class="org.eclipse.jdt.internal.junit.launcher.JUnitLaunchShortcut"
-            modes="run, debug"
-            id="org.eclipse.jdt.junit.junitShortcut">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-               		<iterate>
-                 		<or>
-                   			<test property="org.eclipse.debug.ui.matchesPattern" value="*.java"/>
-                   			<test property="org.eclipse.debug.ui.matchesPattern" value="*.class"/>
-                   			<instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-                 		</or>
-                 		<test property="org.eclipse.jdt.junit.isTest"/>
-               		</iterate>
-               </with>
-            </enablement>
-         </contextualLaunch>
-         <perspective
-               id="org.eclipse.jdt.ui.JavaPerspective">
-         </perspective>
-         <perspective
-               id="org.eclipse.jdt.ui.JavaHierarchyPerspective">
-         </perspective>
-         <perspective
-               id="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-         </perspective>
-         <perspective
-               id="org.eclipse.debug.ui.DebugPerspective">
-         </perspective>
-      </shortcut>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.core.classpathVariableInitializer">
-      <classpathVariableInitializer
-            variable="JUNIT_HOME"
-            class="org.eclipse.jdt.internal.junit.ui.JUnitHomeInitializer">
-      </classpathVariableInitializer>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.ui.quickFixProcessors">
-      <quickFixProcessor
-            name="%junitQuickFixProcessor"
-            class="org.eclipse.jdt.internal.junit.ui.JUnitQuickFixProcessor"
-            id="org.eclipse.jdt.junit.JUnitQuickFixProcessor">
-      </quickFixProcessor>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            properties="isTest"
-            namespace="org.eclipse.jdt.junit"
-            type="org.eclipse.core.runtime.IAdaptable"
-            class="org.eclipse.jdt.internal.junit.ui.JavaTypeExtender"
-            id="org.eclipse.jdt.junit.ITypeExtender">
-      </propertyTester>
-   </extension>
-   <extension
-         point="org.eclipse.ltk.core.refactoring.renameParticipants">
-      <renameParticipant
-            name="%RenameTypeParticipant.name"
-            class="org.eclipse.jdt.internal.junit.refactoring.TypeRenameParticipant"
-            id="org.eclipse.jdt.junit.renameTypeParticipant">
-         <enablement>
-            <with
-                  variable="affectedNatures">
-               <iterate operator="or">
-                  <equals
-                        value="org.eclipse.jdt.core.javanature">
-                  </equals>
-               </iterate>
-            </with>
-            <with
-                  variable="element">
-               <instanceof
-                     value="org.eclipse.jdt.core.IType">
-               </instanceof>
-               <test
-                     property="org.eclipse.jdt.junit.isTest">
-               </test>
-            </with>
-         </enablement>
-      </renameParticipant>
-      <renameParticipant
-            class="org.eclipse.jdt.internal.junit.refactoring.ProjectRenameParticipant"
-            name="%junitRenameParticipant"
-            id="org.eclipse.jdt.junit.renameTypeParticipant">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-   	         <instanceof value="org.eclipse.jdt.core.IJavaProject"/>
-           </with>
-         </enablement>
-      </renameParticipant>
-      
-   </extension>
-   <extension
-         point="org.eclipse.jdt.junit.junitLaunchConfigs">
-      <launchConfigType
-            configTypeID="org.eclipse.jdt.junit.launchconfig">
-      </launchConfigType>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.junit.internal-testRunTabs">
-      <testRunTab class="org.eclipse.jdt.internal.junit.ui.FailureTab"/>
-      <testRunTab class="org.eclipse.jdt.internal.junit.ui.TestHierarchyTab"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-         name="%GotoTestCommand.name"
-         description="%GotoTestCommand.description"
-         category="org.eclipse.search.ui.category.search"
-         id="org.eclipse.jdt.junit.gotoTest">
-      </command>
-      <command
-            name="%ViewCommand.junitView.name"
-            description="%ViewCommand.junitView.description"
-            category="org.eclipse.ui.category.views"
-            id="org.eclipse.jdt.junit.ResultView">
-      </command>
-      <keyBinding
-            string=""
-            scope="org.eclipse.ui.globalScope"
-            command="org.eclipse.jdt.junit.ResultView"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-   </extension>
-</plugin>

diff --git a/org.eclipse.jdt.junit.core/schema/testRunListeners.exsd b/org.eclipse.jdt.junit.core/schema/testRunListeners.exsd
deleted file mode 100644
index 1afa681..0000000
--- a/org.eclipse.jdt.junit.core/schema/testRunListeners.exsd
+++ /dev/null

@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jdt.junit">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jdt.junit" id="testRunListeners" name="Test Run Listeners"/>
-      </appInfo>
-      <documentation>
-         Extension point to register additional test run listeners. A test run listeners is notified about the execution of a test run.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            a fully qualified identifier of the target extension point
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="testRunListener"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="testRunListener">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Test run class implementing org.eclipse.jdt.junit.ITestRunListener
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jdt.junit.ITestRunListener"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.1
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a test run listener contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jdt.junit.testRunListeners&quot;&gt;
-  &lt;testRunListener class=&quot;com.example.SampleTestRunListener&quot;/&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Test run listeners must must implement the org.eclipse.jdt.junit.ITestRunListener interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2004 IBM Corporation and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitCorePlugin.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitCorePlugin.java
deleted file mode 100644
index 360af78..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitCorePlugin.java
+++ /dev/null

@@ -1,454 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *   Julien Ruaux: jruaux@octo.com
- * 	 Vincent Massol: vmassol@octo.com
- ******************************************************************************/
-
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.AbstractSet;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchListener;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.launcher.JUnitBaseLaunchConfiguration;
-import org.eclipse.jdt.junit.ITestRunListener;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The plug-in runtime class for the JUnit plug-in.
- */
-public class JUnitPlugin extends AbstractUIPlugin implements ILaunchListener {
-	/**
-	 * The single instance of this plug-in runtime class.
-	 */
-	private static JUnitPlugin fgPlugin= null;
-
-	public static final String PLUGIN_ID= "org.eclipse.jdt.junit"; //$NON-NLS-1$
-	public static final String ID_EXTENSION_POINT_TESTRUN_LISTENERS= PLUGIN_ID + "." + "testRunListeners"; //$NON-NLS-1$ //$NON-NLS-2$
-	public static final String ID_EXTENSION_POINT_JUNIT_LAUNCHCONFIGS= PLUGIN_ID + "." + "junitLaunchConfigs"; //$NON-NLS-1$ //$NON-NLS-2$
-
-	public final static String TEST_SUPERCLASS_NAME= "junit.framework.TestCase"; //$NON-NLS-1$
-	public final static String TEST_INTERFACE_NAME= "junit.framework.Test"; //$NON-NLS-1$
-	public static final String SIMPLE_TEST_INTERFACE_NAME= "Test"; //$NON-NLS-1$
-	
-	/**
-	 * The class path variable referring to the junit home location
-	 */
-	public final static String JUNIT_HOME= "JUNIT_HOME"; //$NON-NLS-1$
-
-	private static URL fgIconBaseURL;
-
-	/**
-	 * Use to track new launches. We need to do this
-	 * so that we only attach a TestRunner once to a launch.
-	 * Once a test runner is connected it is removed from the set.
-	 */
-	private AbstractSet fTrackedLaunches= new HashSet(20);
-
-	/**
-	 * List storing the registered test run listeners
-	 */
-	private List fTestRunListeners;
-
-	/**
-	 * List storing the registered JUnit launch configuration types
-	 */
-	private List fJUnitLaunchConfigTypeIDs;
-
-
-	public JUnitPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		fgPlugin= this;
-		String pathSuffix= "icons/full/"; //$NON-NLS-1$
-		try {
-			fgIconBaseURL= new URL(Platform.getBundle(PLUGIN_ID).getEntry("/"), pathSuffix); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-			// do nothing
-		}
-	}
-	
-	public static JUnitPlugin getDefault() {
-		return fgPlugin;
-	}
-
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow workBenchWindow= getActiveWorkbenchWindow();
-		if (workBenchWindow == null)
-			return null;
-		return workBenchWindow.getShell();
-	}
-
-	/**
-	 * Returns the active workbench window
-	 * 
-	 * @return the active workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		if (fgPlugin == null)
-			return null;
-		IWorkbench workBench= fgPlugin.getWorkbench();
-		if (workBench == null)
-			return null;
-		return workBench.getActiveWorkbenchWindow();
-	}
-
-	public static IWorkbenchPage getActivePage() {
-		IWorkbenchWindow activeWorkbenchWindow= getActiveWorkbenchWindow();
-		if (activeWorkbenchWindow == null)
-			return null;
-		return activeWorkbenchWindow.getActivePage();
-	}
-
-	public static String getPluginId() {
-		return PLUGIN_ID;
-	}
-
-	/*
-	 * @see AbstractUIPlugin#initializeDefaultPreferences
-	 */
-	protected void initializeDefaultPreferences(IPreferenceStore store) {
-		super.initializeDefaultPreferences(store);
-		JUnitPreferencePage.initializeDefaults(store);
-	}
-
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, "Error", e)); //$NON-NLS-1$
-	}
-
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	public static URL makeIconFileURL(String name) throws MalformedURLException {
-		if (JUnitPlugin.fgIconBaseURL == null)
-			throw new MalformedURLException();
-		return new URL(JUnitPlugin.fgIconBaseURL, name);
-	}
-
-	static ImageDescriptor getImageDescriptor(String relativePath) {
-		try {
-			return ImageDescriptor.createFromURL(makeIconFileURL(relativePath));
-		} catch (MalformedURLException e) {
-			// should not happen
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-
-	/*
-	 * @see ILaunchListener#launchRemoved(ILaunch)
-	 */
-	public void launchRemoved(final ILaunch launch) {
-		fTrackedLaunches.remove(launch);
-		getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				TestRunnerViewPart testRunnerViewPart= findTestRunnerViewPartInActivePage();
-				if (testRunnerViewPart != null && testRunnerViewPart.isCreated() && launch.equals(testRunnerViewPart.getLastLaunch()))
-					testRunnerViewPart.reset();
-			}
-		});
-	}
-
-	/*
-	 * @see ILaunchListener#launchAdded(ILaunch)
-	 */
-	public void launchAdded(ILaunch launch) {
-		fTrackedLaunches.add(launch);
-	}
-
-	public void connectTestRunner(ILaunch launch, IType launchedType, int port) {
-		TestRunnerViewPart testRunnerViewPart= showTestRunnerViewPartInActivePage(findTestRunnerViewPartInActivePage());
-		if (testRunnerViewPart != null)
-			testRunnerViewPart.startTestRunListening(launchedType, port, launch);
-	}
-
-	private TestRunnerViewPart showTestRunnerViewPartInActivePage(TestRunnerViewPart testRunner) {
-		IWorkbenchPart activePart= null;
-		IWorkbenchPage page= null;
-		try {
-			// TODO: have to force the creation of view part contents 
-			// otherwise the UI will not be updated
-			if (testRunner != null && testRunner.isCreated())
-				return testRunner;
-			page= getActivePage();
-			if (page == null)
-				return null;
-			activePart= page.getActivePart();
-			//	show the result view if it isn't shown yet
-			return (TestRunnerViewPart) page.showView(TestRunnerViewPart.NAME);
-		} catch (PartInitException pie) {
-			log(pie);
-			return null;
-		} finally{
-			//restore focus stolen by the creation of the result view
-			if (page != null && activePart != null)
-				page.activate(activePart);
-		}
-	}
-
-	private TestRunnerViewPart findTestRunnerViewPartInActivePage() {
-		IWorkbenchPage page= getActivePage();
-		if (page == null)
-			return null;
-		return (TestRunnerViewPart) page.findView(TestRunnerViewPart.NAME);
-	}
-
-	/*
-	 * @see ILaunchListener#launchChanged(ILaunch)
-	 */
-	public void launchChanged(final ILaunch launch) {
-		if (!fTrackedLaunches.contains(launch))
-			return;
-
-		ILaunchConfiguration config= launch.getLaunchConfiguration();
-		IType launchedType= null;
-		int port= -1;
-		if (config != null) {
-			// test whether the launch defines the JUnit attributes
-			String portStr= launch.getAttribute(JUnitBaseLaunchConfiguration.PORT_ATTR);
-			String typeStr= launch.getAttribute(JUnitBaseLaunchConfiguration.TESTTYPE_ATTR);
-			if (portStr != null && typeStr != null) {
-				port= Integer.parseInt(portStr);
-				IJavaElement element= JavaCore.create(typeStr);
-				if (element instanceof IType)
-					launchedType= (IType) element;
-			}
-		}
-		if (launchedType != null) {
-			fTrackedLaunches.remove(launch);
-			final int finalPort= port;
-			final IType finalType= launchedType;
-			getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					connectTestRunner(launch, finalType, finalPort);
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see AbstractUIPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		ILaunchManager launchManager= DebugPlugin.getDefault().getLaunchManager();
-		launchManager.addLaunchListener(this);
-	}
-
-	/**
-	 * @see AbstractUIPlugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		try {
-			ILaunchManager launchManager= DebugPlugin.getDefault().getLaunchManager();
-			launchManager.removeLaunchListener(this);
-		} finally {
-			super.stop(context);
-		}
-	}
-
-	public static Display getDisplay() {
-//		Shell shell= getActiveWorkbenchShell();
-//		if (shell != null) {
-//			return shell.getDisplay();
-//		}
-		Display display= Display.getCurrent();
-		if (display == null) {
-			display= Display.getDefault();
-		}
-		return display;
-	}
-	/**
-	 * Utility method to create and return a selection dialog that allows
-	 * selection of a specific Java package.  Empty packages are not returned.
-	 * If Java Projects are provided, only packages found within those projects
-	 * are included.  If no Java projects are provided, all Java projects in the
-	 * workspace are considered.
-	 */
-	public static ElementListSelectionDialog createAllPackagesDialog(Shell shell, IJavaProject[] originals, final boolean includeDefaultPackage) throws JavaModelException {
-		final List packageList= new ArrayList();
-		if (originals == null) {
-			IWorkspaceRoot wsroot= ResourcesPlugin.getWorkspace().getRoot();
-			IJavaModel model= JavaCore.create(wsroot);
-			originals= model.getJavaProjects();
-		}
-		final IJavaProject[] projects= originals;
-		final JavaModelException[] exception= new JavaModelException[1];
-		
-		IRunnableWithProgress r= new IRunnableWithProgress() {
-			public void run(IProgressMonitor pm) {
-				try {
-					Set packageNameSet= new HashSet();
-					pm.beginTask(JUnitMessages.getString("JUnitPlugin.searching"), projects.length); //$NON-NLS-1$
-					for (int i= 0; i < projects.length; i++) {
-						IPackageFragment[] pkgs= projects[i].getPackageFragments();
-						for (int j= 0; j < pkgs.length; j++) {
-							IPackageFragment pkg= pkgs[j];
-							if (!pkg.hasChildren() && (pkg.getNonJavaResources().length > 0))
-								continue;
-
-							String pkgName= pkg.getElementName();
-							if (!includeDefaultPackage && pkgName.length() == 0)
-								continue;
-
-							if (packageNameSet.add(pkgName))
-								packageList.add(pkg);
-						}
-						pm.worked(1);
-					}
-					pm.done();
-				} catch (JavaModelException jme) {
-					exception[0]= jme;
-				}
-			}
-		};
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(r);
-		} catch (InvocationTargetException e) {
-			JUnitPlugin.log(e);
-		} catch (InterruptedException e) {
-			JUnitPlugin.log(e);
-		}
-		if (exception[0] != null)
-			throw exception[0];
-
-		int flags= JavaElementLabelProvider.SHOW_DEFAULT;
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(shell, new JavaElementLabelProvider(flags));
-		dialog.setIgnoreCase(false);
-		dialog.setElements(packageList.toArray()); // XXX inefficient
-		return dialog;
-	}
-
-	/**
-	 * Initializes TestRun Listener extensions
-	 */
-	private void loadTestRunListeners() {
-		fTestRunListeners= new ArrayList();
-		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(ID_EXTENSION_POINT_TESTRUN_LISTENERS);
-		if (extensionPoint == null) {
-			return;
-		}
-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
-		MultiStatus status= new MultiStatus(PLUGIN_ID, IStatus.OK, "Could not load some testRunner extension points", null); //$NON-NLS-1$ 	
-
-		for (int i= 0; i < configs.length; i++) {
-			try {
-				ITestRunListener testRunListener= (ITestRunListener) configs[i].createExecutableExtension("class"); //$NON-NLS-1$
-				fTestRunListeners.add(testRunListener);
-			} catch (CoreException e) {
-				status.add(e.getStatus());
-			}
-		}
-		if (!status.isOK()) {
-			JUnitPlugin.log(status);
-		}
-	}
-
-	/**
-	 * Loads the registered JUnit launch configurations
-	 */
-	private void loadLaunchConfigTypeIDs() {
-		fJUnitLaunchConfigTypeIDs= new ArrayList();
-		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(ID_EXTENSION_POINT_JUNIT_LAUNCHCONFIGS);
-		if (extensionPoint == null) {
-			return;
-		}
-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
-
-		for (int i= 0; i < configs.length; i++) {
-			String configTypeID= configs[i].getAttribute("configTypeID"); //$NON-NLS-1$
-			fJUnitLaunchConfigTypeIDs.add(configTypeID);
-		}
-	}
-
-	/**
-	 * Returns an array of all TestRun listeners
-	 */
-	public List getTestRunListeners() {
-		if (fTestRunListeners == null) {
-			loadTestRunListeners();
-		}
-		return fTestRunListeners;
-	}
-
-	/**
-	 * Returns an array of all JUnit launch config types
-	 */
-	public List getJUnitLaunchConfigTypeIDs() {
-		if (fJUnitLaunchConfigTypeIDs == null) {
-			loadLaunchConfigTypeIDs();
-		}
-		return fJUnitLaunchConfigTypeIDs;
-	}
-
-	/**
-	 * Adds a TestRun listener to the collection of listeners
-	 */
-	public void addTestRunListener(ITestRunListener newListener) {
-		if (fTestRunListeners == null) 
-			loadTestRunListeners();
-		for (Iterator iter= fTestRunListeners.iterator(); iter.hasNext();) {
-			Object o= iter.next();
-			if (o == newListener)
-				return;
-		}
-		fTestRunListeners.add(newListener);
-	}
-
-	/**
-	 * Removes a TestRun listener to the collection of listeners
-	 */
-	public void removeTestRunListener(ITestRunListener newListener) {
-		if (fTestRunListeners != null) 
-			fTestRunListeners.remove(newListener);
-	}
-
-}

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.java
deleted file mode 100644
index f276af8..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class JUnitMessages {
-
-	private static final String BUNDLE_NAME= "org.eclipse.jdt.internal.junit.ui.JUnitMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private JUnitMessages() {
-	}
-
-	/**
-	 * Gets a string from the resource bundle and formats it with the argument
-	 * 
-	 * @param key	the string used to get the bundle value, must not be null
-	 */
-	public static String getFormattedString(String key, Object arg) {
-		return MessageFormat.format(getString(key), new Object[] { arg });
-	}
-
-	/**
-	 * Gets a string from the resource bundle and formats it with arguments
-	 */	
-	public static String getFormattedString(String key, Object[] args) {
-		return MessageFormat.format(getString(key), args);
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.properties b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.properties
deleted file mode 100644
index cd71ad5..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.properties
+++ /dev/null

@@ -1,196 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-CopyTrace.action.label=Copy Trace
-CopyTraceAction.problem=Problem Copying to Clipboard
-CopyTraceAction.clipboard_busy=There was a problem when accessing the system clipboard. Retry?
-
-CopyFailureList.action.label=Copy Failure List
-CopyFailureList.problem=Problem Copying Failure List to Clipboard
-CopyFailureList.clipboard_busy=There was a problem when accessing the system clipboard. Retry?
-
-CounterPanel.label.runs=Runs: 
-CounterPanel.label.errors=Errors: 
-CounterPanel.label.failures=Failures: 
-CounterPanel.runcount= {0}/{1}
-
-EnableStackFilterAction.action.label=Filter
-EnableStackFilterAction.action.description=Filter the stack trace
-EnableStackFilterAction.action.tooltip=Filter Stack Trace
-
-ScrollLockAction.action.label=Scroll Lock
-ScrollLockAction.action.description=Scroll lock
-ScrollLockAction.action.tooltip=Scroll Lock
-
-FailureRunView.tab.tooltip=Failures and Errors
-FailureRunView.tab.title=Failures
-FailureRunView.labelfmt= {0} - {1}
-
-FilterPatternsDialog.message.notempty=Filter must not be empty
-
-HierarchyRunView.tab.tooltip=Test Hierarchy
-HierarchyRunView.tab.title=Hierarchy
-
-JUnitPlugin.error.cannotshow=Could not show JUnit Result View
-JUnitPlugin.searching=Searching
-
-JUnitPreferencePage.description=JUnit settings:
-JUnitPreferencePage.addfilterbutton.label=Add &Filter
-JUnitPreferencePage.addfilterbutton.tooltip=Type the Name of a New Stack Filter
-JUnitPreferencePage.addtypebutton.label=Add &Class...
-JUnitPreferencePage.addtypebutton.tooltip=Choose a Java Type and Add It to Stack Filters
-JUnitPreferencePage.addpackagebutton.label=Add &Packages...
-JUnitPreferencePage.addpackagebutton.tooltip=Choose Package(s) to Add to Stack Filters
-JUnitPreferencePage.removefilterbutton.label=&Remove
-JUnitPreferencePage.removefilterbutton.tooltip=Remove All Selected Stack Filters
-JUnitPreferencePage.enableallbutton.label=&Enable All
-JUnitPreferencePage.enableallbutton.tooltip=Enables All Stack Filters
-JUnitPreferencePage.disableallbutton.label=Disa&ble All
-JUnitPreferencePage.disableallbutton.tooltip=Disables All Stack Filters
-JUnitPreferencePage.filter.label=&Stack trace filter patterns (changes only apply to new test runs):
-JUnitPreferencePage.adddialog.title=Add Stack Filter Pattern
-JUnitPreferencePage.addialog.prompt=Enter Filter Pattern:
-JUnitPreferencePage.showcheck.label=Show the JUnit results &view only when an error or failure occurs
-JUnitPreferencePage.invalidstepfilterreturnescape=Invalid stack filter. Press Enter to continue editing or Escape to cancel.  
-JUnitPreferencePage.addtypedialog.title=Add Class to Stack Filters
-JUnitPreferencePage.addtypedialog.message=&Select a class to filter in the failure stack trace.
-JUnitPreferencePage.addtypedialog.error.message=Could not open type selection dialog for stack filters.
-JUnitPreferencePage.addpackagedialog.title=Add Packages to Stack Filters
-JUnitPreferencePage.addpackagedialog.message=&Select a package to filter in the failure stack trace.
-JUnitPreferencePage.addpackagedialog.error.message=Could not open package selection dialog for stack filters.
-
-OpenEditorAction.action.label=&Go to File
-OpenEditorAction.error.cannotopen.title=Cannot Open Editor
-OpenEditorAction.error.cannotopen.message=Test class not found in selected project
-OpenEditorAction.error.dialog.title=Error
-OpenEditorAction.error.dialog.message=Cannot open editor
-OpenEditorAction.message.cannotopen=Cannot open editor
-
-OpenTestAction.error.title=Go To Test
-OpenTestAction.error.methodNoFound=Method ''{0}'' not found. Opening the test class.
-
-
-TestRunnerViewPart.jobName=Update JUnit
-TestRunnerViewPart.stopaction.text=Stop JUnit Test
-TestRunnerViewPart.stopaction.tooltip=Stop JUnit Test Run
-TestRunnerViewPart.rerunaction.label=Rerun Last Test
-TestRunnerViewPart.rerunaction.tooltip=Rerun Last Test
-TestRunnerViewPart.error.cannotrerun=Could not rerun test
-TestRunnerViewPart.message.terminated=Terminated
-TestRunnerViewPart.message.launching=Launching...
-TestRunnerViewPart.cannotrerun.title=Rerun Test
-TestRunnerViewPart.cannotrerurn.message=To rerun tests they must be launched under the debugger\nand \'Keep JUnit running\' must be set in the launch configuration.
-TestRunnerViewPart.message.cannotshow=Could not show JUnit Result View
-TestRunnerViewPart.label.failure=Failure Trace
-TestRunnerViewPart.message.finish= Finished after {0} seconds
-TestRunnerViewPart.message.stopped= Stopped
-TestRunnerViewPart.message.started= {0} - {1}
-TestRunnerViewPart.message.failure= {0}({1}) had a failure
-TestRunnerViewPart.message.error= {0}({1}) had an error
-TestRunnerViewPart.message.success= {0}({1}) was successful
-TestRunnerViewPart.title= JUnit ({0})
-TestRunnerViewPart.title_no_type=JUnit
-TestRunnerViewPart.configName=Rerun {0}
-TestRunnerViewPart.toggle.vertical.label=&Vertical View Orientation
-TestRunnerViewPart.toggle.horizontal.label=&Horizontal View Orientation
-TestRunnerViewPart.toggle.automatic.label=&Automatic View Orientation
-TestRunnerViewPart.terminate.title=Run Last Test
-TestRunnerViewPart.terminate.message=Terminate currently running tests?
-
-JUnitBaseLaunchConfiguration.error.invalidproject=Invalid project specified
-JUnitBaseLaunchConfiguration.error.novmrunner=Internal error: JRE {0} does not specify a VM Runner
-JUnitBaseLaunchConfiguration.error.notests=No tests found
-
-JUnitMainTab.label.oneTest=&Run a single test
-JUnitMainTab.label.project=&Project:
-JUnitMainTab.label.browse=&Browse...
-JUnitMainTab.label.test=T&est class:
-JUnitMainTab.label.search=&Search...
-JUnitMainTab.label.containerTest=Run &all tests in the selected project, package or source folder:
-JUnitMainTab.label.keeprunning=&Keep JUnit running after a test run when debugging
-JUnitMainTab.testdialog.title=Test Selection
-JUnitMainTab.testdialog.message=Choose a test case or test suite:
-JUnitMainTab.projectdialog.title=Project Selection
-JUnitMainTab.projectdialog.message=Choose a project to constrain the search for main types:
-JUnitMainTab.tab.label=Test
-JUnitMainTab.label.defaultpackage=(default package)
-JUnitMainTab.label.method=Test method: 
-JUnitMainTab.folderdialog.title=Folder Selection
-JUnitMainTab.folderdialog.message=Choose a Project, Source Folder or Package:
-JUnitMainTab.error.projectnotdefined=Project not specified
-JUnitMainTab.error.projectnotexists=Project does not exist
-JUnitMainTab.error.notJavaProject=Specified project is not a Java project
-JUnitMainTab.error.testnotdefined=Test not specified
-JUnitMainTab.error.testnotexists=Test class does not exist
-JUnitMainTab.error.invalidTest=Specified class is not a valid test class
-JUnitMainTab.error.noContainer=No project, source folder or package is specified 
-
-TestSearchEngine.message.searching=Searching suites
-LaunchTestAction.dialog.title=JUnit Launch
-LaunchTestAction.message.notests=No JUnit tests found.
-LaunchTestAction.dialog.title2=Test Selection
-LaunchTestAction.message.selectTestToRun=Select Test to debug
-LaunchConfigProjectChange.configDeleted=A launch configuration affected by this change was deleted.
-LaunchConfigTypeChange.configDeleted=A launch configuration affected by this change was deleted.
-LaunchTestAction.message.selectTestToDebug=Select Test to run
-LaunchTestAction.message.launchFailed=JUnit Launch Failed
-LaunchTestAction.message.selectConfiguration=Select a Test Configuration
-LaunchTestAction.message.selectDebugConfiguration=Select JUnit configuration to debug
-LaunchTestAction.message.selectRunConfiguration=Select JUnit configuration to run
-
-ShowNextFailureAction.label=Next Failure
-ShowNextFailureAction.tooltip=Next Failed Test
-ShowPreviousFailureAction.label=Previous Failure
-ShowPreviousFailureAction.tooltip=Previous Failed Test
-
-GotoReferencedTestAction.dialog.message=Select a method, type, or compilation unit to open tests that refer to them.
-GotoReferencedTestAction.dialog.title=Search Referring Tests
-GotoReferencedTestAction.dialog.error.nomethod=Selection is not inside a type or method.
-GotoReferencedTestAction.dialog.error=Test cannot be found
-GotoReferencedTestAction.selectdialog.title=Select Test
-GotoReferencedTestAction.dialog.select_message=Select a test that refers to ''{0}''.
-
-TestMethodSelectionDialog.error.title=Select Test
-TestMethodSelectionDialog.no_tests.title=Go to Test
-TestMethodSelectionDialog.error.notfound.title=Find Test
-TestMethodSelectionDialog.error.notfound.message=Could not find test
-TestMethodSelectionDialog.select_dialog.title=Select Test
-TestMethodSelectionDialog.dialog.title=Go to Referring Tests
-TestMethodSelectionDialog.notfound_message=No tests found that reference ''{0}''.
-TestMethodSelectionDialog.test_not_found=Cannot find ''{0}'' - make sure that JUnit is on the project's classpath.
-TestMethodSelectionDialog.testproject=Multiple projects contain ''{0}''. Select one project to be used when searching for tests.
-
-Resources.outOfSyncResources= Some resources are out of sync
-Resources.outOfSync= Resource ''{0}'' is out of sync with file system.
-Resources.modifiedResources= There are modified resources
-Resources.fileModified= File ''{0}'' has been modified since the beginning of the operation
-
-ExpandAllAction.text=Expand All
-ExpandAllAction.tooltip=Expand All Nodes
-
-JUnitAddLibraryProposal.info=Add the JUnit library to the project\'s build class path
-JUnitAddLibraryProposal.label=Add JUnit libraries
-JUnitAddLibraryProposal.title=Error
-JUnitAddLibraryProposal.cannotAdd=Cannot add the JUnit library to the build path.
-
-CompareResultsAction.label=Compare Result
-CompareResultsAction.description=Compare the actual and expected test result
-CompareResultsAction.tooltip=Compare Actual With Expected Test Result
-
-CompareResultDialog.title=Result Comparison
-CompareResultDialog.labelOK=OK
-CompareResultDialog.expectedLabel=Expected
-CompareResultDialog.actualLabel=Actual
-
-TypeRenameParticipant.name=JUnit Launch configuration participant
-TypeRenameParticipant.change.name=JUnit Launch configuration update
-
-RerunAction.label.run=&Run
-RerunAction.label.debug=&Debug

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/ContainerComparator.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/ContainerComparator.java
deleted file mode 100644
index 52145dd..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/ContainerComparator.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
-import java.util.Comparator;
-
-public class ContainerComparator implements Comparator {
-
-    public int compare(Object o1, Object o2) {
-		String container1= (String)o1;
-		String container2= (String)o2;
-		if (container1 == null)
-			container1= ""; //$NON-NLS-1$
-		if (container2 == null)
-			container2= ""; //$NON-NLS-1$
-		return container1.compareTo(container2);
-    }
-}

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/IJUnitStatusConstants.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/IJUnitStatusConstants.java
deleted file mode 100644
index 2b19523..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/IJUnitStatusConstants.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-public interface IJUnitStatusConstants {
-
-	// JUnit UI status constants start at 10000 to make sure that we don't
-	// collide with resource and java model constants.
-	
-	public static final int INTERNAL_ERROR= 10001;
-	
-	/**
-	 * Status constant indicating that an validateEdit call has changed the
-	 * content of a file on disk.
-	 */
-	public static final int VALIDATE_EDIT_CHANGED_CONTENT= 10003;
-	
-}

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java
deleted file mode 100644
index 7446737..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ISourceReference;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.core.search.SearchParticipant;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.SearchRequestor;
-
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-
-/**
- * Custom Search engine for suite() methods
- */
-public class TestSearchEngine {
-
-	private static class JUnitSearchResultCollector extends SearchRequestor {
-		List fList;
-		Set fFailed= new HashSet();
-		Set fMatches= new HashSet();
-		
-		public JUnitSearchResultCollector(List list) {
-			fList= list;
-		}
-		
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-			Object enclosingElement= match.getElement();
-			if (!(enclosingElement instanceof IMethod)) 
-				return;
-			
-			IMethod method= (IMethod)enclosingElement;		
-			
-			IType declaringType= method.getDeclaringType();
-			if (fMatches.contains(declaringType) || fFailed.contains(declaringType))
-				return;
-			if (!hasSuiteMethod(declaringType) && !isTestType(declaringType)) {
-				fFailed.add(declaringType);
-				return;
-			}
-			fMatches.add(declaringType);
-		}
-		
-		public void endReporting() {
-			fList.addAll(fMatches);
-		}
-	}
-	
-	private List searchMethod(IProgressMonitor pm, final IJavaSearchScope scope) throws CoreException {
-		final List typesFound= new ArrayList(200);	
-		searchMethod(typesFound, scope, pm);
-		return typesFound;	
-	}
-
-	private List searchMethod(final List v, IJavaSearchScope scope, final IProgressMonitor progressMonitor) throws CoreException {		
-		SearchRequestor requestor= new JUnitSearchResultCollector(v);
-		SearchPattern suitePattern= SearchPattern.createPattern("suite() Test", IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$
-		SearchPattern testPattern= SearchPattern.createPattern("test*() void", IJavaSearchConstants.METHOD , IJavaSearchConstants.DECLARATIONS, SearchPattern.R_PATTERN_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$
-		SearchPattern pattern= SearchPattern.createOrPattern(suitePattern, testPattern);
-		SearchParticipant[] participants= new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()};
-		new SearchEngine().search(pattern, participants, scope, requestor, progressMonitor); 
-		return v;
-	}
-	
-	public static IType[] findTests(IRunnableContext context, final Object[] elements) throws InvocationTargetException, InterruptedException {
-		final Set result= new HashSet();
-		
-			if (elements.length > 0) {
-				IRunnableWithProgress runnable= new IRunnableWithProgress() {
-					public void run(IProgressMonitor pm) throws InterruptedException {
-						doFindTests(elements, result, pm);
-					}
-				};
-				context.run(true, true, runnable);			
-			}
-			return (IType[]) result.toArray(new IType[result.size()]) ;
-	}
-
-	public static IType[] findTests(final Object[] elements) throws InvocationTargetException, InterruptedException{
-		final Set result= new HashSet();
-	
-		if (elements.length > 0) {
-			IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				public void run(IProgressMonitor pm) throws InterruptedException {
-					doFindTests(elements, result, pm);
-				}
-			};
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(runnable);			
-		}
-		return (IType[]) result.toArray(new IType[result.size()]) ;
-	}
-
-	public static void doFindTests(Object[] elements, Set result, IProgressMonitor pm) throws InterruptedException {
-		int nElements= elements.length;
-		pm.beginTask(JUnitMessages.getString("TestSearchEngine.message.searching"), nElements);  //$NON-NLS-1$
-		try {
-			for (int i= 0; i < nElements; i++) {
-				try {
-					collectTypes(elements[i], new SubProgressMonitor(pm, 1), result);
-				} catch (CoreException e) {
-					JUnitPlugin.log(e.getStatus());
-				}
-				if (pm.isCanceled()) {
-					throw new InterruptedException();
-				}
-			}
-		} finally {
-			pm.done();
-		}
-	}
-
-	private static void collectTypes(Object element, IProgressMonitor pm, Set result) throws CoreException/*, InvocationTargetException*/ {
-		element= computeScope(element);
-		while((element instanceof IJavaElement) && !(element instanceof ICompilationUnit) && (element instanceof ISourceReference)) {
-			if(element instanceof IType) {
-				if (hasSuiteMethod((IType)element) || isTestType((IType)element)) {
-					result.add(element);
-					return;
-				}
-			}
-			element= ((IJavaElement)element).getParent();
-		}
-		if (element instanceof ICompilationUnit) {
-			ICompilationUnit cu= (ICompilationUnit)element;
-			IType[] types= cu.getAllTypes();
-			for (int i= 0; i < types.length; i++) {
-				if (hasSuiteMethod(types[i])  || isTestType(types[i]))
-					result.add(types[i]);
-			}
-		} 
-		else if (element instanceof IJavaElement) {
-			List found= searchSuiteMethods(pm, (IJavaElement)element);
-			result.addAll(found);
-		}
-	}
-
-	private static Object computeScope(Object element) throws JavaModelException {
-		if (element instanceof IFileEditorInput)
-			element= ((IFileEditorInput)element).getFile();
-		if (element instanceof IResource)
-			element= JavaCore.create((IResource)element);
-		if (element instanceof IClassFile) {
-			IClassFile cf= (IClassFile)element;
-			element= cf.getType();
-		}
-		return element;
-	}
-	
-	private static List searchSuiteMethods(IProgressMonitor pm, IJavaElement element) throws CoreException {	
-		// fix for bug 36449  JUnit should constrain tests to selected project [JUnit] 
-		IJavaSearchScope scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { element },
-				IJavaSearchScope.SOURCES | IJavaSearchScope.APPLICATION_LIBRARIES);
-		TestSearchEngine searchEngine= new TestSearchEngine(); 
-		return searchEngine.searchMethod(pm, scope);
-	}
-		
-	public static boolean hasSuiteMethod(IType type) throws JavaModelException {
-		IMethod method= type.getMethod("suite", new String[0]); //$NON-NLS-1$
-		if (method == null || !method.exists()) 
-			return false;
-		
-		if (!Flags.isStatic(method.getFlags()) ||	
-			!Flags.isPublic(method.getFlags()) ||			
-			!Flags.isPublic(method.getDeclaringType().getFlags())) { 
-			return false;
-		}
-		if (!Signature.getSimpleName(Signature.toString(method.getReturnType())).equals(JUnitPlugin.SIMPLE_TEST_INTERFACE_NAME)) {
-			return false;
-		}
-		return true;
-	}
-	
-	private static boolean isTestType(IType type) throws JavaModelException {
-		if (Flags.isAbstract(type.getFlags())) 
-			return false;
-		if (!Flags.isPublic(type.getFlags())) 
-			return false;
-		
-		IType[] interfaces= type.newSupertypeHierarchy(null).getAllSuperInterfaces(type);
-		for (int i= 0; i < interfaces.length; i++)
-			if(interfaces[i].getFullyQualifiedName().equals(JUnitPlugin.TEST_INTERFACE_NAME))
-				return true;
-		return false;
-	}
-
-	public static boolean isTestImplementor(IType type) throws JavaModelException {
-		ITypeHierarchy typeHier= type.newSupertypeHierarchy(null);
-		IType[] superInterfaces= typeHier.getAllInterfaces();
-		for (int i= 0; i < superInterfaces.length; i++) {
-			if (superInterfaces[i].getFullyQualifiedName().equals(JUnitPlugin.TEST_INTERFACE_NAME))
-				return true;
-		}
-		return false;
-	}
-
-	public static boolean isTestOrTestSuite(IType type) throws JavaModelException {
-		return hasSuiteMethod(type) || isTestType(type);
-	}
-
-}

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/ITestRunListener.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/ITestRunListener.java
deleted file mode 100644
index 0e90b46..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/ITestRunListener.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.junit;
-  
-/**
- * A listener interface for observing the execution of a test run.
- * <p>
- * Clients contributing to the 
- * <code>org.eclipse.jdt.junit.testRunListener</code>
- * extension point implement this interface.
- * </p>
- * 
- * @since 2.1
- */
- public interface ITestRunListener {
-	/**
-   	 * Status constant indicating that a test passed (constant value 0).
- 	 * 
-     * @see #testFailed(int, String, String, String)
- 	 */
- 	public static final int STATUS_OK= 0;
- 	/**
-	 * Status constant indicating that a test had an error an unanticipated
-	 * exception (constant value 1).
- 	 * 
-	 * @see #testFailed(int, String, String, String)
- 	 */
- 	public static final int STATUS_ERROR= 1;
- 	/**
-	 * Status constant indicating that a test failed an assertion
-	 * (constant value 2).
- 	 * 
- 	 * @see #testFailed(int, String, String, String)
-	 */
- 	public static final int STATUS_FAILURE= 2;
- 	/**
- 	 * A test run has started.
- 	 * 
- 	 * @param testCount the number of individual tests that will be run
- 	 */
-	public void testRunStarted(int testCount);
-	/**
- 	 * A test run has ended.
-	 *
-	 * @param elapsedTime the total elapsed time of the test run
-	 */
-	public void testRunEnded(long elapsedTime);
-	/**
-	 * A test run has been stopped prematurely.
-	 *
- 	 * @param elapsedTime the time elapsed before the test run was stopped
-	 */
-	public void testRunStopped(long elapsedTime);
-	/**
-	 * An individual test has started.
-	 * 
-	 * @param testId a unique Id identifying the test
-	 * @param testName the name of the test that started
-	 */
-	public void testStarted(String testId, String testName);
-	/**
-	 * An individual test has ended.
-	 * 
-	 * @param testId a unique Id identifying the test
-	 * @param testName the name of the test that ended
-	 */
-	public void testEnded(String testId, String testName);
-	/**
-	 * An individual test has failed with a stack trace.
-	 * 
-	 * @param testId a unique Id identifying the test
- 	 * @param testName the name of the test that failed
-	 * @param status the outcome of the test; one of 
-	 * {@link #STATUS_ERROR STATUS_ERROR} or
-	 * {@link #STATUS_FAILURE STATUS_FAILURE}
-	 * @param trace the stack trace
-	 */
-	public void testFailed(int status, String testId, String testName, String trace);	
-			
-	/**
-	 * The VM instance performing the tests has terminated.
-	 */
-	public void testRunTerminated();
-	
-	/**
- 	 * An individual test has been rerun.
-	 * 
-	 * @param testId a unique Id identifying the test
-	 * @param testClass the name of the test class that was rerun
-	 * @param testName the name of the test that was rerun
-	 * @param status the outcome of the test that was rerun; one of 
-	 * {@link #STATUS_OK STATUS_OK}, {@link #STATUS_ERROR STATUS_ERROR},
-	 * or {@link #STATUS_FAILURE STATUS_FAILURE}
-	 * @param trace the stack trace in the case of abnormal termination,
-	 * or the empty string if none
-	 */
-	public void testReran(String testId, String testClass, String testName, int status, String trace);
-}
-
-

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/JUnitCore.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/JUnitCore.java
deleted file mode 100644
index 6d595aa..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/JUnitCore.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.junit;
-
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-
-/**
- * Class for accessing JUnit support; all functionality is provided by 
- * static methods. 
- * </p>
- * 
- * @since 2.1
- */
-public class JUnitCore {
-
-	/**
-	 * Adds a listener for test runs.
-	 * 
-	 * @param listener listener to be added
-	 */
-	public static void addTestRunListener(ITestRunListener listener) {
-		JUnitPlugin.getDefault().addTestRunListener(listener);
-	}
-
-	/**
-	 * Removes a listener for test runs.
-	 * 
-	 * @param listener listener to be removed 
-	 */
-	public static void removeTestRunListener(ITestRunListener listener) {
-		JUnitPlugin.getDefault().removeTestRunListener(listener);
-	}
-}

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/package.html b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/package.html
deleted file mode 100644
index 63db8cf..0000000
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/package.html
+++ /dev/null

@@ -1,16 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Application programming interfaces for interaction
-with the Eclipse Java Development Tools JUnit support.
-<h2>
-Package Specification</h2>
-An API to track the execution of a JUnit test run.
-</body>
-</html>

diff --git a/org.eclipse.jdt.junit.runtime/.classpath b/org.eclipse.jdt.junit.runtime/.classpath
deleted file mode 100644
index 275b34c..0000000
--- a/org.eclipse.jdt.junit.runtime/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.junit.runtime/.cvsignore b/org.eclipse.jdt.junit.runtime/.cvsignore
deleted file mode 100644
index fe99505..0000000
--- a/org.eclipse.jdt.junit.runtime/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-

diff --git a/org.eclipse.jdt.junit.runtime/.project b/org.eclipse.jdt.junit.runtime/.project
deleted file mode 100644
index 6e825dd..0000000
--- a/org.eclipse.jdt.junit.runtime/.project
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.junit.runtime</name>
-	<comment></comment>
-	<projects>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.junit.runtime/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.junit.runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7eb9e09..0000000
--- a/org.eclipse.jdt.junit.runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Fri Aug 27 08:42:49 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.jdt.junit.runtime/.template b/org.eclipse.jdt.junit.runtime/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.jdt.junit.runtime/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/org.eclipse.jdt.junit.runtime/about.html b/org.eclipse.jdt.junit.runtime/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.junit.runtime/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit.runtime/build.properties b/org.eclipse.jdt.junit.runtime/build.properties
deleted file mode 100644
index 6138962..0000000
--- a/org.eclipse.jdt.junit.runtime/build.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.junitruntime.jar = src/
-
-bin.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               *.jar
-
-src.includes = about.html

diff --git a/org.eclipse.jdt.junit.runtime/plugin.properties b/org.eclipse.jdt.junit.runtime/plugin.properties
deleted file mode 100644
index 082d161..0000000
--- a/org.eclipse.jdt.junit.runtime/plugin.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Java Development Tools JUnit runtime support
-providerName=Eclipse.org

diff --git a/org.eclipse.jdt.junit.runtime/plugin.xml b/org.eclipse.jdt.junit.runtime/plugin.xml
deleted file mode 100644
index 4bd52bc..0000000
--- a/org.eclipse.jdt.junit.runtime/plugin.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.junit.runtime"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName">
-
-   <runtime>
-      <library name="junitruntime.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-		<import plugin="org.junit"/>
-   </requires>
-</plugin>

diff --git a/org.eclipse.jdt.junit.runtime/scripts/exportplugin.xml b/org.eclipse.jdt.junit.runtime/scripts/exportplugin.xml
deleted file mode 100644
index 8e070ef..0000000
--- a/org.eclipse.jdt.junit.runtime/scripts/exportplugin.xml
+++ /dev/null

@@ -1,34 +0,0 @@
-<!-- build script to create JUnit Plugin -->
-<project name="org.eclipse.jdt.junit.runtime" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.jdt.junit.runtime" />
-		<property name="version"  value="_3.1.0" />
-		<property name="dest"  value="${destdir}/${plugin}${version}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		
-		<jar 
-			jarfile="${dest}/junitruntime.jar"
-			basedir="bin"
-		/>
-				
-		<jar 		
-			jarfile="${dest}/junitruntimesrc.jar"
-			basedir="src"
-		/>
-		
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<copy file="about.html" todir="${dest}"/>
-	</target>
-</project>

diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/JUnitMessages.java b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/JUnitMessages.java
deleted file mode 100644
index b2a5860..0000000
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/JUnitMessages.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.runner;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class JUnitMessages {
-
-	private static final String BUNDLE_NAME= "org.eclipse.jdt.internal.junit.runner.JUnitMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private JUnitMessages() {
-	}
-
-	/**
-	 * Gets a string from the resource bundle and formats it with the argument
-	 * 
-	 * @param key	the string used to get the bundle value, must not be null
-	 */
-	public static String getFormattedString(String key, Object arg) {
-		return MessageFormat.format(getString(key), new Object[] { arg });
-	}
-
-	/**
-	 * Gets a string from the resource bundle and formats it with arguments
-	 */	
-	public static String getFormattedString(String key, Object[] args) {
-		return MessageFormat.format(getString(key), args);
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/JUnitMessages.properties b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/JUnitMessages.properties
deleted file mode 100644
index 06c172d..0000000
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/JUnitMessages.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-RemoteTestRunner.error.classnotfound= Class not found {0}
-RemoteTestRunner.error.exception= "Error:  " {0}
-RemoteTestRunner.error.invoke= Failed to invoke suite(): {0}
-RemoteTestRunner.error.load= Could not reload Test: {0}
-RemoteTestRunner.testName={0}({1})
-RemoteTestRunner.error.connect= Could not connect to: {0} : {1}			
-RemoteTestRunner.error.classnamemissing=Error: parameter '-classNames' or '-className' not specified
-RemoteTestRunner.error.portmissing=Error: parameter '-port' not specified
-RemoteTestRunner.error.notestreturn=setUpTest should return junit.framework.Test
-RemoteTestRunner.error.shouldbepublic=setUpTest() must be public
-RemoteTestRunner.error.shouldbestatic=setUpTest() must be static
-RemoteTestRunner.error.nullreturn=setUpTest returned null
-RemoteTestRunner.error.couldnotinvoke=setUpTest could not invoke setup: {0}
-RemoteTestRunner.error.invocationexception=setUpTest invocation exception: {0}
-RemoteTestRunner.error.couldnotcreate=Could not create test: 
-

diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/MessageIds.java b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/MessageIds.java
deleted file mode 100644
index d396a9b..0000000
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/MessageIds.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.runner;
-
-/**
- * Message identifiers for messages sent by the
- * RemoteTestRunner. 
- * 
- * @see RemoteTestRunner
- */
-public class MessageIds { 
-	/**
-	 * The header length of a message, all messages
-	 * have a fixed header length
-	 */
-	public static final int MSG_HEADER_LENGTH= 8;
-	
-	/**
-	 * Notification that a test trace has started.
-	 * The end of the trace is signaled by a TRACE_END
-	 * message. In between the TRACE_START and TRACE_END
-	 * the stack trace is submitted as multiple lines.
-	 */
-	public static final String TRACE_START= "%TRACES "; //$NON-NLS-1$
-	/**
-	 * Notification that a trace ends.
-	 */
-	public static final String TRACE_END=   "%TRACEE "; //$NON-NLS-1$
-	/**
-	 * Notification that the expected result has started.
-	 * The end of the expected result is signaled by a Trace_END.
-	 */
-	public static final String EXPECTED_START= "%EXPECTS"; //$NON-NLS-1$
-	/**
-	 * Notification that an expected result ends.
-	 */
-	public static final String EXPECTED_END=   "%EXPECTE"; //$NON-NLS-1$
-	/**
-	 * Notification that the expected result has started.
-	 * The end of the expected result is signaled by a Trace_END.
-	 */
-	public static final String ACTUAL_START= "%ACTUALS"; //$NON-NLS-1$
-	/**
-	 * Notification that an expected result ends.
-	 */
-	public static final String ACTUAL_END=   "%ACTUALE"; //$NON-NLS-1$
-	/**
-	 * Notification that a trace for a reran test has started.
-	 * The end of the trace is signaled by a RTrace_END
-	 * message.
-	 */
-	public static final String RTRACE_START= "%RTRACES"; //$NON-NLS-1$
-	/**
-	 * Notification that a trace of a reran trace ends.
-	 */
-	public static final String RTRACE_END=  "%RTRACEE"; //$NON-NLS-1$
-	/**
-	 * Notification that a test run has started. 
-	 * MessageIds.TEST_RUN_START+testCount.toString+" "+version
-	 */
-	public static final String TEST_RUN_START=  "%TESTC  "; //$NON-NLS-1$
-	/**
-	 * Notification that a test has started.
-	 * MessageIds.TEST_START + testID + "," + testName
-	 */
-	public static final String TEST_START=  "%TESTS  ";		 //$NON-NLS-1$
-	/**
-	 * Notification that a test has started.
-	 * TEST_END + testID + "," + testName
-	 */
-	public static final String TEST_END=    "%TESTE  ";		 //$NON-NLS-1$
-	/**
-	 * Notification that a test had a error.
-	 * TEST_ERROR + testID + "," + testName.
-	 * After the notification follows the stack trace.
-	 */
-	public static final String TEST_ERROR=  "%ERROR  ";		 //$NON-NLS-1$
-	/**
-	 * Notification that a test had a failure.
-	 * TEST_FAILED + testID + "," + testName.
-	 * After the notification follows the stack trace.
-	 */
-	public static final String TEST_FAILED= "%FAILED ";	 //$NON-NLS-1$
-	/**
-	 * Notification that a test run has ended.
-	 * TEST_RUN_END+elapsedTime.toString().
-	 */ 	
-	public static final String TEST_RUN_END="%RUNTIME";	 //$NON-NLS-1$
-	/**
-	 * Notification that a test run was successfully stopped.
-	 */ 
-	public static final String TEST_STOPPED="%TSTSTP "; //$NON-NLS-1$
-	/**
-	 * Notification that a test was reran.
-	 * TEST_RERAN+testId+" "+testClass+" "+testName+STATUS.
-	 * Status = "OK" or "FAILURE".
-	 */ 
-	public static final String TEST_RERAN=  "%TSTRERN"; //$NON-NLS-1$
-	/**
-	 * Notification about a test inside the test suite.
-	 * TEST_TREE+ testId"," + testName","isSuite","testcount
-	 * isSuite = "true" or "false"
-	 */ 
-	public static final String TEST_TREE="%TSTTREE"; //$NON-NLS-1$
-	/**
-	 * Request to stop the current test run.
-	 */
-	public static final String TEST_STOP=	">STOP   "; //$NON-NLS-1$
-	/**
-	 * Request to rerun a test.
-	 * TEST_RERUN+testId+" "+ClassName+" "+testName
-	 */
-	public static final String TEST_RERUN=	">RERUN  "; //$NON-NLS-1$
-}
-
-

diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java
deleted file mode 100644
index 88e181b..0000000
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java
+++ /dev/null

@@ -1,840 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids: sdavids@gmx.de bug 26754 
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.runner;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.Socket;
-import java.util.Vector;
-
-import junit.extensions.TestDecorator;
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestFailure;
-import junit.framework.TestListener;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-/**
- * A TestRunner that reports results via a socket connection.
- * See MessageIds for more information about the protocl.
- */
-public class RemoteTestRunner implements TestListener {
-	/**
-	 * Holder for information for a rerun request
-	 */
-	private static class RerunRequest {
-		String fRerunClassName;
-		String fRerunTestName;
-		int fRerunTestId;
-		
-		public RerunRequest(int testId, String className, String testName) {
-			fRerunTestId= testId;
-			fRerunClassName= className;
-			fRerunTestName= testName;
-		}
-
-	}
-	
-	private static final String SET_UP_TEST_METHOD_NAME= "setUpTest"; //$NON-NLS-1$
-	
-	private static final String SUITE_METHODNAME= "suite";	 //$NON-NLS-1$
-	
-	/**
-	 * The name of the test classes to be executed
-	 */
-	private String[] fTestClassNames;
-	/**
-	 * The name of the test (argument -test)
-	 */
-	private String fTestName;
-	/**
-	 * The current test result
-	 */
-	private TestResult fTestResult;
-
-	/**
-	 * The version expected by the client
-	 */
-	private String fVersion= ""; //$NON-NLS-1$
-	
-	/**
-	 * The client socket.
-	 */
-	private Socket fClientSocket;
-	/**
-	 * Print writer for sending messages
-	 */
-	private PrintWriter fWriter;
-	/**
-	 * Reader for incoming messages
-	 */
-	private BufferedReader fReader;
-	/**
-	 * Host to connect to, default is the localhost
-	 */
-	private String fHost= ""; //$NON-NLS-1$
-	/**
-	 * Port to connect to.
-	 */
-	private int fPort= -1;
-	/**
-	 * Is the debug mode enabled?
-	 */
-	private boolean fDebugMode= false;	
-	/**
-	 * Keep the test run server alive after a test run has finished.
-	 * This allows to rerun tests.
-	 */
-	private boolean fKeepAlive= false;
-	/**
-	 * Has the server been stopped
-	 */
-	private boolean fStopped= false;
-	/**
-	 * Queue of rerun requests.
-	 */
-	private Vector fRerunRequests= new Vector(10);
-	/**
-	 * Thread reading from the socket
-	 */
-	private ReaderThread fReaderThread;
-
-	private String fRerunTest;
-	/**
-	 * Reader thread that processes messages from the client.
-	 */
-	private class ReaderThread extends Thread {
-		public ReaderThread() {
-			super("ReaderThread"); //$NON-NLS-1$
-		}
-
-		public void run(){
-			try { 
-				String message= null; 
-				while (true) { 
-					if ((message= fReader.readLine()) != null) {
-						
-						if (message.startsWith(MessageIds.TEST_STOP)){
-							fStopped= true;
-							RemoteTestRunner.this.stop();
-							synchronized(RemoteTestRunner.this) {
-								RemoteTestRunner.this.notifyAll();
-							}
-							break;
-						}
-						
-						else if (message.startsWith(MessageIds.TEST_RERUN)) {
-							String arg= message.substring(MessageIds.MSG_HEADER_LENGTH);
-							//format: testId className testName
-							int c0= arg.indexOf(' '); //$NON-NLS-1$
-							int c1= arg.indexOf(' ', c0+1);
-							String s= arg.substring(0, c0);
-							int testId= Integer.parseInt(s);
-							String className= arg.substring(c0+1, c1);
-							String testName= arg.substring(c1+1, arg.length());
-							synchronized(RemoteTestRunner.this) {
-								fRerunRequests.add(new RerunRequest(testId, className, testName));
-								RemoteTestRunner.this.notifyAll();
-							}
-						}
-					}
-				} 
-			} catch (Exception e) {
-				RemoteTestRunner.this.stop();
-			}
-		}
-	}	
-	
-	/** 
-	 * The main entry point.
-	 * Parameters<pre>
-	 * -classnames: the name of the test suite class
-	 * -testfilename: the name of a file containing classnames of test suites
-	 * -test: the test method name (format classname testname) 
-	 * -host: the host to connect to default local host 
-	 * -port: the port to connect to, mandatory argument 
-	 * -keepalive: keep the process alive after a test run
-     * </pre>
-     */
-	public static void main(String[] args) {
-		RemoteTestRunner testRunServer= new RemoteTestRunner();
-		testRunServer.init(args);
-		testRunServer.run();
-		// fix for 14434
-		System.exit(0);
-	}
-	
-	/**
-	 * Parse command line arguments. Hook for subclasses to process
-	 * additional arguments.
-	 */
-	protected void init(String[] args) {
-		defaultInit(args);		
-	}	
-	
-	/**
-	 * The class loader to be used for loading tests.
-	 * Subclasses may override to use another class loader.
-	 */
-	protected ClassLoader getClassLoader() {
-		return getClass().getClassLoader();
-	}
-	
-	/**
-	 * Process the default arguments.
-	 */
-	protected final void defaultInit(String[] args) {
-		for(int i= 0; i < args.length; i++) {
-			if(args[i].toLowerCase().equals("-classnames") || args[i].toLowerCase().equals("-classname")){ //$NON-NLS-1$ //$NON-NLS-2$
-				Vector list= new Vector();
-				for (int j= i+1; j < args.length; j++) {
-					if (args[j].startsWith("-")) //$NON-NLS-1$
-						break;
-					list.add(args[j]);
-				}
-				fTestClassNames= (String[]) list.toArray(new String[list.size()]);
-			}	
-			else if(args[i].toLowerCase().equals("-test")) { //$NON-NLS-1$
-				String testName= args[i+1];
-				int p= testName.indexOf(':');
-				if (p == -1)
-					throw new IllegalArgumentException("Testname not separated by \'%\'"); //$NON-NLS-1$
-				fTestName= testName.substring(p+1);
-				fTestClassNames= new String[]{ testName.substring(0, p)  };
-				i++;
-			}			
-			else if(args[i].toLowerCase().equals("-testnamefile")) { //$NON-NLS-1$
-				String testNameFile= args[i+1];
-				try {
-					readTestNames(testNameFile);
-				} catch (IOException e) {
-					throw new IllegalArgumentException("Cannot read testname file.");		 //$NON-NLS-1$
-				}
-				i++;
-			
-			} else if(args[i].toLowerCase().equals("-port")) { //$NON-NLS-1$
-				fPort= Integer.parseInt(args[i+1]);
-				i++;
-			}
-			else if(args[i].toLowerCase().equals("-host")) { //$NON-NLS-1$
-				fHost= args[i+1];
-				i++;
-			}
-			else if(args[i].toLowerCase().equals("-rerun")) { //$NON-NLS-1$
-				fRerunTest= args[i+1];
-				i++;
-			}
-			else if(args[i].toLowerCase().equals("-keepalive")) { //$NON-NLS-1$
-				fKeepAlive= true;
-			}
-			else if(args[i].toLowerCase().equals("-debugging") || args[i].toLowerCase().equals("-debug")){ //$NON-NLS-1$ //$NON-NLS-2$
-			    fDebugMode= true;
-			}
-			else if(args[i].toLowerCase().equals("-version")){ //$NON-NLS-1$
-			    fVersion= args[i+1];
-			    i++;
-			}
-		}
-		if(fTestClassNames == null || fTestClassNames.length == 0)
-			throw new IllegalArgumentException(JUnitMessages.getString("RemoteTestRunner.error.classnamemissing")); //$NON-NLS-1$
-
-		if (fPort == -1)
-			throw new IllegalArgumentException(JUnitMessages.getString("RemoteTestRunner.error.portmissing")); //$NON-NLS-1$
-		if (fDebugMode)
-			System.out.println("keepalive "+fKeepAlive); //$NON-NLS-1$
-	}
-
-	private void readTestNames(String testNameFile) throws IOException {
-		BufferedReader br= new BufferedReader(new FileReader(new File(testNameFile)));
-		try {
-			String line;
-			Vector list= new Vector();
-			while ((line= br.readLine()) != null) {
-				list.add(line);
-			}
-			fTestClassNames= (String[]) list.toArray(new String[list.size()]);
-		}
-		finally {
-			br.close();
-		}
-		if (fDebugMode) {
-			System.out.println("Tests:"); //$NON-NLS-1$
-			for (int i= 0; i < fTestClassNames.length; i++) {
-				System.out.println("    "+fTestClassNames[i]); //$NON-NLS-1$
-			}
-		}
-	}
-
-	
-	/**
-	 * Connects to the remote ports and runs the tests.
-	 */
-	protected void run() {
-		if (!connect())
-			return;
-		if (fRerunTest != null) {
-			rerunTest(Integer.parseInt(fRerunTest), fTestClassNames[0], fTestName);
-			return;
-		}
-		fTestResult= new TestResult();
-		fTestResult.addListener(this);
-		runTests(fTestClassNames, fTestName);
-		fTestResult.removeListener(this);
-		
-		if (fTestResult != null) {
-			fTestResult.stop();
-			fTestResult= null;
-		}
-		if (fKeepAlive)
-			waitForReruns();
-			
-		shutDown();
-		
-	}
-
-	/**
-	 * Waits for rerun requests until an explicit stop request
-	 */
-	private synchronized void waitForReruns() {
-		while (!fStopped) {
-			try {
-				wait();
-				if (!fStopped && fRerunRequests.size() > 0) {
-					RerunRequest r= (RerunRequest)fRerunRequests.remove(0);
-					rerunTest(r.fRerunTestId, r.fRerunClassName, r.fRerunTestName);
-				}
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-	
-	/**
-	 * Returns the Test corresponding to the given suite. 
-	 */
-	private Test getTest(String suiteClassName, String testName) {
-		Class testClass= null;
-		try {
-			testClass= loadSuiteClass(suiteClassName);
-		} catch (ClassNotFoundException e) {
-			String clazz= e.getMessage();
-			if (clazz == null) 
-				clazz= suiteClassName;
-			runFailed(JUnitMessages.getFormattedString("RemoteTestRunner.error.classnotfound", clazz)); //$NON-NLS-1$
-			return null;
-		} catch(Exception e) {
-			runFailed(JUnitMessages.getFormattedString("RemoteTestRunner.error.exception", e )); //$NON-NLS-1$
-			return null;
-		}
-		if (testName != null) {
-			return setupTest(testClass, createTest(testName, testClass));
-		}
-		Method suiteMethod= null;
-		try {
-			suiteMethod= testClass.getMethod(SUITE_METHODNAME, new Class[0]);
-	 	} catch(Exception e) {
-	 		// try to extract a test suite automatically
-			return new TestSuite(testClass);
-		}
-		Test test= null;
-		try {
-			test= (Test)suiteMethod.invoke(null, new Class[0]); // static method
-		} 
-		catch (InvocationTargetException e) {
-			runFailed(JUnitMessages.getFormattedString("RemoteTestRunner.error.invoke", e.getTargetException().toString() )); //$NON-NLS-1$
-			return null;
-		}
-		catch (IllegalAccessException e) {
-			runFailed(JUnitMessages.getFormattedString("RemoteTestRunner.error.invoke", e.toString() )); //$NON-NLS-1$
-			return null;
-		}
-		return test;
-	}
-
-	protected void runFailed(String message) {
-		System.err.println(message);
-	}
-	
-	/**
-	 * Loads the test suite class.
-	 */
-	private Class loadSuiteClass(String className) throws ClassNotFoundException {
-		if (className == null) 
-			return null;
-		return getClassLoader().loadClass(className);
-	}
-			
-	/**
-	 * Runs a set of tests.
-	 */
-	private void runTests(String[] testClassNames, String testName) {
-		// instantiate all tests
-		Test[] suites= new Test[testClassNames.length];
-		
-		for (int i= 0; i < suites.length; i++) {
-			suites[i]= getTest(testClassNames[i], testName);
-		}
-		
-		// count all testMethods and inform ITestRunListeners		
-		int count= countTests(suites);
-		notifyTestRunStarted(count);
-		
-		if (count == 0) {
-			notifyTestRunEnded(0);
-			return;
-		}
-		
-		long startTime= System.currentTimeMillis();
-		if (fDebugMode)
-			System.out.print("start send tree..."); //$NON-NLS-1$
-		for (int i= 0; i < suites.length; i++) {
-			sendTree(suites[i]);
-		}
-		if (fDebugMode)
-			System.out.println("done send tree - time(ms): "+(System.currentTimeMillis()-startTime)); //$NON-NLS-1$
-
-		long testStartTime= System.currentTimeMillis();
-		for (int i= 0; i < suites.length; i++) {
-			suites[i].run(fTestResult);
-		}
-		// inform ITestRunListeners of test end
-		if (fTestResult == null || fTestResult.shouldStop())
-			notifyTestRunStopped(System.currentTimeMillis() - testStartTime);
-		else
-			notifyTestRunEnded(System.currentTimeMillis() - testStartTime);
-	}
-	
-	private int countTests(Test[] tests) {
-		int count= 0;
-		for (int i= 0; i < tests.length; i++) {
-			if (tests[i] != null)
-				count= count + tests[i].countTestCases();
-		}
-		return count;
-	}
-	
-	/**
-	 * Reruns a test as defined by the fully qualified class name and
-	 * the name of the test.
-	 */
-	public void rerunTest(int testId, String className, String testName) {
-		Test reloadedTest= null;
-		Class reloadedTestClass= null;
-		try {
-			reloadedTestClass= getClassLoader().loadClass(className);
-			reloadedTest= createTest(testName, reloadedTestClass);
-		} catch(Exception e) {
-			reloadedTest= warning(JUnitMessages.getFormattedString("RemoteTestRunner.error.couldnotcreate", testName));  //$NON-NLS-1$ 
-		}
-		Test rerunTest= setupTest(reloadedTestClass, reloadedTest);
-		TestResult result= new TestResult();
-		rerunTest.run(result);
-		notifyTestReran(result, Integer.toString(testId), className, testName);
-	}
-
-	/**
-	 * Prepare a single test to be run standalone. If the test case class provides
-	 * a static method Test setUpTest(Test test) then this method will be invoked.
-	 * Instead of calling the test method directly the "decorated" test returned from
-	 * setUpTest will be called. The purpose of this mechanism is to enable
-	 * tests which requires a set-up to be run individually.
-	 */
-	private Test setupTest(Class reloadedTestClass, Test reloadedTest) {
-		Method setup= null;
-		try {
-			setup= reloadedTestClass.getMethod(SET_UP_TEST_METHOD_NAME, new Class[] {Test.class});
-		} catch (SecurityException e1) {
-			return reloadedTest;
-		} catch (NoSuchMethodException e) {
-			return reloadedTest;
-		}
-		if (setup.getReturnType() != Test.class)
-			return warning(JUnitMessages.getString("RemoteTestRunner.error.notestreturn")); //$NON-NLS-1$
-		if (!Modifier.isPublic(setup.getModifiers()))
-			return warning(JUnitMessages.getString("RemoteTestRunner.error.shouldbepublic"));  //$NON-NLS-1$
-		if (!Modifier.isStatic(setup.getModifiers()))
-			return warning(JUnitMessages.getString("RemoteTestRunner.error.shouldbestatic"));  //$NON-NLS-1$
-		try {
-			Test test= (Test)setup.invoke(null, new Object[] {reloadedTest});
-			if (test == null)
-				return warning(JUnitMessages.getString("RemoteTestRunner.error.nullreturn")); //$NON-NLS-1$
-			return test;
-		} catch (IllegalArgumentException e) {
-			return warning(JUnitMessages.getFormattedString("RemoteTestRunner.error.couldnotinvoke", e)); //$NON-NLS-1$
-		} catch (IllegalAccessException e) {
-			return warning(JUnitMessages.getFormattedString("RemoteTestRunner.error.couldnotinvoke", e)); //$NON-NLS-1$
-		} catch (InvocationTargetException e) {
-			return warning(JUnitMessages.getFormattedString("RemoteTestRunner.error.invocationexception", e.getTargetException())); //$NON-NLS-1$
-		} 
-	}
-
-	/**
-	 * Returns a test which will fail and log a warning message.
-	 */
-	 private Test warning(final String message) {
-		return new TestCase("warning") { //$NON-NLS-1$
-			protected void runTest() {
-				fail(message);
-			}
-		};		
-	}
-
-	private Test createTest(String testName, Class testClass) {
-		Class[] classArgs= { String.class };
-		Test test;
-		Constructor constructor= null;
-		try {
-			try {
-				constructor= testClass.getConstructor(classArgs);
-				test= (Test)constructor.newInstance(new Object[]{testName});
-			} catch (NoSuchMethodException e) {
-				// try the no arg constructor supported in 3.8.1
-				constructor= testClass.getConstructor(new Class[0]);
-				test= (Test)constructor.newInstance(new Object[0]);
-				if (test instanceof TestCase)
-					((TestCase) test).setName(testName);
-			}
-			if (test != null)
-				return test;
-		} catch (InstantiationException e) {
-		} catch (IllegalAccessException e) {
-		} catch (InvocationTargetException e) {
-		} catch (NoSuchMethodException e) {
-		} catch (ClassCastException e) {
-		}
-		return warning("Could not create test \'"+testName+"\' "); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-
-	/*
-	 * @see TestListener#addError(Test, Throwable)
-	 */
-	public final void addError(Test test, Throwable throwable) {
-		notifyTestFailed(test, MessageIds.TEST_ERROR, getTrace(throwable));
-	}
-
-	/*
-	 * @see TestListener#addFailure(Test, AssertionFailedError)
-	 */
-	public final void addFailure(Test test, AssertionFailedError assertionFailedError) {
-		if ("3".equals(fVersion)) { //$NON-NLS-1$
-			if (isComparisonFailure(assertionFailedError)) {
-		        // transmit the expected and the actual string
-		        String expected = getField(assertionFailedError, "fExpected"); //$NON-NLS-1$
-		        String actual = getField(assertionFailedError, "fActual"); //$NON-NLS-1$
-		        if (expected != null && actual != null) {
-		            notifyTestFailed2(test, MessageIds.TEST_FAILED, getTrace(assertionFailedError), expected, actual);
-		            return;
-		       }
-		    }
-		} 
-		notifyTestFailed(test, MessageIds.TEST_FAILED, getTrace(assertionFailedError));
-	}
-
-	private boolean isComparisonFailure(Throwable throwable) {
-		// avoid reference to comparison failure to avoid a dependency on 3.8.1
-		return throwable.getClass().getName().equals("junit.framework.ComparisonFailure"); //$NON-NLS-1$
-	}
-
-	/*
-	 * @see TestListener#endTest(Test)
-	 */
-	public void endTest(Test test) {
-		notifyTestEnded(test);
-	}
-
-	/*
-	 * @see TestListener#startTest(Test)
-	 */
-	public void startTest(Test test) {
-		notifyTestStarted(test);
-	}
-	
-	private void sendTree(Test test){
-		if(test instanceof TestDecorator){
-			TestDecorator decorator= (TestDecorator) test;
-			notifyTestTreeEntry(getTestId(test)+','+escapeComma(decorator.getClass().getName()) + ',' + true + ',' + 1);
-			sendTree(decorator.getTest());		
-		}
-		else if(test instanceof TestSuite){
-			TestSuite suite= (TestSuite) test;
-			notifyTestTreeEntry(getTestId(test)+','+escapeComma(suite.toString().trim()) + ',' + true + ',' + suite.testCount());
-			for(int i= 0; i < suite.testCount(); i++){	
-				sendTree(suite.testAt(i));		
-			}				
-		}
-		else {
-			notifyTestTreeEntry(getTestId(test)+ ',' + escapeComma(getTestName(test).trim()) + ',' + false + ',' +  test.countTestCases());
-		}
-	}
-	
-	private String escapeComma(String s) {
-		if ((s.indexOf(',') < 0) && (s.indexOf('\\') < 0))
-			return s;
-		StringBuffer sb= new StringBuffer(s.length()+10);
-		for (int i= 0; i < s.length(); i++) {
-			char c= s.charAt(i);
-			if (c == ',') 
-				sb.append("\\,"); //$NON-NLS-1$
-			else if (c == '\\')
-				sb.append("\\\\"); //$NON-NLS-1$
-			else
-				sb.append(c);
-		}
-		return sb.toString();
-	}
-
-	private String getTestId(Test test) {
-		return Integer.toString(System.identityHashCode(test));
-	}
-	
-	private String getTestName(Test test) {
-		if (test instanceof TestCase) {
-			TestCase testCase= (TestCase) test;
-			return JUnitMessages.getFormattedString("RemoteTestRunner.testName", new String[] {testCase.getName(),  test.getClass().getName()}); //$NON-NLS-1$
-		}
-		if (test instanceof TestSuite) {
-			TestSuite suite= (TestSuite) test;
-			if (suite.getName() != null)
-				return suite.getName();
-			return getClass().getName();
-		}
-		return test.toString();
-	}
-	
-	/**
-	 * Returns the stack trace for the given throwable.
-	 */
-	private String getTrace(Throwable t) { 
-		StringWriter stringWriter= new StringWriter();
-		PrintWriter writer= new PrintWriter(stringWriter);
-		t.printStackTrace(writer);
-		StringBuffer buffer= stringWriter.getBuffer();
-		return buffer.toString();
-	}	
-
-	/**
-	 * Stop the current test run.
-	 */
-	protected void stop() {
-		if (fTestResult != null) {
-			fTestResult.stop();
-		}
-	}
-	
-	/**
-	 * Connect to the remote test listener.
-	 */
-	private boolean connect() {
-		if (fDebugMode)
-			System.out.println("RemoteTestRunner: trying to connect" + fHost + ":" + fPort); //$NON-NLS-1$ //$NON-NLS-2$
-		Exception exception= null;
-		for (int i= 1; i < 20; i++) {
-			try{
-				fClientSocket= new Socket(fHost, fPort);
-				try {
-				    fWriter= new PrintWriter(new BufferedWriter(new OutputStreamWriter(fClientSocket.getOutputStream(), "UTF-8")), false/*true*/); //$NON-NLS-1$
-	            } catch (UnsupportedEncodingException e1) {
-	                fWriter= new PrintWriter(new BufferedWriter(new OutputStreamWriter(fClientSocket.getOutputStream())), false/*true*/);
-	            }
-				try {
-				    fReader= new BufferedReader(new InputStreamReader(fClientSocket.getInputStream(), "UTF-8")); //$NON-NLS-1$
-                } catch (UnsupportedEncodingException e1) {
-                    fReader= new BufferedReader(new InputStreamReader(fClientSocket.getInputStream()));
-                }
-				fReaderThread= new ReaderThread();
-				fReaderThread.start();
-				return true;
-			} catch(IOException e){
-				exception= e;
-			}
-			try {
-				Thread.sleep(2000);
-			} catch(InterruptedException e) {
-			}
-		}
-		runFailed(JUnitMessages.getFormattedString("RemoteTestRunner.error.connect", new String[]{fHost, Integer.toString(fPort)} )); //$NON-NLS-1$
-		exception.printStackTrace();
-		return false;
-	}
-
-	/**
-	 * Shutsdown the connection to the remote test listener.
-	 */
-	private void shutDown() {
-		if (fWriter != null) {
-			fWriter.close();
-			fWriter= null;
-		}
-		try {
-			if (fReaderThread != null)   {
-				// interrupt reader thread so that we don't block on close
-				// on a lock held by the BufferedReader
-				// fix for bug: 38955
-				fReaderThread.interrupt();
-			}
-			if (fReader != null) {
-				fReader.close();
-				fReader= null;
-			}
-		} catch(IOException e) {
-			if (fDebugMode)
-				e.printStackTrace();
-		}
-		
-		try {
-			if (fClientSocket != null) {
-				fClientSocket.close();
-				fClientSocket= null;
-			}
-		} catch(IOException e) {
-			if (fDebugMode)	
-				e.printStackTrace();
-		}
-	}
-
-
-	private void sendMessage(String msg) {
-		if(fWriter == null) 
-			return;
-		fWriter.println(msg);
-	}
-
-
-	private void notifyTestRunStarted(int testCount) {
-		sendMessage(MessageIds.TEST_RUN_START + testCount + " " + "v2"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-
-	private void notifyTestRunEnded(long elapsedTime) {
-		sendMessage(MessageIds.TEST_RUN_END + elapsedTime);
-		fWriter.flush();
-		//shutDown();
-	}
-
-
-	private void notifyTestRunStopped(long elapsedTime) {
-		sendMessage(MessageIds.TEST_STOPPED + elapsedTime );
-		fWriter.flush();
-		//shutDown();
-	}
-
-	private void notifyTestStarted(Test test) {
-		sendMessage(MessageIds.TEST_START + getTestId(test) + ','+test.toString());
-		fWriter.flush();
-	}
-
-	private void notifyTestEnded(Test test) {
-		sendMessage(MessageIds.TEST_END + getTestId(test)+','+getTestName(test));
-	}
-
-	private void notifyTestFailed(Test test, String status, String trace) {
-		sendMessage(status + getTestId(test) + ',' + getTestName(test));
-		sendMessage(MessageIds.TRACE_START);
-		sendMessage(trace);
-		sendMessage(MessageIds.TRACE_END);
-		fWriter.flush();
-	}
-
-	private void notifyTestFailed2(Test test, String status, String trace, String expected, String actual) {
-	    sendMessage(status + getTestId(test) + ',' + getTestName(test));
-	    
-	    sendMessage(MessageIds.EXPECTED_START);
-	    sendMessage(expected);
-	    sendMessage(MessageIds.EXPECTED_END);
-	    
-	    sendMessage(MessageIds.ACTUAL_START);
-	    sendMessage(actual);
-	    sendMessage(MessageIds.ACTUAL_END);
-	    
-	    sendMessage(MessageIds.TRACE_START);
-	    sendMessage(trace);
-	    sendMessage(MessageIds.TRACE_END);
-	    
-	    fWriter.flush();
-	}
-	
-	private void notifyTestTreeEntry(String treeEntry) {
-		sendMessage(MessageIds.TEST_TREE + treeEntry);
-	}
-	
-	private void notifyTestReran(TestResult result, String testId, String testClass, String testName) {
-		TestFailure failure= null;
-		if (result.errorCount() > 0) {
-			failure= (TestFailure)result.errors().nextElement();
-		}
-		if (result.failureCount() > 0) {
-			failure= (TestFailure)result.failures().nextElement();
-		}
-		if (failure != null) {
-			Throwable t= failure.thrownException();
-			
-			if ("3".equals(fVersion)) { //$NON-NLS-1$
-			    if (isComparisonFailure(t)) {
-			        // transmit the expected and the actual string
-			        String expected = getField(t, "fExpected"); //$NON-NLS-1$
-			        String actual = getField(t, "fActual"); //$NON-NLS-1$
-			        if (expected != null && actual != null) {
-			    	    sendMessage(MessageIds.EXPECTED_START);
-			    	    sendMessage(expected);
-			    	    sendMessage(MessageIds.EXPECTED_END);
-			    	    
-			    	    sendMessage(MessageIds.ACTUAL_START);
-			    	    sendMessage(actual);
-			    	    sendMessage(MessageIds.ACTUAL_END);
-			    	    			    	    			       }
-			    }
-			}
-			String trace= getTrace(t);
-			sendMessage(MessageIds.RTRACE_START);
-			sendMessage(trace);
-			sendMessage(MessageIds.RTRACE_END);
-			fWriter.flush();
-		}
-		String status= "OK"; //$NON-NLS-1$
-		if (result.errorCount() > 0)
-			status= "ERROR"; //$NON-NLS-1$
-		else if (result.failureCount() > 0)
-			status= "FAILURE"; //$NON-NLS-1$
-		if (fPort != -1) {
-			sendMessage(MessageIds.TEST_RERAN + testId+ " "+testClass+" "+testName+" "+status); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			fWriter.flush();
-		}
-	}
-	
-	private String getField(Object object, String fieldName) {
-	    Class clazz= object.getClass();
-	    try {
-	        Field field= clazz.getDeclaredField(fieldName);
-	        field.setAccessible(true);
-	        Object result= field.get(object);
-	        return result.toString();
-	    } catch (Exception e) {
-	        // fall through
-	    }
-	    return null;
-	}
-}	

diff --git a/org.eclipse.jdt.junit/.classpath b/org.eclipse.jdt.junit/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.jdt.junit/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.junit/.cvsignore b/org.eclipse.jdt.junit/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.junit/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.jdt.junit/.project b/org.eclipse.jdt.junit/.project
deleted file mode 100644
index e03a241..0000000
--- a/org.eclipse.jdt.junit/.project
+++ /dev/null

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.junit</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.expressions</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.debug.ui</project>
-		<project>org.eclipse.jdt.junit.runtime</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.jdt.ui</project>
-		<project>org.eclipse.jdt.ui.tests</project>
-		<project>org.eclipse.jface.text</project>
-		<project>org.eclipse.junit.server</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.editors</project>
-		<project>org.eclipse.ui.ide</project>
-		<project>org.eclipse.ui.views</project>
-		<project>org.eclipse.ui.workbench.texteditor</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.junit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.junit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7eb9e09..0000000
--- a/org.eclipse.jdt.junit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Fri Aug 27 08:42:49 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.jdt.junit/about.html b/org.eclipse.jdt.junit/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.junit/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit/build.properties b/org.eclipse.jdt.junit/build.properties
deleted file mode 100644
index f510ba4..0000000
--- a/org.eclipse.jdt.junit/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties,\
-               *.jar
-
-source.junitsupport.jar = src/
-
-src.includes = about.html,\
-               schema/

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/cfilter.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/cfilter.gif
deleted file mode 100644
index f677dd5..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/cfilter.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/compare.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/compare.gif
deleted file mode 100644
index 4d53efc..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/compare.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/lock.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/lock.gif
deleted file mode 100644
index b776478..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/lock.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/relaunch.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/relaunch.gif
deleted file mode 100644
index bfadfaa..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/relaunch.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/select_next.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/select_next.gif
deleted file mode 100644
index 388ef91..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/select_next.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/select_prev.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/select_prev.gif
deleted file mode 100644
index c00fe05..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/select_prev.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/stop.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/stop.gif
deleted file mode 100644
index 4f3dcba..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/stop.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/th_automatic.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/th_automatic.gif
deleted file mode 100644
index 1b93aac..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/th_automatic.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/th_horizontal.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/th_horizontal.gif
deleted file mode 100644
index ce1a29c..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/th_horizontal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dlcl16/th_vertical.gif b/org.eclipse.jdt.junit/icons/full/dlcl16/th_vertical.gif
deleted file mode 100644
index 5bffca2..0000000
--- a/org.eclipse.jdt.junit/icons/full/dlcl16/th_vertical.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dtool16/debugjunit.gif b/org.eclipse.jdt.junit/icons/full/dtool16/debugjunit.gif
deleted file mode 100644
index be3504b..0000000
--- a/org.eclipse.jdt.junit/icons/full/dtool16/debugjunit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dtool16/new_testcase.gif b/org.eclipse.jdt.junit/icons/full/dtool16/new_testcase.gif
deleted file mode 100644
index 7021a4c..0000000
--- a/org.eclipse.jdt.junit/icons/full/dtool16/new_testcase.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dtool16/new_testsuite.gif b/org.eclipse.jdt.junit/icons/full/dtool16/new_testsuite.gif
deleted file mode 100644
index a615111..0000000
--- a/org.eclipse.jdt.junit/icons/full/dtool16/new_testsuite.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/dtool16/runjunit.gif b/org.eclipse.jdt.junit/icons/full/dtool16/runjunit.gif
deleted file mode 100644
index ab39f08..0000000
--- a/org.eclipse.jdt.junit/icons/full/dtool16/runjunit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/cfilter.gif b/org.eclipse.jdt.junit/icons/full/elcl16/cfilter.gif
deleted file mode 100644
index e2a02c3..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/cfilter.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/compare.gif b/org.eclipse.jdt.junit/icons/full/elcl16/compare.gif
deleted file mode 100644
index 40ac245..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/compare.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/lock.gif b/org.eclipse.jdt.junit/icons/full/elcl16/lock.gif
deleted file mode 100644
index 68fd6cf..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/lock.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/relaunch.gif b/org.eclipse.jdt.junit/icons/full/elcl16/relaunch.gif
deleted file mode 100644
index afb6fa9..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/relaunch.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/select_next.gif b/org.eclipse.jdt.junit/icons/full/elcl16/select_next.gif
deleted file mode 100644
index 072b184..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/select_next.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/select_prev.gif b/org.eclipse.jdt.junit/icons/full/elcl16/select_prev.gif
deleted file mode 100644
index 0716475..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/select_prev.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/stop.gif b/org.eclipse.jdt.junit/icons/full/elcl16/stop.gif
deleted file mode 100644
index dc47edf..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/stop.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/th_automatic.gif b/org.eclipse.jdt.junit/icons/full/elcl16/th_automatic.gif
deleted file mode 100644
index 45469ad..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/th_automatic.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/th_horizontal.gif b/org.eclipse.jdt.junit/icons/full/elcl16/th_horizontal.gif
deleted file mode 100644
index d590470..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/th_horizontal.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/elcl16/th_vertical.gif b/org.eclipse.jdt.junit/icons/full/elcl16/th_vertical.gif
deleted file mode 100644
index dee0cbc..0000000
--- a/org.eclipse.jdt.junit/icons/full/elcl16/th_vertical.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/etool16/debugjunit.gif b/org.eclipse.jdt.junit/icons/full/etool16/debugjunit.gif
deleted file mode 100644
index cc61c92..0000000
--- a/org.eclipse.jdt.junit/icons/full/etool16/debugjunit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/etool16/new_testcase.gif b/org.eclipse.jdt.junit/icons/full/etool16/new_testcase.gif
deleted file mode 100644
index 1ff93cb..0000000
--- a/org.eclipse.jdt.junit/icons/full/etool16/new_testcase.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/etool16/new_testsuite.gif b/org.eclipse.jdt.junit/icons/full/etool16/new_testsuite.gif
deleted file mode 100644
index 0b63124..0000000
--- a/org.eclipse.jdt.junit/icons/full/etool16/new_testsuite.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/etool16/runjunit.gif b/org.eclipse.jdt.junit/icons/full/etool16/runjunit.gif
deleted file mode 100644
index 03ede22..0000000
--- a/org.eclipse.jdt.junit/icons/full/etool16/runjunit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/eview16/junit.gif b/org.eclipse.jdt.junit/icons/full/eview16/junit.gif
deleted file mode 100644
index 229e93f..0000000
--- a/org.eclipse.jdt.junit/icons/full/eview16/junit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/eview16/juniterr.gif b/org.eclipse.jdt.junit/icons/full/eview16/juniterr.gif
deleted file mode 100644
index 1b7ff9d..0000000
--- a/org.eclipse.jdt.junit/icons/full/eview16/juniterr.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/eview16/juniterrq.gif b/org.eclipse.jdt.junit/icons/full/eview16/juniterrq.gif
deleted file mode 100644
index 04a9693..0000000
--- a/org.eclipse.jdt.junit/icons/full/eview16/juniterrq.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/eview16/junitsucc.gif b/org.eclipse.jdt.junit/icons/full/eview16/junitsucc.gif
deleted file mode 100644
index 0101a36..0000000
--- a/org.eclipse.jdt.junit/icons/full/eview16/junitsucc.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/eview16/junitsuccq.gif b/org.eclipse.jdt.junit/icons/full/eview16/junitsuccq.gif
deleted file mode 100644
index 164eef2..0000000
--- a/org.eclipse.jdt.junit/icons/full/eview16/junitsuccq.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/eview16/stackframe.gif b/org.eclipse.jdt.junit/icons/full/eview16/stackframe.gif
deleted file mode 100644
index f1e585b..0000000
--- a/org.eclipse.jdt.junit/icons/full/eview16/stackframe.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/exc_catch.gif b/org.eclipse.jdt.junit/icons/full/obj16/exc_catch.gif
deleted file mode 100644
index f5c3176..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/exc_catch.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/faillist.gif b/org.eclipse.jdt.junit/icons/full/obj16/faillist.gif
deleted file mode 100644
index 3e9d893..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/faillist.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/failures.gif b/org.eclipse.jdt.junit/icons/full/obj16/failures.gif
deleted file mode 100644
index c182d04..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/failures.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/julaunch.gif b/org.eclipse.jdt.junit/icons/full/obj16/julaunch.gif
deleted file mode 100644
index ec4885d..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/julaunch.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/stkfrm_obj.gif b/org.eclipse.jdt.junit/icons/full/obj16/stkfrm_obj.gif
deleted file mode 100644
index f1e585b..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/stkfrm_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/test.gif b/org.eclipse.jdt.junit/icons/full/obj16/test.gif
deleted file mode 100644
index 8f73ccb..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/test.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/testerr.gif b/org.eclipse.jdt.junit/icons/full/obj16/testerr.gif
deleted file mode 100644
index f866a2e..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/testerr.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/testfail.gif b/org.eclipse.jdt.junit/icons/full/obj16/testfail.gif
deleted file mode 100644
index de59bac..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/testfail.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/testhier.gif b/org.eclipse.jdt.junit/icons/full/obj16/testhier.gif
deleted file mode 100644
index 0df0f5d..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/testhier.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/testok.gif b/org.eclipse.jdt.junit/icons/full/obj16/testok.gif
deleted file mode 100644
index f824bd8..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/testok.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/testrun.gif b/org.eclipse.jdt.junit/icons/full/obj16/testrun.gif
deleted file mode 100644
index ad88296..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/testrun.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/tsuite.gif b/org.eclipse.jdt.junit/icons/full/obj16/tsuite.gif
deleted file mode 100644
index 5198579..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/tsuite.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/tsuiteerror.gif b/org.eclipse.jdt.junit/icons/full/obj16/tsuiteerror.gif
deleted file mode 100644
index 7cd107c..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/tsuiteerror.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/tsuitefail.gif b/org.eclipse.jdt.junit/icons/full/obj16/tsuitefail.gif
deleted file mode 100644
index d247a8f..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/tsuitefail.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/tsuiteok.gif b/org.eclipse.jdt.junit/icons/full/obj16/tsuiteok.gif
deleted file mode 100644
index e3db1eb..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/tsuiteok.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/obj16/tsuiterun.gif b/org.eclipse.jdt.junit/icons/full/obj16/tsuiterun.gif
deleted file mode 100644
index 0db16d9..0000000
--- a/org.eclipse.jdt.junit/icons/full/obj16/tsuiterun.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/ovr16/error_ovr.gif b/org.eclipse.jdt.junit/icons/full/ovr16/error_ovr.gif
deleted file mode 100644
index c112416..0000000
--- a/org.eclipse.jdt.junit/icons/full/ovr16/error_ovr.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/ovr16/failed_ovr.gif b/org.eclipse.jdt.junit/icons/full/ovr16/failed_ovr.gif
deleted file mode 100644
index 8f12861..0000000
--- a/org.eclipse.jdt.junit/icons/full/ovr16/failed_ovr.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/ovr16/success_ovr.gif b/org.eclipse.jdt.junit/icons/full/ovr16/success_ovr.gif
deleted file mode 100644
index 20fc2f2..0000000
--- a/org.eclipse.jdt.junit/icons/full/ovr16/success_ovr.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff1.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff1.gif
deleted file mode 100644
index d6db293..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff1.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff2.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff2.gif
deleted file mode 100644
index 131ce1d..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff2.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff3.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff3.gif
deleted file mode 100644
index fb7be15..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff3.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff4.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff4.gif
deleted file mode 100644
index dc3af5b..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff4.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff5.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff5.gif
deleted file mode 100644
index 253f6e6..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff5.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff6.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff6.gif
deleted file mode 100644
index bf06586..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff6.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff7.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff7.gif
deleted file mode 100644
index dc9ee20..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff7.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff8.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff8.gif
deleted file mode 100644
index 2f3b308..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff8.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ff9.gif b/org.eclipse.jdt.junit/icons/full/prgss/ff9.gif
deleted file mode 100644
index 586da7f..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ff9.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss1.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss1.gif
deleted file mode 100644
index e6d7141..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss1.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss2.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss2.gif
deleted file mode 100644
index 7c44b33..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss2.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss3.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss3.gif
deleted file mode 100644
index 11274d1..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss3.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss4.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss4.gif
deleted file mode 100644
index 7bf367d..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss4.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss5.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss5.gif
deleted file mode 100644
index df15b77..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss5.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss6.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss6.gif
deleted file mode 100644
index 664d0b2..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss6.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss7.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss7.gif
deleted file mode 100644
index 1e7cb91..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss7.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss8.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss8.gif
deleted file mode 100644
index ecebb5a..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss8.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/prgss/ss9.gif b/org.eclipse.jdt.junit/icons/full/prgss/ss9.gif
deleted file mode 100644
index 89489f1..0000000
--- a/org.eclipse.jdt.junit/icons/full/prgss/ss9.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/wizban/newsuite_wiz.gif b/org.eclipse.jdt.junit/icons/full/wizban/newsuite_wiz.gif
deleted file mode 100644
index f82b001..0000000
--- a/org.eclipse.jdt.junit/icons/full/wizban/newsuite_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/icons/full/wizban/newtest_wiz.gif b/org.eclipse.jdt.junit/icons/full/wizban/newtest_wiz.gif
deleted file mode 100644
index 4a71e95..0000000
--- a/org.eclipse.jdt.junit/icons/full/wizban/newtest_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.junit/plugin.properties b/org.eclipse.jdt.junit/plugin.properties
deleted file mode 100644
index a05af55..0000000
--- a/org.eclipse.jdt.junit/plugin.properties
+++ /dev/null

@@ -1,52 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Java Development Tools JUnit support
-providerName=Eclipse.org
-
-testRunListeners.name= Test Run Listeners
-junitQuickFixProcessor= JUnit Quick Fix Processor
-
-junitLaunchConfigs.name= JUnit Launch Configurations
-testRunTabs.name= JUnit Test Run Tabs
-
-View.label= JUnit
-Launch.label= JUnit
-PreferencePage.label= JUnit
-
-TestWizard.description= Create a JUnit Test Case
-SuiteWizard.description= Create a JUnit Test Suite
-UpdateSuiteAction.label= Recreate Test Suite...
-UpdateSuiteAction.tooltip= Recreate JUnit TestSuite with New Test Classes
-Task.name= JUnit Task
-WizardCategory.name= JUnit
-TestCaseWizard.name= JUnit Test Case
-TestSuiteWizard.name= JUnit Test Suite
-
-JUnitShortcut.label= JUnit Test
-
-searchMenu.label= Se&arch
-
-JUnitTabGroupDescription.debug=Create a configuration that will launch a JUnit test in debug mode.
-JUnitTabGroupDescription.run=Create a configuration that will launch a JUnit test.
-
-JUnitActionSet.label= JUnit
-
-GotoTestAction.label= Referring Tests...
-GotoTestAction.tooltip= Go to Test Referring to Selection
-
-GotoTestCommand.name= Referring Tests
-GotoTestCommand.description= Referring Tests
-
-ViewCommand.junitView.name= JUnit
-ViewCommand.junitView.description= JUnit
-
-RenameTypeParticipant.name=JUnit Launch configuration participant
-junitRenameParticipant= JUnit Project Rename Participant

diff --git a/org.eclipse.jdt.junit/plugin.xml b/org.eclipse.jdt.junit/plugin.xml
deleted file mode 100644
index ec9d72f..0000000
--- a/org.eclipse.jdt.junit/plugin.xml
+++ /dev/null

@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.junit"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.internal.junit.ui.JUnitPlugin">
-
-   <runtime>
-      <library name="junitsupport.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.junit.runtime"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.ltk.core.refactoring"/>
-      <import plugin="org.eclipse.core.variables"/>
-   </requires>
-
-
-   <extension-point id="testRunListeners" name="%testRunListeners.name" schema="schema/testRunListeners.exsd"/>
-   <extension-point id="junitLaunchConfigs" name="%junitLaunchConfigs.name" schema="schema/junitLaunchConfigs.exsd"/>
-   <extension-point id="internal-testRunTabs" name="%testRunTabs.name" schema="schema/internal-testRunTabs.exsd"/>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%View.label"
-            icon="icons/full/eview16/junit.gif"
-            category="org.eclipse.jdt.ui.java"
-            fastViewWidthRatio="0.40"
-            class="org.eclipse.jdt.internal.junit.ui.TestRunnerViewPart"
-            id="org.eclipse.jdt.junit.ResultView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaPerspective">
-         <view
-               relative="org.eclipse.jdt.ui.PackageExplorer"
-               visible="false"
-               id="org.eclipse.jdt.junit.ResultView"
-               relationship="stack">
-         </view>
-         <newWizardShortcut
-               id="org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard">
-         </newWizardShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaPerspective">
-         <actionSet
-               id="org.eclipse.jdt.junit.JUnitActionSet">
-         </actionSet>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-         <actionSet
-               id="org.eclipse.jdt.junit.JUnitActionSet">
-         </actionSet>
-         <newWizardShortcut
-               id="org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard">
-         </newWizardShortcut>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%PreferencePage.label"
-            category="org.eclipse.jdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.jdt.internal.junit.ui.JUnitPreferencePage"
-            id="org.eclipse.jdt.junit.preferences">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="%Launch.label"
-            delegate="org.eclipse.jdt.internal.junit.launcher.JUnitLaunchConfiguration"
-            modes="run, debug"
-            id="org.eclipse.jdt.junit.launchconfig"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-         <fileExtension
-               default="false"
-               extension="java">
-         </fileExtension>
-         <fileExtension
-               default="false"
-               extension="class">
-         </fileExtension>
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationComparators">
-      <launchConfigurationComparator
-            attribute="org.eclipse.jdt.junit.CONTAINER"
-            class="org.eclipse.jdt.internal.junit.launcher.ContainerComparator"
-            id="org.eclipse.jdt.junit.containerComparator">
-      </launchConfigurationComparator>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/full/obj16/julaunch.gif"
-            configTypeID="org.eclipse.jdt.junit.launchconfig"
-            id="org.eclipse.jdt.junit.launchimage">
-      </launchConfigurationTypeImage>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="org.eclipse.jdt.junit.launchconfig"
-            helpContextId="org.eclipse.jdt.junit.junit_tab_group"
-            class="org.eclipse.jdt.internal.junit.launcher.JUnitTabGroup"
-            id="org.eclipse.jdt.junit.launchConfigurationTabGroup.junit">
-         <launchMode
-               perspective="org.eclipse.debug.ui.DebugPerspective"
-               description="%JUnitTabGroupDescription.debug"
-               mode="debug">
-         </launchMode>
-         <launchMode
-               description="%JUnitTabGroupDescription.run"
-               mode="run">
-         </launchMode>
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%WizardCategory.name"
-            parentCategory="org.eclipse.jdt.ui.java"
-            id="org.eclipse.jdt.junit">
-      </category>
-      <wizard
-            name="%TestCaseWizard.name"
-            icon="icons/full/etool16/new_testcase.gif"
-            category="org.eclipse.jdt.ui.java/org.eclipse.jdt.junit"
-            id="org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard">
-         <class
-               class="org.eclipse.jdt.internal.junit.wizards.NewTestCaseCreationWizard">
-            <parameter
-                  name="javatype"
-                  value="true">
-            </parameter>
-         </class>
-<!-- see bug 48164 for wrong pde compiler warnings -->
-         <description>
-            %TestWizard.description
-         </description>
-      </wizard>
-      <wizard
-            name="%TestSuiteWizard.name"
-            icon="icons/full/etool16/new_testsuite.gif"
-            category="org.eclipse.jdt.ui.java/org.eclipse.jdt.junit"
-            class="org.eclipse.jdt.internal.junit.wizards.NewTestSuiteCreationWizard"
-            id="org.eclipse.jdt.junit.wizards.NewTestSuiteCreationWizard">
-         <description>
-            %SuiteWizard.description
-         </description>
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.ICompilationUnit"
-            nameFilter="AllTests.java"
-            id="org.eclipse.jdt.junit.wizards.UpdateTestSuite">
-         <action
-               label="%UpdateSuiteAction.label"
-               class="org.eclipse.jdt.internal.junit.wizards.UpdateTestSuite"
-               tooltip="%UpdateSuiteAction.tooltip"
-               enablesFor="1"
-               id="updateTestSuite">
-         </action>
-      </objectContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%JUnitActionSet.label"
-            visible="false"
-            id="org.eclipse.jdt.junit.JUnitActionSet">
-         <menu
-               label="%searchMenu.label"
-               path="navigate"
-               id="org.eclipse.search.menu">
-            <groupMarker
-                  name="internalDialogGroup">
-            </groupMarker>
-<!-- not to be used by clients  -->
-            <groupMarker
-                  name="dialogGroup">
-            </groupMarker>
-<!-- to be used by clients      -->
-            <separator
-                  name="contextMenuActionsGroup">
-            </separator>
-            <separator
-                  name="internalOccurrencesGroup">
-            </separator>
-         </menu>
-		<action
-               definitionId="org.eclipse.jdt.junit.gotoTest"
-               label="%GotoTestAction.label"
-               helpContextId="org.eclipse.jdt.junit.goto_referenced_test_action_context"
-               class="org.eclipse.jdt.internal.junit.ui.GotoReferencedTestAction"
-               tooltip="%GotoTestAction.tooltip"
-               menubarPath="org.eclipse.search.menu/internalOccurrencesGroup"
-               id="junit.actions.GotoTestAction">
-         </action>
-      </actionSet>
-   </extension>
-      <extension
-         point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation
-            targetID="org.eclipse.jdt.junit.JUnitActionSet">
-         <part
-               id="org.eclipse.jdt.ui.PackageExplorer">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.TypeHierarchy">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.CompilationUnitEditor">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.ClassFileEditor">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.ProjectsView">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.PackagesView">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.TypesView">
-         </part>
-         <part
-               id="org.eclipse.jdt.ui.MembersView">
-         </part>
-         <part
-               id="org.eclipse.search.SearchResultView">
-         </part>
-      </actionSetPartAssociation>
-   </extension>
-   <extension
-         id="junit_task"
-         name="%Task.name"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.core.resources.taskmarker">
-      </super>
-      <persistent
-            value="true">
-      </persistent>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchShortcuts">
-      <shortcut
-            label="%JUnitShortcut.label"
-            icon="icons/full/obj16/julaunch.gif"
-            helpContextId="org.eclipse.jdt.junit.launch_shortcut"
-            class="org.eclipse.jdt.internal.junit.launcher.JUnitLaunchShortcut"
-            modes="run, debug"
-            id="org.eclipse.jdt.junit.junitShortcut">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-               		<iterate>
-                 		<or>
-                   			<test property="org.eclipse.debug.ui.matchesPattern" value="*.java"/>
-                   			<test property="org.eclipse.debug.ui.matchesPattern" value="*.class"/>
-                   			<instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-                 		</or>
-                 		<test property="org.eclipse.jdt.junit.isTest"/>
-               		</iterate>
-               </with>
-            </enablement>
-         </contextualLaunch>
-         <perspective
-               id="org.eclipse.jdt.ui.JavaPerspective">
-         </perspective>
-         <perspective
-               id="org.eclipse.jdt.ui.JavaHierarchyPerspective">
-         </perspective>
-         <perspective
-               id="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-         </perspective>
-         <perspective
-               id="org.eclipse.debug.ui.DebugPerspective">
-         </perspective>
-      </shortcut>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.core.classpathVariableInitializer">
-      <classpathVariableInitializer
-            variable="JUNIT_HOME"
-            class="org.eclipse.jdt.internal.junit.ui.JUnitHomeInitializer">
-      </classpathVariableInitializer>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.ui.quickFixProcessors">
-      <quickFixProcessor
-            name="%junitQuickFixProcessor"
-            class="org.eclipse.jdt.internal.junit.ui.JUnitQuickFixProcessor"
-            id="org.eclipse.jdt.junit.JUnitQuickFixProcessor">
-      </quickFixProcessor>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            properties="isTest"
-            namespace="org.eclipse.jdt.junit"
-            type="org.eclipse.core.runtime.IAdaptable"
-            class="org.eclipse.jdt.internal.junit.ui.JavaTypeExtender"
-            id="org.eclipse.jdt.junit.ITypeExtender">
-      </propertyTester>
-   </extension>
-   <extension
-         point="org.eclipse.ltk.core.refactoring.renameParticipants">
-      <renameParticipant
-            name="%RenameTypeParticipant.name"
-            class="org.eclipse.jdt.internal.junit.refactoring.TypeRenameParticipant"
-            id="org.eclipse.jdt.junit.renameTypeParticipant">
-         <enablement>
-            <with
-                  variable="affectedNatures">
-               <iterate operator="or">
-                  <equals
-                        value="org.eclipse.jdt.core.javanature">
-                  </equals>
-               </iterate>
-            </with>
-            <with
-                  variable="element">
-               <instanceof
-                     value="org.eclipse.jdt.core.IType">
-               </instanceof>
-               <test
-                     property="org.eclipse.jdt.junit.isTest">
-               </test>
-            </with>
-         </enablement>
-      </renameParticipant>
-      <renameParticipant
-            class="org.eclipse.jdt.internal.junit.refactoring.ProjectRenameParticipant"
-            name="%junitRenameParticipant"
-            id="org.eclipse.jdt.junit.renameTypeParticipant">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-   	         <instanceof value="org.eclipse.jdt.core.IJavaProject"/>
-           </with>
-         </enablement>
-      </renameParticipant>
-      
-   </extension>
-   <extension
-         point="org.eclipse.jdt.junit.junitLaunchConfigs">
-      <launchConfigType
-            configTypeID="org.eclipse.jdt.junit.launchconfig">
-      </launchConfigType>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.junit.internal-testRunTabs">
-      <testRunTab class="org.eclipse.jdt.internal.junit.ui.FailureTab"/>
-      <testRunTab class="org.eclipse.jdt.internal.junit.ui.TestHierarchyTab"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-         name="%GotoTestCommand.name"
-         description="%GotoTestCommand.description"
-         category="org.eclipse.search.ui.category.search"
-         id="org.eclipse.jdt.junit.gotoTest">
-      </command>
-      <command
-            name="%ViewCommand.junitView.name"
-            description="%ViewCommand.junitView.description"
-            category="org.eclipse.ui.category.views"
-            id="org.eclipse.jdt.junit.ResultView">
-      </command>
-      <keyBinding
-            string=""
-            scope="org.eclipse.ui.globalScope"
-            command="org.eclipse.jdt.junit.ResultView"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-   </extension>
-</plugin>

diff --git a/org.eclipse.jdt.junit/schema/internal-testRunTabs.exsd b/org.eclipse.jdt.junit/schema/internal-testRunTabs.exsd
deleted file mode 100644
index 7a96872..0000000
--- a/org.eclipse.jdt.junit/schema/internal-testRunTabs.exsd
+++ /dev/null

@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jdt.junit">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jdt.junit" id="internal-testRunTabs" name="%testRunTabs.name"/>

-      </appInfo>

-      <documentation>

-         [Enter description of this extension point.]

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="testRunTab"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="testRunTab">

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.jdt.internal.junit.ui.TestRunTab"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-</schema>


diff --git a/org.eclipse.jdt.junit/schema/junitLaunchConfigs.exsd b/org.eclipse.jdt.junit/schema/junitLaunchConfigs.exsd
deleted file mode 100644
index 1f20f7d..0000000
--- a/org.eclipse.jdt.junit/schema/junitLaunchConfigs.exsd
+++ /dev/null

@@ -1,107 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jdt.junit">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jdt.junit" id="junitLaunchConfigs" name="JUnit Launch Configurations"/>

-      </appInfo>

-      <documentation>

-         Extension point to register JUnit based launch configurations that need to be updated during refactorings.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="launchConfigType"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="launchConfigType">

-      <complexType>

-         <attribute name="configTypeID" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         3.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         The following is an example of a JUnit launch config contribution:

-&lt;p&gt;

-&lt;pre&gt;

- &lt;extension point=&quot;org.eclipse.jdt.junit.junitLaunchConfigs&quot;&gt;

-  &lt;launchConfigType configTypeID=&quot;com.example.JunitLaunchConfig&quot;&gt;

- &lt;/extension&gt;

-&lt;/pre&gt;

-&lt;/p&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2004 IBM Corporation and others.

-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>


diff --git a/org.eclipse.jdt.junit/schema/testRunListeners.exsd b/org.eclipse.jdt.junit/schema/testRunListeners.exsd
deleted file mode 100644
index 1afa681..0000000
--- a/org.eclipse.jdt.junit/schema/testRunListeners.exsd
+++ /dev/null

@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jdt.junit">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jdt.junit" id="testRunListeners" name="Test Run Listeners"/>
-      </appInfo>
-      <documentation>
-         Extension point to register additional test run listeners. A test run listeners is notified about the execution of a test run.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            a fully qualified identifier of the target extension point
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="testRunListener"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="testRunListener">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Test run class implementing org.eclipse.jdt.junit.ITestRunListener
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jdt.junit.ITestRunListener"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.1
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a test run listener contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jdt.junit.testRunListeners&quot;&gt;
-  &lt;testRunListener class=&quot;com.example.SampleTestRunListener&quot;/&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Test run listeners must must implement the org.eclipse.jdt.junit.ITestRunListener interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2004 IBM Corporation and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.jdt.junit/scripts/exportplugin.xml b/org.eclipse.jdt.junit/scripts/exportplugin.xml
deleted file mode 100644
index 2142e8b..0000000
--- a/org.eclipse.jdt.junit/scripts/exportplugin.xml
+++ /dev/null

@@ -1,37 +0,0 @@
-<!-- build script to create JUnit Plugin -->
-<project name="org.eclipse.jdt.junit" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.jdt.junit" />
-		<property name="version"  value="_3.1.0" />
-		<property name="dest"  value="${destdir}/${plugin}${version}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		
-		<jar 
-			jarfile="${dest}/junitsupport.jar"
-			basedir="bin"
-		/>
-				
-		<jar 		
-			jarfile="${dest}/junitsupportsrc.jar"
-			basedir="src"
-		/>
-		
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<copy file="about.html" todir="${dest}"/>
-		<copy todir="${dest}/icons">
-			<fileset dir="icons" />
-		</copy>		
-	</target>
-</project>

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/ContainerComparator.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/ContainerComparator.java
deleted file mode 100644
index 52145dd..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/ContainerComparator.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
-import java.util.Comparator;
-
-public class ContainerComparator implements Comparator {
-
-    public int compare(Object o1, Object o2) {
-		String container1= (String)o1;
-		String container2= (String)o2;
-		if (container1 == null)
-			container1= ""; //$NON-NLS-1$
-		if (container2 == null)
-			container2= ""; //$NON-NLS-1$
-		return container1.compareTo(container2);
-    }
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitBaseLaunchConfiguration.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitBaseLaunchConfiguration.java
deleted file mode 100644
index dc2c132..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitBaseLaunchConfiguration.java
+++ /dev/null

@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
- 
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.SocketUtil;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-/**
- * Abstract launch configuration delegate for a JUnit test.
- */
-public abstract class JUnitBaseLaunchConfiguration extends AbstractJavaLaunchConfigurationDelegate {
-
-	public static final String PORT_ATTR= JUnitPlugin.PLUGIN_ID+".PORT"; //$NON-NLS-1$
-	/**
-	 * The single test type, or "" iff running a launch container.
-	 */
-	public static final String TESTTYPE_ATTR= JUnitPlugin.PLUGIN_ID+".TESTTYPE"; //$NON-NLS-1$
-	/**
-	 * The test method, or "" iff running the whole test type.
-	 */
-	public static final String TESTNAME_ATTR= JUnitPlugin.PLUGIN_ID+".TESTNAME"; //$NON-NLS-1$
-	public static final String ATTR_KEEPRUNNING = JUnitPlugin.PLUGIN_ID+ ".KEEPRUNNING_ATTR"; //$NON-NLS-1$
-	/**
-	 * The launch container, or "" iff running a single test type.
-	 */
-	public static final String LAUNCH_CONTAINER_ATTR= JUnitPlugin.PLUGIN_ID+".CONTAINER"; //$NON-NLS-1$
-
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor pm) throws CoreException {		
-		IJavaProject javaProject= getJavaProject(configuration);
-		if ((javaProject == null) || !javaProject.exists()) {
-			abort(JUnitMessages.getString("JUnitBaseLaunchConfiguration.error.invalidproject"), null, IJavaLaunchConfigurationConstants.ERR_NOT_A_JAVA_PROJECT); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		IType[] testTypes = getTestTypes(configuration, javaProject, pm);
-		if (testTypes.length == 0) {
-			abort(JUnitMessages.getString("JUnitBaseLaunchConfiguration.error.notests"), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); //$NON-NLS-1$
-		}
-		IVMInstall install= getVMInstall(configuration);
-		IVMRunner runner = install.getVMRunner(mode);
-		if (runner == null) {
-			abort(MessageFormat.format(JUnitMessages.getString("JUnitBaseLaunchConfiguration.error.novmrunner"), new String[]{install.getId()}), null, IJavaLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST); //$NON-NLS-1$
-		}
-		
-		int port= SocketUtil.findFreePort();
-		VMRunnerConfiguration runConfig= launchTypes(configuration, mode, testTypes, port);
-		setDefaultSourceLocator(launch, configuration);
-		
-		launch.setAttribute(PORT_ATTR, Integer.toString(port));
-		launch.setAttribute(TESTTYPE_ATTR, testTypes[0].getHandleIdentifier());
-		runner.run(runConfig, launch, pm);		
-	}
-
-	protected VMRunnerConfiguration launchTypes(ILaunchConfiguration configuration,
-					String mode, IType[] tests, int port) throws CoreException {
-		File workingDir = verifyWorkingDirectory(configuration);
-		String workingDirName = null;
-		if (workingDir != null) 
-			workingDirName = workingDir.getAbsolutePath();
-		
-		// Program & VM args
-		String vmArgs= getVMArguments(configuration);
-		ExecutionArguments execArgs = new ExecutionArguments(vmArgs, ""); //$NON-NLS-1$
-		String[] envp= DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration);
-
-		VMRunnerConfiguration runConfig= createVMRunner(configuration, tests, port, mode);
-		runConfig.setVMArguments(execArgs.getVMArgumentsArray());
-		runConfig.setWorkingDirectory(workingDirName);
-		runConfig.setEnvironment(envp);
-
-		Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-		runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
-		String[] bootpath = getBootpath(configuration);
-		runConfig.setBootClassPath(bootpath);
-		
-		return runConfig;
-	}
-
-	public IType[] getTestTypes(ILaunchConfiguration configuration, IJavaProject javaProject, IProgressMonitor pm) throws CoreException {
-		String testTypeName = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String)null);
-		testTypeName= VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(testTypeName);
-
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		
-		String containerHandle = configuration.getAttribute(LAUNCH_CONTAINER_ATTR, ""); //$NON-NLS-1$
-		if (containerHandle.length() == 0) {
-			return findSingleTest(javaProject, testTypeName);
-		}
-		else 
-			return findTestsInContainer(containerHandle, pm);
-	}
-	
-	/**
-	 * @inheritdoc 
-	 * @param containerHandle
-	 * @param pm
-	 * @return
-	 */
-	private IType[] findTestsInContainer(String containerHandle, IProgressMonitor pm) {
-		IJavaElement container= JavaCore.create(containerHandle);
-		Set result= new HashSet();
-		try {
-			TestSearchEngine.doFindTests(new Object[]{container}, result, pm);
-		} catch (InterruptedException e) {
-		}
-		return (IType[]) result.toArray(new IType[result.size()]) ;
-	}
-
-	public IType[] findSingleTest(IJavaProject javaProject, String testName) throws CoreException {
-		IType type = null;
-		try {
-			type = findType(javaProject, testName);
-		} catch (JavaModelException jme) {
-			abort("Test type does not exist", null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); //$NON-NLS-1$
-		}
-		if (type == null) {
-			abort("Test type does not exist", null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); //$NON-NLS-1$
-		}
-		return new IType[]{type};
-	}
-	
-	/**
-	 * Throws a core exception with the given message and optional
-	 * exception. The exception's status code will indicate an error.
-	 * 
-	 * @param message error message
-	 * @param exception cause of the error, or <code>null</code>
-	 * @exception CoreException with the given message and underlying
-	 *  exception
-	 */
-	protected void abort(String message, Throwable exception, int code) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, JUnitPlugin.PLUGIN_ID, code, message, exception));
-	}
-	
-	/**
-	 * Find the specified (fully-qualified) type name in the specified java project.
-	 */
-	private IType findType(IJavaProject javaProject, String mainTypeName) throws JavaModelException {
-		return javaProject.findType(mainTypeName);
-	}
-	
-	/**
-	 * Override to create a custom VMRunnerConfiguration for a launch configuration.
-	 */
-	protected abstract VMRunnerConfiguration createVMRunner(ILaunchConfiguration configuration, IType[] testTypes, int port, String runMode) throws CoreException;
-
-	protected boolean keepAlive(ILaunchConfiguration config) {
-		try {
-			return config.getAttribute(ATTR_KEEPRUNNING, false);
-		} catch(CoreException e) {
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchConfiguration.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchConfiguration.java
deleted file mode 100644
index a98f6c6..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchConfiguration.java
+++ /dev/null

@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.jface.util.Assert;
-
-/**
- * Launch configuration delegate for a plain JUnit test.
- */
-public class JUnitLaunchConfiguration extends JUnitBaseLaunchConfiguration  {
-
-	public static final String ID_JUNIT_APPLICATION= "org.eclipse.jdt.junit.launchconfig"; //$NON-NLS-1$
-	/**
-	 * Add a VMRunner with a class path that includes org.eclipse.jdt.junit plugin.
-	 * In addition it adds the port for the RemoteTestRunner as an argument
-	 */
-	protected VMRunnerConfiguration createVMRunner(ILaunchConfiguration configuration, IType[] testTypes, int port, String runMode) throws CoreException {
-		String[] classPath= createClassPath(configuration);	
-		String progArgs= getProgramArguments(configuration);
-		VMRunnerConfiguration vmConfig= new VMRunnerConfiguration("org.eclipse.jdt.internal.junit.runner.RemoteTestRunner", classPath); //$NON-NLS-1$
-		String testName= configuration.getAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR, ""); //$NON-NLS-1$
-		
-		// insert the program arguments
-		Vector argv= new Vector(10);
-		ExecutionArguments execArgs = new ExecutionArguments("", progArgs); //$NON-NLS-1$
-		String[] pa= execArgs.getProgramArgumentsArray();
-		for (int i= 0; i < pa.length; i++) {
-			argv.add(pa[i]);
-		}
-	
-		argv.add("-version"); //$NON-NLS-1$
-		argv.add("3"); //$NON-NLS-1$
-		
-		argv.add("-port"); //$NON-NLS-1$
-		argv.add(Integer.toString(port));
-		//argv("-debugging");
-				
-		if (keepAlive(configuration) && runMode.equals(ILaunchManager.DEBUG_MODE))
-			argv.add(0, "-keepalive"); //$NON-NLS-1$
-		
-		// a testname was specified just run the single test
-		if (testName.length() > 0) {
-			argv.add("-test"); //$NON-NLS-1$
-			argv.add(testTypes[0].getFullyQualifiedName()+":"+testName);			 //$NON-NLS-1$
-		} else if (testTypes.length > 1) {
-			String fileName= createTestNamesFile(testTypes);
-			argv.add("-testNameFile"); //$NON-NLS-1$
-			argv.add(fileName);
-		} else {
-			argv.add("-classNames"); //$NON-NLS-1$
-			for (int i= 0; i < testTypes.length; i++) 
-				argv.add(testTypes[i].getFullyQualifiedName());
-		}
-		String[] args= new String[argv.size()];
-		argv.copyInto(args);
-		vmConfig.setProgramArguments(args);
-		return vmConfig;
-	}
-
-	private String createTestNamesFile(IType[] testTypes) throws CoreException {
-		try {
-			File file= File.createTempFile("testNames", ".txt"); //$NON-NLS-1$ //$NON-NLS-2$
-			file.deleteOnExit();
-			BufferedWriter bw= null;
-			try {
-				bw= new BufferedWriter(new FileWriter(file));
-				for (int i= 0; i < testTypes.length; i++) {
-					String testName= testTypes[i].getFullyQualifiedName();
-					bw.write(testName);
-					bw.newLine();
-				}
-			} finally {
-				if (bw != null) {
-					bw.close();
-				}
-			}
-			return file.getAbsolutePath();
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, JUnitPlugin.PLUGIN_ID, IStatus.ERROR, "", e)); //$NON-NLS-1$
-		}
-	}
-	
-	private String[] createClassPath(ILaunchConfiguration configuration) throws CoreException {
-		URL runtimeURL= Platform.getBundle("org.eclipse.jdt.junit.runtime").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$
-		URL url= Platform.getBundle(JUnitPlugin.PLUGIN_ID).getEntry("/"); //$NON-NLS-1$
-		
-		String[] cp= getClasspath(configuration);
-		String[] classPath= null;
-		
-		try {
-			if (BootLoader.inDevelopmentMode()) {
-				// we first try the bin output folder
-				List junitEntries= new ArrayList();
-				
-				try {
-					junitEntries.add(Platform.asLocalURL(new URL(url, "bin")).getFile()); //$NON-NLS-1$
-				} catch (IOException e3) {
-					try {
-						junitEntries.add(Platform.asLocalURL(new URL(url, "junitsupport.jar")).getFile()); //$NON-NLS-1$
-					} catch (IOException e4) {
-						// fall through
-					}
-				}
-				try {
-					junitEntries.add(Platform.asLocalURL(new URL(runtimeURL, "bin")).getFile()); //$NON-NLS-1$
-				} catch (IOException e1) {
-					try {
-						junitEntries.add(Platform.asLocalURL(new URL(runtimeURL, "junitruntime.jar")).getFile()); //$NON-NLS-1$
-					} catch (IOException e4) {
-						// fall through
-					}
-				}
-				Assert.isTrue(junitEntries.size() == 2, "Required JARs available"); //$NON-NLS-1$
-				
-				classPath= new String[cp.length + junitEntries.size()];
-				Object[] jea= junitEntries.toArray();
-				System.arraycopy(cp, 0, classPath, 0, cp.length);
-				System.arraycopy(jea, 0, classPath, cp.length, jea.length);
-			} else {
-				classPath= new String[cp.length + 2];
-				System.arraycopy(cp, 0, classPath, 2, cp.length);
-				classPath[0]= Platform.asLocalURL(new URL(url, "junitsupport.jar")).getFile(); //$NON-NLS-1$
-				classPath[1]= Platform.asLocalURL(new URL(runtimeURL, "junitruntime.jar")).getFile(); //$NON-NLS-1$
-			}
-		} catch (IOException e) {
-			JUnitPlugin.log(e); // TODO abort run and inform user
-		}
-		return classPath;
-	}		
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchConfigurationTab.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchConfigurationTab.java
deleted file mode 100644
index 9d6f564..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchConfigurationTab.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
- 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.ui.util.SWTUtil;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Common function for Java launch configuration tabs.
- */
-public abstract class JUnitLaunchConfigurationTab extends AbstractLaunchConfigurationTab {
-		
-	/**
-	 * Returns the current Java element context from which to initialize
-	 * default settings, or <code>null</code> if none.
-	 * 
-	 * @return Java element context.
-	 */
-	protected IJavaElement getContext() {
-		IWorkbenchPage page = JDIDebugUIPlugin.getActivePage();
-		if (page != null) {
-			ISelection selection = page.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection ss = (IStructuredSelection)selection;
-				if (!ss.isEmpty()) {
-					Object obj = ss.getFirstElement();
-					if (obj instanceof IJavaElement) {
-						return (IJavaElement)obj;
-					}
-					if (obj instanceof IResource) {
-						IJavaElement je = JavaCore.create((IResource)obj);
-						if (je == null) {
-							IProject pro = ((IResource)obj).getProject();
-							je = JavaCore.create(pro);
-						}
-						if (je != null) {
-							return je;
-						}
-					}
-				}
-			}
-			IEditorPart part = page.getActiveEditor();
-			if (part != null) {
-				IEditorInput input = part.getEditorInput();
-				return (IJavaElement) input.getAdapter(IJavaElement.class);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Set the java project attribute based on the IJavaElement.
-	 */
-	protected void initializeJavaProject(IJavaElement javaElement, ILaunchConfigurationWorkingCopy config) {
-		IJavaProject javaProject = javaElement.getJavaProject();
-		String name = null;
-		if (javaProject != null && javaProject.exists()) {
-			name = javaProject.getElementName();
-		}
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, name);
-	}
-
-	protected void setButtonGridData(Button button) {
-		GridData gridData= new GridData();
-		button.setLayoutData(gridData);
-		SWTUtil.setButtonDimensionHint(button);
-	}
-	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchShortcut.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchShortcut.java
deleted file mode 100644
index 5b7301b..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchShortcut.java
+++ /dev/null

@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
-public class JUnitLaunchShortcut implements ILaunchShortcut {
-	
-	/**
-	 * @see ILaunchShortcut#launch(IEditorPart, String)
-	 */
-	public void launch(IEditorPart editor, String mode) {
-		IJavaElement element= null;
-		IEditorInput input = editor.getEditorInput();
-		element = (IJavaElement) input.getAdapter(IJavaElement.class);
-
-		if (element != null) {
-			searchAndLaunch(new Object[] {element}, mode);
-		} 
-	}
-	
-	/**
-	 * @see ILaunchShortcut#launch(ISelection, String)
-	 */
-	public void launch(ISelection selection, String mode) {
-		if (selection instanceof IStructuredSelection) {
-			searchAndLaunch(((IStructuredSelection)selection).toArray(), mode);
-		} 
-	}
-
-	protected void searchAndLaunch(Object[] search, String mode) {
-		if (search != null) {
-			if (search.length == 0) {
-				MessageDialog.openInformation(getShell(), JUnitMessages.getString("LaunchTestAction.dialog.title"), JUnitMessages.getString("LaunchTestAction.message.notests")); //$NON-NLS-1$ //$NON-NLS-2$
-				return;
-			}	
-			if (search[0] instanceof IJavaElement) {
-				IJavaElement element= (IJavaElement)search[0];
-				if (element.getElementType() < IJavaElement.COMPILATION_UNIT) {
-					launchContainer(element, mode);
-					return;
-				}
-				if (element.getElementType() == IJavaElement.METHOD) {
-					launchMethod((IMethod)element, mode);
-					return;
-				}
-			}
-			// launch a CU or type
-			launchType(search, mode);
-		}
-	}
-	
-	protected void launchType(Object[] search, String mode) {
-		IType[] types= null;
-		try {
-			types= TestSearchEngine.findTests(search); 
-		} catch (InterruptedException e) {
-			JUnitPlugin.log(e);
-			return;
-		} catch (InvocationTargetException e) {
-			JUnitPlugin.log(e);
-			return;
-		}
-		IType type= null;
-		if (types.length == 0) {
-			MessageDialog.openInformation(getShell(), JUnitMessages.getString("LaunchTestAction.dialog.title"), JUnitMessages.getString("LaunchTestAction.message.notests")); //$NON-NLS-1$ //$NON-NLS-2$
-		} else if (types.length > 1) {
-			type= chooseType(types, mode);
-		} else {
-			type= types[0];
-		}
-		if (type != null) {
-			launch(type, mode);
-		}
-	}
-
-	private void launchContainer(IJavaElement container, String mode) {
-		String handleIdentifier= container.getHandleIdentifier();
-		ILaunchConfiguration config = findLaunchConfiguration(
-			mode, 
-			container, 
-			handleIdentifier, 
-			"",  //$NON-NLS-1$
-			"" //$NON-NLS-1$
-		);
-		if (config == null) {
-			config = createConfiguration(
-				container.getJavaProject(),
-				container.getElementName(),
-				"", //$NON-NLS-1$
-				handleIdentifier,
-				"" //$NON-NLS-1$
-			);
-		}
-		launchConfiguration(mode, config);
-	}
-	
-	private void launch(IType type, String mode) {
-		String fullyQualifiedName= type.getFullyQualifiedName();
-		ILaunchConfiguration config = findLaunchConfiguration(
-			mode, 
-			type, 
-			"",  //$NON-NLS-1$
-			fullyQualifiedName, 
-			"" //$NON-NLS-1$
-		);
-		if (config == null) {
-			config= createConfiguration(
-				type.getJavaProject(),
-				type.getElementName(),
-				fullyQualifiedName,
-				"", //$NON-NLS-1$
-				"" //$NON-NLS-1$
-			);
-		}
-		launchConfiguration(mode, config);
-	}
-
-	private void launchMethod(IMethod method, String mode) {
-		IType declaringType= method.getDeclaringType();
-		String fullyQualifiedName= declaringType.getFullyQualifiedName();
-		ILaunchConfiguration config = findLaunchConfiguration(
-			mode, 
-			method, 
-			"",  //$NON-NLS-1$
-			fullyQualifiedName, 
-			method.getElementName()
-		);
-
-		if (config == null) {
-			config= createConfiguration(
-				method.getJavaProject(),
-				declaringType.getElementName()+"."+method.getElementName(), //$NON-NLS-1$
-				fullyQualifiedName,
-				"", //$NON-NLS-1$
-				method.getElementName()
-			);
-		}
-		launchConfiguration(mode, config);
-	}
-
-
-	protected void launchConfiguration(String mode, ILaunchConfiguration config) {
-		if (config != null) {
-			DebugUITools.launch(config, mode);
-		}
-	}
-	
-	/**
-	 * Prompts the user to select a type
-	 * 
-	 * @return the selected type or <code>null</code> if none.
-	 */
-	protected IType chooseType(IType[] types, String mode) {
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_POST_QUALIFIED));
-		dialog.setElements(types);
-		dialog.setTitle(JUnitMessages.getString("LaunchTestAction.dialog.title2")); //$NON-NLS-1$
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setMessage(JUnitMessages.getString("LaunchTestAction.message.selectTestToRun"));  //$NON-NLS-1$
-		} else {
-			dialog.setMessage(JUnitMessages.getString("LaunchTestAction.message.selectTestToDebug")); //$NON-NLS-1$
-		}
-		dialog.setMultipleSelection(false);
-		if (dialog.open() == Window.OK) {
-			return (IType)dialog.getFirstResult();
-		}
-		return null;
-	}
-	
-	private ILaunchConfiguration findLaunchConfiguration(String mode, IJavaElement element, String container, String testClass, String testName) {
-		ILaunchConfigurationType configType= getJUnitLaunchConfigType();
-		List candidateConfigs= Collections.EMPTY_LIST;
-		try {
-			ILaunchConfiguration[] configs= getLaunchManager().getLaunchConfigurations(configType);
-			candidateConfigs= new ArrayList(configs.length);
-			for (int i= 0; i < configs.length; i++) {
-				ILaunchConfiguration config= configs[i];
-				if ((config.getAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, "").equals(container)) && //$NON-NLS-1$
-					(config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "").equals(testClass)) && //$NON-NLS-1$
-					(config.getAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR,"").equals(testName)) &&   //$NON-NLS-1$
-					(config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(element.getJavaProject().getElementName()))) {  //$NON-NLS-1$
-						candidateConfigs.add(config);
-				}
-			}
-		} catch (CoreException e) {
-			JUnitPlugin.log(e);
-		}
-		
-		// If there are no existing configs associated with the IType, create one.
-		// If there is exactly one config associated with the IType, return it.
-		// Otherwise, if there is more than one config associated with the IType, prompt the
-		// user to choose one.
-		int candidateCount= candidateConfigs.size();
-		if (candidateCount < 1) {
-			return null;
-		} else if (candidateCount == 1) {
-			return (ILaunchConfiguration) candidateConfigs.get(0);
-		} else {
-			// Prompt the user to choose a config.  A null result means the user
-			// cancelled the dialog, in which case this method returns null,
-			// since cancelling the dialog should also cancel launching anything.
-			ILaunchConfiguration config= chooseConfiguration(candidateConfigs, mode);
-			if (config != null) {
-				return config;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Show a selection dialog that allows the user to choose one of the specified
-	 * launch configurations.  Return the chosen config, or <code>null</code> if the
-	 * user cancelled the dialog.
-	 */
-	protected ILaunchConfiguration chooseConfiguration(List configList, String mode) {
-		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setElements(configList.toArray());
-		dialog.setTitle(JUnitMessages.getString("LaunchTestAction.message.selectConfiguration")); //$NON-NLS-1$
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setMessage(JUnitMessages.getString("LaunchTestAction.message.selectDebugConfiguration")); //$NON-NLS-1$
-		} else {
-			dialog.setMessage(JUnitMessages.getString("LaunchTestAction.message.selectRunConfiguration")); //$NON-NLS-1$
-		}
-		dialog.setMultipleSelection(false);
-		int result= dialog.open();
-		labelProvider.dispose();
-		if (result == Window.OK) {
-			return (ILaunchConfiguration)dialog.getFirstResult();
-		}
-		return null;		
-	}
-	
-
-	protected ILaunchConfiguration createConfiguration(
-			IJavaProject project, String name, String mainType, 
-			String container, String testName) {
-				
-		ILaunchConfiguration config= null;
-		try {
-			ILaunchConfigurationType configType= getJUnitLaunchConfigType();
-			ILaunchConfigurationWorkingCopy wc = configType.newInstance(null, getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name)); 
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainType);
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getElementName());
-			wc.setAttribute(JUnitBaseLaunchConfiguration.ATTR_KEEPRUNNING, false);
-			wc.setAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, container);
-			if (testName.length() > 0)
-				wc.setAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR, testName);	
-			config= wc.doSave();		
-		} catch (CoreException ce) {
-			JUnitPlugin.log(ce);
-		}
-		return config;
-	}
-	
-	/**
-	 * Returns the local java launch config type
-	 */
-	protected ILaunchConfigurationType getJUnitLaunchConfigType() {
-		ILaunchManager lm= DebugPlugin.getDefault().getLaunchManager();
-		return lm.getLaunchConfigurationType(JUnitLaunchConfiguration.ID_JUNIT_APPLICATION);		
-	}	
-	
-	protected ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	
-	/**
-	 * Convenience method to get the window that owns this action's Shell.
-	 */
-	protected Shell getShell() {
-		return JUnitPlugin.getActiveWorkbenchShell();
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitMainTab.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitMainTab.java
deleted file mode 100644
index eb1428c..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitMainTab.java
+++ /dev/null

@@ -1,701 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids: sdavids@gmx.de bug: 26293, 27889 
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
- 
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceReference;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator;
-import org.eclipse.jdt.internal.ui.wizards.TypedViewerFilter;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.JavaElementSorter;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * This tab appears in the LaunchConfigurationDialog for launch configurations that
- * require Java-specific launching information such as a main type and JRE.
- */
-public class JUnitMainTab extends JUnitLaunchConfigurationTab {
-	
-	// Project UI widgets
-	private Label fProjLabel;
-	private Text fProjText;
-	private Button fProjButton;
-	private Button fKeepRunning;
-	
-	// Test class UI widgets
-	private Text fTestText;
-	private Button fSearchButton;
-	private final Image fTestIcon= createImage("obj16/test.gif"); //$NON-NLS-1$
-	private String fOriginalTestMethodName;
-	private Label fTestMethodLabel;
-	private Text fContainerText;
-	private IJavaElement fContainerElement;
-	private final ILabelProvider fJavaElementLabelProvider= new JavaElementLabelProvider();
-
-	private Button fContainerSearchButton;
-	private Button fTestContainerRadioButton;
-	private Button fTestRadioButton;
-	private Label fTestLabel; 
-	
-	/**
-	 * @see ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {		
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns= 3;
-		comp.setLayout(topLayout);		
-		
-		Label label = new Label(comp, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 3;
-		label.setLayoutData(gd);
-		
-		createSingleTestSection(comp);
-		createTestContainerSelectionGroup(comp);
-		
-		label = new Label(comp, SWT.NONE);
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		label.setLayoutData(gd);
-		
-		createKeepAliveGroup(comp);
-		Dialog.applyDialogFont(comp);
-		validatePage();
-	}
-	
-	protected void createSingleTestSection(Composite comp) {
-		fTestRadioButton= new Button(comp, SWT.RADIO);
-		fTestRadioButton.setText(JUnitMessages.getString("JUnitMainTab.label.oneTest")); //$NON-NLS-1$
-		GridData gd = new GridData();
-		gd.horizontalSpan = 3;
-		fTestRadioButton.setLayoutData(gd); 
-		fTestRadioButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (fTestRadioButton.getSelection())
-					testModeChanged();
-			}
-		});
-		
-		fProjLabel = new Label(comp, SWT.NONE);
-		fProjLabel.setText(JUnitMessages.getString("JUnitMainTab.label.project")); //$NON-NLS-1$
-		gd= new GridData();
-		gd.horizontalIndent = 25;
-		fProjLabel.setLayoutData(gd);
-		
-		fProjText= new Text(comp, SWT.SINGLE | SWT.BORDER);
-		fProjText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fProjText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				validatePage();
-				updateLaunchConfigurationDialog();				
-				fSearchButton.setEnabled(fTestRadioButton.getSelection() && fProjText.getText().length() > 0);
-			}
-		});
-			
-		fProjButton = new Button(comp, SWT.PUSH);
-		fProjButton.setText(JUnitMessages.getString("JUnitMainTab.label.browse")); //$NON-NLS-1$
-		fProjButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleProjectButtonSelected();
-			}
-		});
-		setButtonGridData(fProjButton);
-		
-		fTestLabel = new Label(comp, SWT.NONE);
-		gd = new GridData();
-		gd.horizontalIndent = 25;
-		fTestLabel.setLayoutData(gd);
-		fTestLabel.setText(JUnitMessages.getString("JUnitMainTab.label.test")); //$NON-NLS-1$
-		
-	
-		fTestText = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		fTestText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fTestText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				validatePage();
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fSearchButton = new Button(comp, SWT.PUSH);
-		fSearchButton.setEnabled(fProjText.getText().length() > 0);		
-		fSearchButton.setText(JUnitMessages.getString("JUnitMainTab.label.search")); //$NON-NLS-1$
-		fSearchButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleSearchButtonSelected();
-			}
-		});
-		setButtonGridData(fSearchButton);
-		
-		new Label(comp, SWT.NONE);
-		
-		fTestMethodLabel= new Label(comp, SWT.NONE);
-		fTestMethodLabel.setText("");  //$NON-NLS-1$
-		gd= new GridData();
-		gd.horizontalSpan = 2;
-		fTestMethodLabel.setLayoutData(gd);
-		
-	}
-
-	protected void createTestContainerSelectionGroup(Composite comp) {
-		fTestContainerRadioButton= new Button(comp, SWT.RADIO);
-		fTestContainerRadioButton.setText(JUnitMessages.getString("JUnitMainTab.label.containerTest")); //$NON-NLS-1$
-		GridData gd = new GridData();
-		gd.horizontalSpan = 3;
-		fTestContainerRadioButton.setLayoutData(gd);
-		fTestContainerRadioButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				if (fTestContainerRadioButton.getSelection())
-					testModeChanged();
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		
-		fContainerText = new Text(comp, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalIndent= 25;
-		gd.horizontalSpan = 2;
-		fContainerText.setLayoutData(gd);
-		fContainerText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fContainerSearchButton = new Button(comp, SWT.PUSH);
-		fContainerSearchButton.setText(JUnitMessages.getString("JUnitMainTab.label.search")); //$NON-NLS-1$
-		fContainerSearchButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleContainerSearchButtonSelected();
-			}
-		});
-		setButtonGridData(fContainerSearchButton);	
-	}
-
-	private void handleContainerSearchButtonSelected() {
-		IJavaElement javaElement= chooseContainer(fContainerElement);
-		if (javaElement != null)
-			setContainerElement(javaElement);
-	}
-
-	private void setContainerElement(IJavaElement javaElement) {
-		fContainerElement= javaElement;
-		fContainerText.setText(getPresentationName(javaElement));
-		validatePage();
-		updateLaunchConfigurationDialog();
-	}
-
-	public void createKeepAliveGroup(Composite comp) {
-		GridData gd;
-		fKeepRunning = new Button(comp, SWT.CHECK);
-		fKeepRunning.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		fKeepRunning.setText(JUnitMessages.getString("JUnitMainTab.label.keeprunning")); //$NON-NLS-1$
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.FILL;
-		gd.horizontalSpan= 2;
-		fKeepRunning.setLayoutData(gd);
-	}
-
-
-	
-	protected static Image createImage(String path) {
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(JUnitPlugin.makeIconFileURL(path));
-			return id.createImage();
-		} catch (MalformedURLException e) {
-			// fall through
-		}  
-		return null;
-	}
-
-
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		updateProjectFromConfig(config);
-		String containerHandle= ""; //$NON-NLS-1$
-		try {
-			containerHandle = config.getAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, ""); //$NON-NLS-1$
-		} catch (CoreException ce) {			
-		}
-		
-		if (containerHandle.length() > 0)
-			updateTestContainerFromConfig(config);
-		else
-			updateTestTypeFromConfig(config);
-		updateKeepRunning(config);
-	}
-
-	private void updateKeepRunning(ILaunchConfiguration config) {
-		boolean running= false;
-		try {
-			running= config.getAttribute(JUnitBaseLaunchConfiguration.ATTR_KEEPRUNNING, false);
-		} catch (CoreException ce) {
-		}
-		fKeepRunning.setSelection(running);	 	
-	}
-	
-	protected void updateProjectFromConfig(ILaunchConfiguration config) {
-		String projectName= ""; //$NON-NLS-1$
-		try {
-			projectName = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
-		} catch (CoreException ce) {
-		}
-		fProjText.setText(projectName);
-	}
-	
-	protected void updateTestTypeFromConfig(ILaunchConfiguration config) {
-		String testTypeName= ""; //$NON-NLS-1$
-		fOriginalTestMethodName= ""; //$NON-NLS-1$
-		try {
-			testTypeName = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, ""); //$NON-NLS-1$
-			fOriginalTestMethodName = config.getAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR, ""); //$NON-NLS-1$
-		} catch (CoreException ce) {			
-		}
-		fTestRadioButton.setSelection(true);
-		setEnableSingleTestGroup(true);
-		setEnableContainerTestGroup(false);		
-		fTestContainerRadioButton.setSelection(false);
-		fTestText.setText(testTypeName);
-		fContainerText.setText(""); //$NON-NLS-1$
-		setTestMethodLabel(fOriginalTestMethodName);
-	}
-
-	private void setTestMethodLabel(String testMethodName) {
-		if (!"".equals(testMethodName)) { //$NON-NLS-1$
-			fTestMethodLabel.setText(JUnitMessages.getString("JUnitMainTab.label.method")+fOriginalTestMethodName); //$NON-NLS-1$
-		} else {
-			fTestMethodLabel.setText(""); //$NON-NLS-1$
-		}
-	}
-
-	protected void updateTestContainerFromConfig(ILaunchConfiguration config) {
-		String containerHandle= ""; //$NON-NLS-1$
-		try {
-			containerHandle = config.getAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, ""); //$NON-NLS-1$
-			if (containerHandle.length() > 0) {
-				fContainerElement= JavaCore.create(containerHandle);
-			}
-		} catch (CoreException ce) {			
-		}
-		fTestContainerRadioButton.setSelection(true);
-		setEnableSingleTestGroup(false);
-		setEnableContainerTestGroup(true);				
-		fTestRadioButton.setSelection(false);
-		if (fContainerElement != null)
-			fContainerText.setText(getPresentationName(fContainerElement));
-		fTestText.setText(""); //$NON-NLS-1$
-	}
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		if (fTestContainerRadioButton.getSelection() && fContainerElement != null) {
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fContainerElement.getJavaProject().getElementName());
-			config.setAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, fContainerElement.getHandleIdentifier());
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, ""); //$NON-NLS-1$
-		} else {
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, fTestText.getText());
-			config.setAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, ""); //$NON-NLS-1$			
-		}
-		config.setAttribute(JUnitBaseLaunchConfiguration.ATTR_KEEPRUNNING, fKeepRunning.getSelection());
-		config.setAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR, fOriginalTestMethodName);
-		String testMethod= config.contentsEqual(config.getOriginal()) //workaround for bug 65399
-			? fOriginalTestMethodName
-			: ""; //$NON-NLS-1$
-		config.setAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR, testMethod);
-		setTestMethodLabel(testMethod);
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		fTestIcon.dispose();
-		fJavaElementLabelProvider.dispose();
-	}
-
-	/**
-	 * @see AbstractLaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return fTestIcon;
-	}
-
-	/**
-	 * Show a dialog that lists all main types
-	 */
-	protected void handleSearchButtonSelected() {
-		Shell shell = getShell();
-		
-		IJavaProject javaProject = getJavaProject();
-		
-		IType[] types= new IType[0];
-		boolean[] radioSetting= new boolean[2];
-		try {
-			// fix for 66922 Wrong radio behaviour when switching
-			// remember the selected radio button
-			radioSetting[0]= fTestRadioButton.getSelection();
-			radioSetting[1]= fTestContainerRadioButton.getSelection();
-			
-			types= TestSearchEngine.findTests(getLaunchConfigurationDialog(), new Object[] {javaProject}); 
-		} catch (InterruptedException e) {
-			setErrorMessage(e.getMessage());
-			return;
-		} catch (InvocationTargetException e) {
-			JUnitPlugin.log(e.getTargetException());
-			return;
-		} finally {
-			fTestRadioButton.setSelection(radioSetting[0]);
-			fTestContainerRadioButton.setSelection(radioSetting[1]);
-		}
-
-		SelectionDialog dialog = new TestSelectionDialog(shell, types);
-		dialog.setTitle(JUnitMessages.getString("JUnitMainTab.testdialog.title")); //$NON-NLS-1$
-		dialog.setMessage(JUnitMessages.getString("JUnitMainTab.testdialog.message")); //$NON-NLS-1$
-		if (dialog.open() == Window.CANCEL) {
-			return;
-		}
-		
-		Object[] results = dialog.getResult();
-		if ((results == null) || (results.length < 1)) {
-			return;
-		}		
-		IType type = (IType)results[0];
-		
-		if (type != null) {
-			fTestText.setText(type.getFullyQualifiedName());
-			javaProject = type.getJavaProject();
-			fProjText.setText(javaProject.getElementName());
-		}
-	}
-		
-	/**
-	 * Show a dialog that lets the user select a project.  This in turn provides
-	 * context for the main type, allowing the user to key a main type name, or
-	 * constraining the search for main types to the specified project.
-	 */
-	protected void handleProjectButtonSelected() {
-		IJavaProject project = chooseJavaProject();
-		if (project == null) {
-			return;
-		}
-		
-		String projectName = project.getElementName();
-		fProjText.setText(projectName);		
-	}
-	
-	/**
-	 * Realize a Java Project selection dialog and return the first selected project,
-	 * or null if there was none.
-	 */
-	protected IJavaProject chooseJavaProject() {
-		IJavaProject[] projects;
-		try {
-			projects= JavaCore.create(getWorkspaceRoot()).getJavaProjects();
-		} catch (JavaModelException e) {
-			JUnitPlugin.log(e.getStatus());
-			projects= new IJavaProject[0];
-		}
-		
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setTitle(JUnitMessages.getString("JUnitMainTab.projectdialog.title")); //$NON-NLS-1$
-		dialog.setMessage(JUnitMessages.getString("JUnitMainTab.projectdialog.message")); //$NON-NLS-1$
-		dialog.setElements(projects);
-		
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject != null) {
-			dialog.setInitialSelections(new Object[] { javaProject });
-		}
-		if (dialog.open() == Window.OK) {			
-			return (IJavaProject) dialog.getFirstResult();
-		}			
-		return null;		
-	}
-	
-	/**
-	 * Return the IJavaProject corresponding to the project name in the project name
-	 * text field, or null if the text does not match a project name.
-	 */
-	protected IJavaProject getJavaProject() {
-		String projectName = fProjText.getText().trim();
-		if (projectName.length() < 1) {
-			return null;
-		}
-		return getJavaModel().getJavaProject(projectName);		
-	}
-	
-	/**
-	 * Convenience method to get the workspace root.
-	 */
-	private IWorkspaceRoot getWorkspaceRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-	
-	/**
-	 * Convenience method to get access to the java model.
-	 */
-	private IJavaModel getJavaModel() {
-		return JavaCore.create(getWorkspaceRoot());
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {		
-		return getErrorMessage() == null;
-	}
-	
-	private void testModeChanged() {
-		boolean isSingleTestMode= fTestRadioButton.getSelection();
-		setEnableSingleTestGroup(isSingleTestMode);
-		setEnableContainerTestGroup(!isSingleTestMode);
-		if (!isSingleTestMode && fContainerText.getText().length() == 0) {
-			IJavaProject javaProject= getJavaModel().getJavaProject(fProjText.getText());
-			if (javaProject != null && javaProject.exists())
-				setContainerElement(javaProject);
-		}
-		validatePage();
-		updateLaunchConfigurationDialog();
-	}
-
-	private void validatePage() {
-		setErrorMessage(null);
-		setMessage(null);
-		
-		if (fTestContainerRadioButton.getSelection()) {
-			if (fContainerElement == null)
-				setErrorMessage(JUnitMessages.getString("JUnitMainTab.error.noContainer")); //$NON-NLS-1$
-			return;
-		} 
-		
-		String projectName = fProjText.getText().trim();
-		if (projectName.length() == 0) {
-			setErrorMessage(JUnitMessages.getString("JUnitMainTab.error.projectnotdefined")); //$NON-NLS-1$
-			return;
-		}
-			
-		IProject project = getWorkspaceRoot().getProject(projectName);
-		if (!project.exists()) {
-			setErrorMessage(JUnitMessages.getString("JUnitMainTab.error.projectnotexists")); //$NON-NLS-1$
-			return;
-		}
-		
-		try {
-			if (!project.hasNature(JavaCore.NATURE_ID)) {
-				setErrorMessage(JUnitMessages.getString("JUnitMainTab.error.notJavaProject")); //$NON-NLS-1$
-				return;
-			}
-			IJavaProject jProject = getJavaProject();
-			String className = fTestText.getText().trim();
-			if (className.length() == 0) {
-				setErrorMessage(JUnitMessages.getString("JUnitMainTab.error.testnotdefined")); //$NON-NLS-1$
-				return;
-			}
-		} catch (Exception e) {
-		}
-	}
-
-	private void setEnableContainerTestGroup(boolean enabled) {
-		fContainerSearchButton.setEnabled(enabled);
-		fContainerText.setEnabled(enabled);
-	}
-
-	private void setEnableSingleTestGroup(boolean enabled) {
-		fProjLabel.setEnabled(enabled);
-		fProjText.setEnabled(enabled);
-		fProjButton.setEnabled(enabled);
-		fTestLabel.setEnabled(enabled);
-		fTestText.setEnabled(enabled);
-		fSearchButton.setEnabled(enabled && fProjText.getText().length() > 0);
-		fTestMethodLabel.setEnabled(enabled);
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		IJavaElement javaElement = getContext();
-		if (javaElement != null) {
-			initializeJavaProject(javaElement, config);
-		} else {
-			// We set empty attributes for project & main type so that when one config is
-			// compared to another, the existence of empty attributes doesn't cause an
-			// incorrect result (the performApply() method can result in empty values
-			// for these attributes being set on a config if there is nothing in the
-			// corresponding text boxes)
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
-			config.setAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, ""); //$NON-NLS-1$
-		}
-		initializeTestAttributes(javaElement, config);
-	}
-
-	private void initializeTestAttributes(IJavaElement javaElement, ILaunchConfigurationWorkingCopy config) {
-		if (javaElement != null && javaElement.getElementType() < IJavaElement.COMPILATION_UNIT) 
-			initializeTestContainer(javaElement, config);
-		else
-			initializeTestType(javaElement, config);
-	}
-
-	private void initializeTestContainer(IJavaElement javaElement, ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, javaElement.getHandleIdentifier());
-		initializeName(config, javaElement.getElementName());
-	}
-
-	private void initializeName(ILaunchConfigurationWorkingCopy config, String name) {
-		if (name == null) {
-			name= ""; //$NON-NLS-1$
-		}
-		if (name.length() > 0) {
-			int index = name.lastIndexOf('.');
-			if (index > 0) {
-				name = name.substring(index + 1);
-			}
-			name= getLaunchConfigurationDialog().generateName(name);
-			config.rename(name);
-		}
-	}
-
-	/**
-	 * Set the main type & name attributes on the working copy based on the IJavaElement
-	 */
-	protected void initializeTestType(IJavaElement javaElement, ILaunchConfigurationWorkingCopy config) {
-		String name= ""; //$NON-NLS-1$
-		try {
-			// we only do a search for compilation units or class files or 
-			// or source references
-			if ((javaElement instanceof ICompilationUnit) || 
-				(javaElement instanceof ISourceReference) ||
-				(javaElement instanceof IClassFile)) {
-		
-				IType[] types = TestSearchEngine.findTests(new Object[] {javaElement});
-				if ((types == null) || (types.length < 1)) {
-					return;
-				}
-				// Simply grab the first main type found in the searched element
-				name = types[0].getFullyQualifiedName();
-			}	
-		} catch (InterruptedException ie) {
-		} catch (InvocationTargetException ite) {
-		}
-		if (name == null)
-			name= ""; //$NON-NLS-1$
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, name);
-		initializeName(config, name);
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return JUnitMessages.getString("JUnitMainTab.tab.label"); //$NON-NLS-1$
-	}
-	
-	private IJavaElement chooseContainer(IJavaElement initElement) {
-		Class[] acceptedClasses= new Class[] { IPackageFragmentRoot.class, IJavaProject.class, IPackageFragment.class };
-		TypedElementSelectionValidator validator= new TypedElementSelectionValidator(acceptedClasses, false) {
-			public boolean isSelectedValid(Object element) {
-				return true;
-			}
-		};
-		
-		acceptedClasses= new Class[] { IJavaModel.class, IPackageFragmentRoot.class, IJavaProject.class, IPackageFragment.class };
-		ViewerFilter filter= new TypedViewerFilter(acceptedClasses) {
-			public boolean select(Viewer viewer, Object parent, Object element) {
-				return super.select(viewer, parent, element);
-			}
-		};		
-
-		StandardJavaElementContentProvider provider= new StandardJavaElementContentProvider();
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT); 
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
-		dialog.setValidator(validator);
-		dialog.setSorter(new JavaElementSorter());
-		dialog.setTitle(JUnitMessages.getString("JUnitMainTab.folderdialog.title"));  //$NON-NLS-1$
-		dialog.setMessage(JUnitMessages.getString("JUnitMainTab.folderdialog.message"));  //$NON-NLS-1$
-		dialog.addFilter(filter);
-		dialog.setInput(JavaCore.create(getWorkspaceRoot()));
-		dialog.setInitialSelection(initElement);
-		dialog.setAllowMultiple(false);
-		
-		if (dialog.open() == Window.OK) {
-			Object element= dialog.getFirstResult();
-			return (IJavaElement)element;
-		}
-		return null;
-	}
-	
-	private String getPresentationName(IJavaElement element) {
-		return fJavaElementLabelProvider.getText(element);
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitTabGroup.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitTabGroup.java
deleted file mode 100644
index ff3928c..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitTabGroup.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
- 
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
- 
-public class JUnitTabGroup extends AbstractLaunchConfigurationTabGroup {
-	/**
-	 * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {		
-		ILaunchConfigurationTab[] tabs= new ILaunchConfigurationTab[] {
-			new JUnitMainTab(),
-			new JavaArgumentsTab(),
-			new JavaClasspathTab(),
-			new JavaJRETab(),
-			new SourceLookupTab(),
-			new EnvironmentTab(),
-			new CommonTab()
-		};
-		setTabs(tabs);
-	}
-
-	/**
-	 * @see ILaunchConfigurationTabGroup#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		super.setDefaults(config); 
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/ResourceExtender.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/ResourceExtender.java
deleted file mode 100644
index fd41470..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/ResourceExtender.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.internal.corext.Assert;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-
-/**
- * ResourceExtender provides propertyTester(s) for IResource types
- * for use in XML Expression Language syntax.
- */
-public class ResourceExtender extends PropertyTester {
-
-	private static final String PROPERTY_IS_TEST= "isTest";	 //$NON-NLS-1$
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.participants.properties.IPropertyEvaluator#test(java.lang.Object, java.lang.String, java.lang.String)
-	 */
-	public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
-		IResource resource= (IResource)receiver;
-		if (PROPERTY_IS_TEST.equals(method)) { //$NON-NLS-1$
-			return isJUnitTest(resource);
-		}
-		Assert.isTrue(false);
-		return false;
-	}
-	
-	/*
-	 * Return wether the target resource is a JUnit test.
-	 */
-	private boolean isJUnitTest(IResource target) {
-		if (target != null) {
-			IJavaElement element = JavaCore.create(target);
-			if (element instanceof ICompilationUnit) {
-				ICompilationUnit cu = (ICompilationUnit) element;
-				IType mainType= cu.getType(Signature.getQualifier(cu.getElementName()));
-				try {
-					return TestSearchEngine.isTestOrTestSuite(mainType);
-				} catch (JavaModelException e) {
-					return false;
-				}
-			} 
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/TestSelectionDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/TestSelectionDialog.java
deleted file mode 100644
index 03b92e5..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/TestSelectionDialog.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.launcher;
-
- 
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.TwoPaneElementSelector;
-
-/**
- * A dialog to select a test class or a test suite from a list of types.
- */
-public class TestSelectionDialog extends TwoPaneElementSelector {
-
-	private IJavaProject fProject;
-	private IType[] fTypes;
-	
-	private static class PackageRenderer extends JavaElementLabelProvider {
-		public PackageRenderer() {
-			super(JavaElementLabelProvider.SHOW_PARAMETERS | JavaElementLabelProvider.SHOW_POST_QUALIFIED | JavaElementLabelProvider.SHOW_ROOT);	
-		}
-
-		public Image getImage(Object element) {
-			return super.getImage(((IType)element).getPackageFragment());
-		}
-		
-		public String getText(Object element) {
-			return super.getText(((IType)element).getPackageFragment());
-		}
-	}
-	
-	/**
-	 * Constructor.
-	 */
-	public TestSelectionDialog(Shell shell, IJavaProject project)
-	{
-		super(shell, new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_BASICS | JavaElementLabelProvider.SHOW_OVERLAY_ICONS), 
-			new PackageRenderer());
-
-		fProject= project;
-	}
-	
-	public TestSelectionDialog(Shell shell, IType[] types) {
-		super(shell, new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_BASICS | JavaElementLabelProvider.SHOW_OVERLAY_ICONS), 
-				new PackageRenderer());
-		fTypes= types;
-	}
-
-	/**
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		//WorkbenchHelp.setHelp(newShell, new Object[] { IJavaHelpContextIds.MAINTYPE_SELECTION_DIALOG });
-	}
-
-	/*
-	 * @see Window#open()
-	 */
-	public int open() {
-		if (fTypes == null) {
-			fTypes= new IType[0];
-			try {
-				fTypes= TestSearchEngine.findTests(new Object[]{fProject});
-			} catch (InterruptedException e) {
-				return CANCEL;
-			} catch (InvocationTargetException e) {
-				JUnitPlugin.log(e.getTargetException());
-				return CANCEL;
-			}
-		}
-		
-		setElements(fTypes);
-		return super.open();
-	}
-	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/JUnitRenameParticipant.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/JUnitRenameParticipant.java
deleted file mode 100644
index a8c0095..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/JUnitRenameParticipant.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.junit.refactoring;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-
-
-public abstract class JUnitRenameParticipant extends RenameParticipant {
-
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		if (!getArguments().getUpdateReferences()) 
-			return null;	
-		
-		ILaunchManager manager= DebugPlugin.getDefault().getLaunchManager();
-		List launchConfigTypes= JUnitPlugin.getDefault().getJUnitLaunchConfigTypeIDs();
-		List changes= new ArrayList();
-		for (Iterator types= launchConfigTypes.iterator(); types.hasNext();) {
-			String typeId= (String) types.next();
-			ILaunchConfigurationType type= manager.getLaunchConfigurationType(typeId);
-			ILaunchConfiguration configs[]= manager.getLaunchConfigurations(type);
-			createChangeForConfigs(changes, configs);
-			if (pm.isCanceled())
-				throw new OperationCanceledException();
-		}
-		if (changes.size() > 0)
-			return new CompositeChange(getChangeName(), (Change[]) changes.toArray(new Change[changes.size()])); //$NON-NLS-1$
-		return null; 
-	}
-
-	protected String getChangeName() {
-		return JUnitMessages.getString("TypeRenameParticipant.change.name"); //$NON-NLS-1$
-	}
-
-	protected abstract void createChangeForConfigs(List changes, ILaunchConfiguration[] configs) throws CoreException;
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/LaunchConfigProjectChange.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/LaunchConfigProjectChange.java
deleted file mode 100644
index 858de4a..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/LaunchConfigProjectChange.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 11, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jdt.internal.junit.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-
-class LaunchConfigProjectChange extends Change { 
-
-	private ILaunchConfiguration fConfig;
-	private String fNewName;
-
-	public LaunchConfigProjectChange(ILaunchConfiguration config, String newName) {
-		fConfig= config;
-		fNewName= newName;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return fConfig.getName();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		// must be implemented to decide correct value of isValid
-	}
-
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		RefactoringStatus refactoringStatus= new RefactoringStatus();
-		if (!fConfig.exists())
-			refactoringStatus.addFatalError(JUnitMessages.getString("LaunchConfigProjectChange.configDeleted")); //$NON-NLS-1$
-		return refactoringStatus;
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.base.IChange#perform(org.eclipse.jdt.internal.corext.refactoring.base.ChangeContext, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		pm.beginTask("", 1); //$NON-NLS-1$
-		String oldProjectName= fConfig.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null);
-
-		ILaunchConfigurationWorkingCopy copy = fConfig.getWorkingCopy();
-		copy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fNewName);
-		copy.doSave();
-		pm.worked(1);
-		return new LaunchConfigProjectChange(fConfig, oldProjectName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.base.IChange#getModifiedLanguageElement()
-	 */
-	public Object getModifiedElement() {
-		return fConfig;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/LaunchConfigTypeChange.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/LaunchConfigTypeChange.java
deleted file mode 100644
index 12cb527..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/LaunchConfigTypeChange.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 11, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jdt.internal.junit.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-
-class LaunchConfigTypeChange extends Change {
-
-	private IType fType;
-	private ILaunchConfiguration fConfig;
-	private String fNewName;
-
-	public LaunchConfigTypeChange(IType type, ILaunchConfiguration config, String newName) {
-		fType= type;
-		fConfig= config;
-		fNewName= newName;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return fConfig.getName();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		// must be implemented to decide correct value of isValid
-	}
-
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		RefactoringStatus refactoringStatus= new RefactoringStatus();
-		if (!fConfig.exists())
-			refactoringStatus.addFatalError(JUnitMessages.getString("LaunchConfigTypeChange.configDeleted")); //$NON-NLS-1$
-		return refactoringStatus;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.base.IChange#perform(org.eclipse.jdt.internal.corext.refactoring.base.ChangeContext, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		pm.beginTask("", 1); //$NON-NLS-1$
-		String current= fConfig.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String)null);
-		int index= current.lastIndexOf('.');
-		String newTypeName;
-		if (index == -1) {
-			newTypeName= fNewName;
-		} else {
-			newTypeName= current.substring(0, index + 1) + fNewName;
-		}
-		ILaunchConfigurationWorkingCopy copy= fConfig.getWorkingCopy();
-		copy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, newTypeName);
-		
-		// generate the new configuration name
-		String launchConfigurationName= fConfig.getName();
-		
-		if (launchConfigurationName.equals(current)) {
-			if (!DebugPlugin.getDefault().getLaunchManager().isExistingLaunchConfigurationName(fNewName)) 
-				copy.rename(fNewName);
-		}
-		copy.doSave();
-		pm.worked(1);
-		return new LaunchConfigTypeChange(fType, fConfig, (index == -1) ? current : current.substring(index + 1));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.base.IChange#getModifiedLanguageElement()
-	 */
-	public Object getModifiedElement() {
-		return fConfig;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/ProjectRenameParticipant.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/ProjectRenameParticipant.java
deleted file mode 100644
index b85331f..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/ProjectRenameParticipant.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.junit.refactoring;
-
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-public class ProjectRenameParticipant extends JUnitRenameParticipant {
-
-	private IJavaProject fProject;
-	
-	protected boolean initialize(Object element) {
-		fProject= (IJavaProject)element;
-		return true;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return JUnitMessages.getString("TypeRenameParticipant.name");  //$NON-NLS-1$
-	}
-
-	protected void createChangeForConfigs(List changes, ILaunchConfiguration[] configs) throws CoreException {
-		for (int i= 0; i < configs.length; i++) {
-			String projectName= configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null); 
-			if (fProject.getElementName().equals(projectName)) {
-				changes.add(new LaunchConfigProjectChange(configs[i], getArguments().getNewName()));  
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/TypeRenameParticipant.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/TypeRenameParticipant.java
deleted file mode 100644
index e60b7ee..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/refactoring/TypeRenameParticipant.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.junit.refactoring;
-
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-public class TypeRenameParticipant extends JUnitRenameParticipant {
-
-	private IType fType;
-	
-	protected boolean initialize(Object element) {
-		fType= (IType)element;
-		try {
-			return TestSearchEngine.isTestOrTestSuite(fType);
-		} catch (JavaModelException e) {
-			return false;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return JUnitMessages.getString("TypeRenameParticipant.name"); //$NON-NLS-1$
-	}
-
-	protected void createChangeForConfigs(List changes, ILaunchConfiguration[] configs) throws CoreException {
-		String typeName= fType.getFullyQualifiedName();
-		for (int i= 0; i < configs.length; i++) {
-			String mainType= configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String)null);
-			if (typeName.equals(mainType)) {
-				changes.add(new LaunchConfigTypeChange(fType, configs[i], getArguments().getNewName()));
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java
deleted file mode 100644
index 1c47fbe..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java
+++ /dev/null

@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.compare.CompareConfiguration;
-import org.eclipse.compare.CompareViewerPane;
-import org.eclipse.compare.IEncodedStreamContentAccessor;
-import org.eclipse.compare.ITypedElement;
-import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
-import org.eclipse.compare.structuremergeviewer.DiffNode;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.text.presentation.IPresentationDamager;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.IPresentationRepairer;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-public class CompareResultDialog extends Dialog {
-    private static class CompareResultMergeViewer extends TextMergeViewer {
-         private CompareResultMergeViewer(Composite parent, int style, CompareConfiguration configuration) {
-             super(parent, style, configuration);
-         }
-        protected void configureTextViewer(TextViewer textViewer) {
-            if (textViewer instanceof SourceViewer) {
-                ((SourceViewer)textViewer).configure(new CompareResultViewerConfiguration());   
-            }
-        }
-    }
-    
-    public static class CompareResultViewerConfiguration extends SourceViewerConfiguration {
-        public static class SimpleDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
-            private IDocument fDocument;
-
-            public void setDocument(IDocument document) {
-                fDocument= document;
-            }
-
-            public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent event, boolean changed) {
-                return new Region(0, fDocument.getLength());
-            }
-
-            public void createPresentation(TextPresentation presentation, ITypedRegion damage) {
-                int suffix= CompareResultDialog.fgThis.fSuffix;
-                int prefix= CompareResultDialog.fgThis.fPrefix;
-                TextAttribute attr= new TextAttribute(Display.getDefault().getSystemColor(SWT.COLOR_RED), null, SWT.BOLD);
-                presentation.addStyleRange(new StyleRange(prefix, fDocument.getLength()-suffix-prefix, attr.getForeground(), attr.getBackground(), attr.getStyle()));
-            }
-        }
-        
-        public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-            PresentationReconciler reconciler= new PresentationReconciler();
-            SimpleDamagerRepairer dr= new SimpleDamagerRepairer();
-            reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
-            reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
-            return reconciler;
-        }
-    }
-        
-	private static class CompareElement implements ITypedElement, IEncodedStreamContentAccessor {
-	    private String fContent;
-	    
-	    public CompareElement(String content) {
-	        fContent= content;
-	    }
-	    public String getName() {
-	        return "<no name>"; //$NON-NLS-1$
-	    }
-	    public Image getImage() {
-	        return null;
-	    }
-	    public String getType() {
-	        return "txt"; //$NON-NLS-1$
-	    }
-	    public InputStream getContents() {
-		    try {
-		        return new ByteArrayInputStream(fContent.getBytes("UTF-8")); //$NON-NLS-1$
-		    } catch (UnsupportedEncodingException e) {
-		        return new ByteArrayInputStream(fContent.getBytes());
-		    }
-	    }
-        public String getCharset() throws CoreException {
-            return "UTF-8"; //$NON-NLS-1$
-        }
-	}
-
-    private TextMergeViewer fViewer;
-    private String fExpected;
-    private String fActual;
-    private String fTestName;
-    
-    /* workaround - to make prefix and suffix accessible to the CompareResultViewerConfiguration */
-    private static CompareResultDialog fgThis;
-    
-    private int fPrefix;
-    private int fSuffix;
-    
-    // dialog store id constants
-    private final static String DIALOG_BOUNDS_KEY= "CompareResultDialogBounds"; //$NON-NLS-1$
-    private static final String X= "x"; //$NON-NLS-1$
-    private static final String Y= "y"; //$NON-NLS-1$
-    private static final String WIDTH= "width"; //$NON-NLS-1$
-    private static final String HEIGHT= "height"; //$NON-NLS-1$
-    private IDialogSettings fSettings;
-	protected Rectangle fNewBounds;
-	
-	public CompareResultDialog(Shell parentShell, TestRunInfo failure) {
-		super(parentShell);
-		fgThis= this;
-		setShellStyle(getShellStyle() | SWT.RESIZE | SWT.MAX);
-        fTestName= failure.getTestName();
-        fExpected= failure.getExpected();
-        fActual= failure.getActual();
-        computePrefixSuffix();
-        fSettings= JUnitPlugin.getDefault().getDialogSettings();
-	}
-	
-	protected Point getInitialSize() {
-		int width= 0;
-		int height= 0;
-		
-		final Shell s= getShell();
-		if (s != null) {
-			s.addControlListener(
-					new ControlListener() {
-						public void controlMoved(ControlEvent arg) {
-							fNewBounds= s.getBounds();
-						}
-						public void controlResized(ControlEvent arg) {
-							fNewBounds= s.getBounds();
-						}
-					}
-			);
-		}
-		IDialogSettings bounds= fSettings.getSection(DIALOG_BOUNDS_KEY); 
-		if (bounds == null) {
-			return super.getInitialSize();
-		}
-		else {
-			try {
-				width= bounds.getInt(WIDTH);
-			} catch (NumberFormatException e) {
-				width= 400;
-			}
-			try {
-				height= bounds.getInt(HEIGHT);
-			} catch (NumberFormatException e) {
-				height= 300;
-			}
-		}	
-		return new Point(width, height);	
-	}
-	
-	protected Point getInitialLocation(Point initialSize) {
-		Point loc= super.getInitialLocation(initialSize);
-		
-		IDialogSettings bounds= fSettings.getSection(DIALOG_BOUNDS_KEY);
-		if (bounds != null) {
-			try {
-				loc.x= bounds.getInt(X);
-			} catch (NumberFormatException e) {
-			}
-			try {
-				loc.y= bounds.getInt(Y);
-			} catch (NumberFormatException e) {
-			}
-		}
-		return loc;
-	}
-	
-	public boolean close() {
-		boolean closed= super.close();
-		if (closed && fNewBounds != null)
-			saveBounds(fNewBounds);
-		return closed;
-	}
-
-	private void saveBounds(Rectangle bounds) {
-		IDialogSettings dialogBounds= fSettings.getSection(DIALOG_BOUNDS_KEY);
-		if (dialogBounds == null) {
-			dialogBounds= new DialogSettings(DIALOG_BOUNDS_KEY);
-			fSettings.addSection(dialogBounds);
-		}
-		dialogBounds.put(X, bounds.x);
-		dialogBounds.put(Y, bounds.y);
-		dialogBounds.put(WIDTH, bounds.width);
-		dialogBounds.put(HEIGHT, bounds.height);
-	}
-	
-	private void computePrefixSuffix() {
-		int end= Math.min(fExpected.length(), fActual.length());
-		int i= 0;
-		for(; i < end; i++) 
-			if (fExpected.charAt(i) != fActual.charAt(i))
-				break;
-		fPrefix= i;
-		
-		int j= fExpected.length()-1;
-		int k= fActual.length()-1;
-		int l= 0;
-		for (; k >= fPrefix && j >= fPrefix; k--,j--) {
-			if (fExpected.charAt(j) != fActual.charAt(k))
-				break;
-			l++;
-		}
-		fSuffix= l;
-	}
-
-    protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(JUnitMessages.getString("CompareResultDialog.title")); //$NON-NLS-1$
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, JUnitMessages.getString("CompareResultDialog.labelOK"), true); //$NON-NLS-1$
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite)super.createDialogArea(parent);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 1;
-		composite.setLayout(layout);
-		
-		CompareViewerPane pane = new CompareViewerPane(composite, SWT.BORDER | SWT.FLAT);
-		pane.setText(fTestName);
-		GridData data= new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-		data.widthHint= convertWidthInCharsToPixels(120);
-		data.heightHint= convertHeightInCharsToPixels(13);
-		pane.setLayoutData(data);
-		
-		Control previewer= createPreviewer(pane);
-		pane.setContent(previewer);
-		GridData gd= new GridData(GridData.FILL_BOTH);
-		previewer.setLayoutData(gd);
-		applyDialogFont(parent);
-		return composite;
-	}
-	
-	private Control createPreviewer(Composite parent) {
-	    final CompareConfiguration compareConfiguration= new CompareConfiguration();
-	    compareConfiguration.setLeftLabel(JUnitMessages.getString("CompareResultDialog.expectedLabel")); //$NON-NLS-1$
-	    compareConfiguration.setLeftEditable(false);
-	    compareConfiguration.setRightLabel(JUnitMessages.getString("CompareResultDialog.actualLabel"));	 //$NON-NLS-1$
-	    compareConfiguration.setRightEditable(false);
-	    compareConfiguration.setProperty(CompareConfiguration.IGNORE_WHITESPACE, Boolean.FALSE);
-
-	    fViewer= new CompareResultMergeViewer(parent, SWT.NONE, compareConfiguration);
-	    fViewer.setInput(new DiffNode( 
-        new CompareElement(fExpected), 
-        new CompareElement(fActual)));
-
-	    Control control= fViewer.getControl();
-	    control.addDisposeListener(new DisposeListener() {
-	        public void widgetDisposed(DisposeEvent e) {
-	            if (compareConfiguration != null)
-	                compareConfiguration.dispose();
-	        }
-	    });
-	    return  control;
-	}	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultsAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultsAction.java
deleted file mode 100644
index aca9c0c..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultsAction.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-
-import org.eclipse.jface.action.Action;
-
-/**
- * Action to enable/disable stack trace filtering.
- */
-public class CompareResultsAction extends Action {
-
-	private FailureTrace fView;	
-	
-	public CompareResultsAction(FailureTrace view) {
-		super(JUnitMessages.getString("CompareResultsAction.label"));   //$NON-NLS-1$
-		setDescription(JUnitMessages.getString("CompareResultsAction.description"));   //$NON-NLS-1$
-		setToolTipText(JUnitMessages.getString("CompareResultsAction.tooltip"));  //$NON-NLS-1$
-		
-		setDisabledImageDescriptor(JUnitPlugin.getImageDescriptor("dlcl16/compare.gif"));  //$NON-NLS-1$
-		setHoverImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/compare.gif"));  //$NON-NLS-1$
-		setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/compare.gif"));  //$NON-NLS-1$
-		//WorkbenchHelp.setHelp(this, IJUnitHelpContextIds.ENABLEFILTER_ACTION);
-		fView= view;
-	}
-
-	/*
-	 * @see Action#actionPerformed
-	 */		
-	public void run() {
-		CompareResultDialog dialog= new CompareResultDialog(fView.getShell(), fView.getFailedTest());
-		dialog.create();
-		dialog.open();
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CopyFailureListAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CopyFailureListAction.java
deleted file mode 100644
index 2fbf592..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CopyFailureListAction.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-/**
- * Copies the names of the methods that failed to the clipboard.
- */
-public class CopyFailureListAction extends Action {
-	private FailureTab fView;
-	
-	private final Clipboard fClipboard;
-		
-	/**
-	 * Constructor for CopyFailureListAction.
-	 */
-	public CopyFailureListAction(TestRunnerViewPart runner, FailureTab view, Clipboard clipboard) {
-		super(JUnitMessages.getString("CopyFailureList.action.label"));  //$NON-NLS-1$
-		WorkbenchHelp.setHelp(this, IJUnitHelpContextIds.COPYFAILURELIST_ACTION);
-		fView= view;
-		fClipboard= clipboard;
-	}
-
-	/*
-	 * @see IAction#run()
-	 */
-	public void run() {
-		TextTransfer plainTextTransfer = TextTransfer.getInstance();
-					
-		try{
-			fClipboard.setContents(
-				new String[] { fView.getAllFailedTestNames() }, 
-				new Transfer[]{ plainTextTransfer });
-		}  catch (SWTError e){
-			if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD) 
-				throw e;
-			if (MessageDialog.openQuestion(JavaPlugin.getActiveWorkbenchShell(), JUnitMessages.getString("CopyFailureList.problem"), JUnitMessages.getString("CopyFailureList.clipboard_busy")))  //$NON-NLS-1$ //$NON-NLS-2$
-				run();
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CopyTraceAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CopyTraceAction.java
deleted file mode 100644
index b49a234..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CopyTraceAction.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.util.Assert;
-
-/**
- * Copies a test failure stack trace to the clipboard.
- */
-public class CopyTraceAction extends Action {
-	private FailureTrace fView;
-	
-	private final Clipboard fClipboard;
-
-	/**
-	 * Constructor for CopyTraceAction.
-	 */
-	public CopyTraceAction(FailureTrace view, Clipboard clipboard) {
-		super(JUnitMessages.getString("CopyTrace.action.label"));  //$NON-NLS-1$
-		Assert.isNotNull(clipboard);
-		WorkbenchHelp.setHelp(this, IJUnitHelpContextIds.COPYTRACE_ACTION);
-		fView= view;
-		fClipboard= clipboard;
-	}
-
-	/*
-	 * @see IAction#run()
-	 */
-	public void run() {
-		String trace= fView.getTrace();
-		if (trace == null)
-			trace= ""; //$NON-NLS-1$
-		
-		TextTransfer plainTextTransfer = TextTransfer.getInstance();
-		try{
-			fClipboard.setContents(
-				new String[]{ convertLineTerminators(trace) }, 
-				new Transfer[]{ plainTextTransfer });
-		}  catch (SWTError e){
-			if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD) 
-				throw e;
-			if (MessageDialog.openQuestion(fView.getComposite().getShell(), JUnitMessages.getString("CopyTraceAction.problem"), JUnitMessages.getString("CopyTraceAction.clipboard_busy")))  //$NON-NLS-1$ //$NON-NLS-2$
-				run();
-		}
-	}
-	
-	private String convertLineTerminators(String in) {
-		StringWriter stringWriter= new StringWriter();
-		PrintWriter printWriter= new PrintWriter(stringWriter);
-		StringReader stringReader= new StringReader(in);
-		BufferedReader bufferedReader= new BufferedReader(stringReader);		
-		String line;
-		try {
-			while ((line= bufferedReader.readLine()) != null) {
-				printWriter.println(line);
-			}
-		} catch (IOException e) {
-			return in; // return the trace unfiltered
-		}
-		return stringWriter.toString();
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CounterPanel.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CounterPanel.java
deleted file mode 100644
index e76af69..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CounterPanel.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A panel with counters for the number of Runs, Errors and Failures.
- */
-public class CounterPanel extends Composite {
-	protected Text fNumberOfErrors;
-	protected Text fNumberOfFailures;
-	protected Text fNumberOfRuns;
-	protected int fTotal;
-	
-	private final Image fErrorIcon= TestRunnerViewPart.createImage("ovr16/error_ovr.gif"); //$NON-NLS-1$
-	private final Image fFailureIcon= TestRunnerViewPart.createImage("ovr16/failed_ovr.gif"); //$NON-NLS-1$
-			
-	public CounterPanel(Composite parent) {
-		super(parent, SWT.WRAP);
-		GridLayout gridLayout= new GridLayout();
-		gridLayout.numColumns= 9;
-		gridLayout.makeColumnsEqualWidth= false;
-		gridLayout.marginWidth= 0;
-		setLayout(gridLayout);
-		
-		fNumberOfRuns= createLabel(JUnitMessages.getString("CounterPanel.label.runs"), null, " 0/0  ");  //$NON-NLS-1$ //$NON-NLS-2$
-		fNumberOfErrors= createLabel(JUnitMessages.getString("CounterPanel.label.errors"), fErrorIcon, " 0 "); //$NON-NLS-1$ //$NON-NLS-2$
-		fNumberOfFailures= createLabel(JUnitMessages.getString("CounterPanel.label.failures"), fFailureIcon, " 0 "); //$NON-NLS-1$ //$NON-NLS-2$
-
-		addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				disposeIcons();
-			}
-		});
-	}
- 
-	private void disposeIcons() {
-		fErrorIcon.dispose();
-		fFailureIcon.dispose();
-	}
-
-	private Text createLabel(String name, Image image, String init) {
-		Label label= new Label(this, SWT.NONE);
-		if (image != null) {
-			image.setBackground(label.getBackground());
-			label.setImage(image);
-		}
-		label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		
-		label= new Label(this, SWT.NONE);
-		label.setText(name);
-		label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		label.setFont(JFaceResources.getBannerFont());
-		
-		Text value= new Text(this, SWT.READ_ONLY);
-		value.setText(init);
-		// bug: 39661 Junit test counters do not repaint correctly [JUnit] 
-		value.setBackground(getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-		value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-		return value;
-	}
-
-	public void reset() {
-		setErrorValue(0);
-		setFailureValue(0);
-		setRunValue(0);
-		fTotal= 0;
-	}
-	
-	public void setTotal(int value) {
-		fTotal= value;
-	}
-	
-	public int getTotal(){
-		return fTotal;
-	}
-	
-	public void setRunValue(int value) {
-		String runString= JUnitMessages.getFormattedString("CounterPanel.runcount", new String[] { Integer.toString(value), Integer.toString(fTotal) }); //$NON-NLS-1$
-		fNumberOfRuns.setText(runString);
-
-		fNumberOfRuns.redraw();
-		redraw();
-	}
-	
-	public void setErrorValue(int value) {
-		fNumberOfErrors.setText(Integer.toString(value));
-		redraw();
-	}
-	
-	public void setFailureValue(int value) {
-		fNumberOfFailures.setText(Integer.toString(value));
-		redraw();
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/EnableStackFilterAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/EnableStackFilterAction.java
deleted file mode 100644
index e696bc9..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/EnableStackFilterAction.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Action to enable/disable stack trace filtering.
- */
-public class EnableStackFilterAction extends Action {
-
-	private FailureTrace fView;	
-	
-	public EnableStackFilterAction(FailureTrace view) {
-		super(JUnitMessages.getString("EnableStackFilterAction.action.label"));  //$NON-NLS-1$
-		setDescription(JUnitMessages.getString("EnableStackFilterAction.action.description"));  //$NON-NLS-1$
-		setToolTipText(JUnitMessages.getString("EnableStackFilterAction.action.tooltip")); //$NON-NLS-1$
-		
-		setDisabledImageDescriptor(JUnitPlugin.getImageDescriptor("dlcl16/cfilter.gif")); //$NON-NLS-1$
-		setHoverImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/cfilter.gif")); //$NON-NLS-1$
-		setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/cfilter.gif")); //$NON-NLS-1$
-		WorkbenchHelp.setHelp(this, IJUnitHelpContextIds.ENABLEFILTER_ACTION);
-
-		fView= view;
-		setChecked(JUnitPreferencePage.getFilterStack());
-	}
-
-	/*
-	 * @see Action#actionPerformed
-	 */		
-	public void run() {
-		JUnitPreferencePage.setFilterStack(isChecked());
-		fView.refresh();
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTab.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTab.java
deleted file mode 100644
index a3ce89b..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTab.java
+++ /dev/null

@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.junit.ITestRunListener;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-
-/**
- * A tab presenting the failed tests in a table.
- */
-public class FailureTab extends TestRunTab implements IMenuListener {
-	private Table fTable;
-	private TestRunnerViewPart fRunnerViewPart;
-	private Clipboard fClipboard;	
-	private boolean fMoveSelection= false;
-	
-	private final Image fErrorIcon= TestRunnerViewPart.createImage("obj16/testerr.gif"); //$NON-NLS-1$
-	private final Image fFailureIcon= TestRunnerViewPart.createImage("obj16/testfail.gif"); //$NON-NLS-1$
-	private final Image fFailureTabIcon= TestRunnerViewPart.createImage("obj16/failures.gif"); //$NON-NLS-1$
-
-	public FailureTab() {
-	}
-
-	public void createTabControl(CTabFolder tabFolder, Clipboard clipboard, TestRunnerViewPart runner) {
-		fRunnerViewPart= runner;
-		fClipboard= clipboard;
-		
-		CTabItem failureTab= new CTabItem(tabFolder, SWT.NONE);
-		failureTab.setText(getName());
-		failureTab.setImage(fFailureTabIcon);
-
-		Composite composite= new Composite(tabFolder, SWT.NONE);
-		GridLayout gridLayout= new GridLayout();
-		gridLayout.marginHeight= 0;
-		gridLayout.marginWidth= 0;
-		composite.setLayout(gridLayout);
-		
-		GridData gridData= new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		composite.setLayoutData(gridData);	
-			
-		fTable= new Table(composite, SWT.NONE);
-		gridLayout= new GridLayout();
-		gridLayout.marginHeight= 0;
-		gridLayout.marginWidth= 0;
-		fTable.setLayout(gridLayout);
-		
-		gridData= new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		fTable.setLayoutData(gridData);
-		
-		failureTab.setControl(composite);
-		failureTab.setToolTipText(JUnitMessages.getString("FailureRunView.tab.tooltip")); //$NON-NLS-1$
-		
-		initMenu();
-		addListeners();
-	}
-
-	private void disposeIcons() {
-		fErrorIcon.dispose();
-		fFailureIcon.dispose();
-		fFailureTabIcon.dispose();
-	}
-
-	private void initMenu() {
-		MenuManager menuMgr= new MenuManager();
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(this);
-		Menu menu= menuMgr.createContextMenu(fTable);
-		fTable.setMenu(menu);
-	}
-	
-	public String getName() {
-		return JUnitMessages.getString("FailureRunView.tab.title"); //$NON-NLS-1$
-	}
-	
-	public String getSelectedTestId() {
-		int index= fTable.getSelectionIndex();
-		if (index == -1)
-			return null;
-		return getTestInfo(fTable.getItem(index)).getTestId();
-	}
-	
-	public String getAllFailedTestNames() {
-		StringBuffer trace= new StringBuffer();
-		String lineDelim= System.getProperty("line.separator", "\n");  //$NON-NLS-1$//$NON-NLS-2$
-		for (int i= 0; i < fTable.getItemCount(); i++) {
-			TestRunInfo testInfo= getTestInfo(fTable.getItem(i));
-			trace.append(testInfo.getTestName()).append(lineDelim);
-			String failureTrace= testInfo.getTrace();
-			if (failureTrace != null) {
-				StringReader stringReader= new StringReader(failureTrace);
-				BufferedReader bufferedReader= new BufferedReader(stringReader);
-				String line;
-				try {
-					while ((line= bufferedReader.readLine()) != null) 
-						trace.append(line+lineDelim);
-				} catch (IOException e) {
-					trace.append(lineDelim);
-				}	
-			}
-		}
-		return trace.toString();
-	}
-	
-	private String getClassName() {
-		TableItem item= getSelectedItem();
-		TestRunInfo info= getTestInfo(item);
-		return info.getClassName();
-	}
-	
-	private String getMethodName() {
-		TableItem item= getSelectedItem();
-		TestRunInfo info= getTestInfo(item);
-		return info.getTestMethodName();
-	}
-	
-	public void menuAboutToShow(IMenuManager manager){
-		if (fTable.getSelectionCount() > 0) {
-			String className= getClassName();
-			String methodName= getMethodName();
-			if (className != null) {
-				manager.add(new OpenTestAction(fRunnerViewPart, className, methodName));
-				manager.add(new Separator());
-				manager.add(new RerunAction(fRunnerViewPart, getSelectedTestId(), className, methodName, ILaunchManager.RUN_MODE));
-				if (!fRunnerViewPart.lastLaunchIsKeptAlive()) 
-					manager.add(new RerunAction(fRunnerViewPart, getSelectedTestId(), className, methodName, ILaunchManager.DEBUG_MODE));
-				manager.add(new Separator());
-				manager.add(new CopyFailureListAction(fRunnerViewPart, FailureTab.this, fClipboard));
-			}
-		}
-	}		
-	
-	private TableItem getSelectedItem() {
-		int index= fTable.getSelectionIndex();
-		if (index == -1)
-			return null;
-		return fTable.getItem(index);
-	}
-		
-	public void setSelectedTest(String testId){
-		TableItem[] items= fTable.getItems();
-		for (int i= 0; i < items.length; i++) {
-			TableItem tableItem= items[i];
-			TestRunInfo info= getTestInfo(tableItem);		
-			if (info.getTestId().equals(testId)){
-				fTable.setSelection(new TableItem[] { tableItem });
-				fTable.showItem(tableItem);
-				return;
-			}
-		}
-	}
-
-	private TestRunInfo getTestInfo(TableItem item) {
-		return (TestRunInfo)item.getData(); 	
-	}
-	
-	public void setFocus() {
-		fTable.setFocus();
-	}
-	
-	public void endTest(String testId){
-		TestRunInfo testInfo= fRunnerViewPart.getTestInfo(testId);
-		if(testInfo == null || testInfo.getStatus() == ITestRunListener.STATUS_OK) 
-			return;
-
-		TableItem tableItem= new TableItem(fTable, SWT.NONE);
-		updateTableItem(testInfo, tableItem);
-		fTable.showItem(tableItem);
-	}
-
-	private void updateTableItem(TestRunInfo testInfo, TableItem tableItem) {
-		String label= JUnitMessages.getFormattedString("FailureRunView.labelfmt", new String[] { testInfo.getTestMethodName(), testInfo.getClassName() }); //$NON-NLS-1$
-		tableItem.setText(label);
-		if (testInfo.getStatus() == ITestRunListener.STATUS_FAILURE)
-			tableItem.setImage(fFailureIcon);
-		else
-			tableItem.setImage(fErrorIcon);
-		tableItem.setData(testInfo);
-	}
-
-	private TableItem findItem(String testId) {
-		TableItem[] items= fTable.getItems();
-		for (int i= 0; i < items.length; i++) {
-			TestRunInfo info= getTestInfo(items[i]);
-			if (info.getTestId().equals(testId))
-				return items[i];
-		}
-		return null;
-	}
-
-	public void activate() {
-		fMoveSelection= false;
-		testSelected();
-	}
-
-	public void aboutToStart() {
-		fMoveSelection= false;
-		fTable.removeAll();
-	}
-
-	private void testSelected() {
-		fRunnerViewPart.handleTestSelected(getSelectedTestId());
-	}
-	
-	private void addListeners() {
-		fTable.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				activate();
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-				activate();
-			}
-		});
-		
-		fTable.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				disposeIcons();
-			}
-		});
-
-		fTable.addMouseListener(new MouseAdapter() {
-			public void mouseDoubleClick(MouseEvent e){
-				handleDoubleClick(e);
-			}
-			public void mouseDown(MouseEvent e) {
-				activate();
-			}
-			public void mouseUp(MouseEvent e) {
-				activate();
-			}
-		});
-	}
-	
-	void handleDoubleClick(MouseEvent e) {
-		if (fTable.getSelectionCount() > 0) 
-			new OpenTestAction(fRunnerViewPart, getClassName(), getMethodName()).run();
-	}
-	
-	/*
-	 * @see ITestRunView#testStatusChanged(TestRunInfo)
-	 */
-	public void testStatusChanged(TestRunInfo info) {
-		TableItem item= findItem(info.getTestId());
-		if (item != null) {
-			if (info.getStatus() == ITestRunListener.STATUS_OK) {
-				item.dispose();
-				return;
-			}
-			updateTableItem(info, item);
-		} 
-		if (item == null && info.getStatus() != ITestRunListener.STATUS_OK) {
-			item= new TableItem(fTable, SWT.NONE);
-			updateTableItem(info, item);
-		}
-		if (item != null)
-			fTable.showItem(item);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.junit.ui.ITestRunView#selectNext()
-	 */
-	public void selectNext() {
-		if (fTable.getItemCount() == 0)
-			return;
-			
-		int index= fTable.getSelectionIndex();
-		if (index == -1)
-			index= 0;
-		
-		if (fMoveSelection)
-			index= Math.min(fTable.getItemCount()-1, index+1);
-		else
-			fMoveSelection= true;
-			
-		selectTest(index);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.junit.ui.ITestRunView#selectPrevious()
-	 */
-	public void selectPrevious() {
-		if (fTable.getItemCount() == 0)
-			return;
-			
-		int index= fTable.getSelectionIndex();
-		if (index == -1)
-			index= fTable.getItemCount()-1;
-			
-		if (fMoveSelection)
-			index= Math.max(0, index-1);
-		else
-			fMoveSelection= true;
-			
-		selectTest(index);
-	}
-
-	private void selectTest(int index) {
-		TableItem item= fTable.getItem(index);
-		TestRunInfo info= getTestInfo(item);
-		fRunnerViewPart.showTest(info);
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java
deleted file mode 100644
index a7e531b..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java
+++ /dev/null

@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids: sdavids@gmx.de bug 37333, 26653 
- *     Johan Walles: walles@mailblocks.com bug 68737
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.ToolBar;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.util.IOpenEventListener;
-import org.eclipse.jface.util.OpenStrategy;
-
-/**
- * A pane that shows a stack trace of a failed test.
- */
-class FailureTrace implements IMenuListener {
-    private final Image fStackIcon= TestRunnerViewPart.createImage("obj16/stkfrm_obj.gif"); //$NON-NLS-1$
-    private final Image fExceptionIcon= TestRunnerViewPart.createImage("obj16/exc_catch.gif"); //$NON-NLS-1$
-    
-    private static final String FRAME_PREFIX= "at "; //$NON-NLS-1$
-	private Table fTable;
-	private TestRunnerViewPart fTestRunner;
-	private String fInputTrace;
-	private final Clipboard fClipboard;
-    private TestRunInfo fFailure;
-    private CompareResultsAction fCompareAction;
-    
-
-	public FailureTrace(Composite parent, Clipboard clipboard, TestRunnerViewPart testRunner, ToolBar toolBar) {
-		Assert.isNotNull(clipboard);
-		
-		// fill the failure trace viewer toolbar
-		ToolBarManager failureToolBarmanager= new ToolBarManager(toolBar);
-		failureToolBarmanager.add(new EnableStackFilterAction(this));			
-		fCompareAction = new CompareResultsAction(this);
-		fCompareAction.setEnabled(false);
-        failureToolBarmanager.add(fCompareAction);			
-		failureToolBarmanager.update(true);
-		
-		fTable= new Table(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL);
-		fTestRunner= testRunner;
-		fClipboard= clipboard;
-		
-		OpenStrategy handler = new OpenStrategy(fTable);
-		handler.addOpenListener(new IOpenEventListener() {
-			public void handleOpen(SelectionEvent e) {
-				if (fTable.getSelectionIndex() == 0 && fFailure.isComparisonFailure()) {
-					(new CompareResultsAction(FailureTrace.this)).run();
-				}
-				if (fTable.getSelection().length != 0) {
-					Action a = createOpenEditorAction(getSelectedText());
-					if (a != null)
-						a.run();
-				}
-			}
-		});
-		
-		initMenu();
-		
-		parent.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				disposeIcons();
-			}
-		});
-	}
-	
-	private void initMenu() {
-		MenuManager menuMgr= new MenuManager();
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(this);
-		Menu menu= menuMgr.createContextMenu(fTable);
-		fTable.setMenu(menu);		
-	}
-	
-	public void menuAboutToShow(IMenuManager manager) {
-		if (fTable.getSelectionCount() > 0) {
-			Action a= createOpenEditorAction(getSelectedText());
-			if (a != null)
-				manager.add(a);		
-			manager.add(new CopyTraceAction(FailureTrace.this, fClipboard));
-		}
-		// fix for bug 68058
-		if (fFailure != null && fFailure.isComparisonFailure()) 
-			manager.add(new CompareResultsAction(FailureTrace.this));
-	}
-
-	public String getTrace() {
-		return fInputTrace;
-	}
-	
-	private String getSelectedText() {
-		return fTable.getSelection()[0].getText();
-	}				
-
-	private Action createOpenEditorAction(String traceLine) {
-		try { 
-			String testName= traceLine;
-			testName= testName.substring(testName.indexOf(FRAME_PREFIX)); //$NON-NLS-1$
-			testName= testName.substring(FRAME_PREFIX.length(), testName.lastIndexOf('(')).trim();
-			testName= testName.substring(0, testName.lastIndexOf('.'));
-			int innerSeparatorIndex= testName.indexOf('$');
-			if (innerSeparatorIndex != -1)
-				testName= testName.substring(0, innerSeparatorIndex);
-			
-			String lineNumber= traceLine;
-			lineNumber= lineNumber.substring(lineNumber.indexOf(':') + 1, lineNumber.lastIndexOf(')'));
-			int line= Integer.valueOf(lineNumber).intValue();
-			//fix for bug 37333	
-			String cuName= traceLine.substring(traceLine.lastIndexOf('(') + 1, traceLine.lastIndexOf(':'));
-			return new OpenEditorAtLineAction(fTestRunner, cuName, testName, line);
-		} catch(NumberFormatException e) {
-		}
-		catch(IndexOutOfBoundsException e) {	
-		}	
-		return null;
-	}
-	
-	private void disposeIcons(){
-		if (fExceptionIcon != null && !fExceptionIcon.isDisposed()) 
-			fExceptionIcon.dispose();
-		if (fStackIcon != null && !fStackIcon.isDisposed()) 
-			fStackIcon.dispose();
-	}
-	
-	/**
-	 * Returns the composite used to present the trace
-	 */
-	Composite getComposite(){
-		return fTable;
-	}
-	
-	/**
-	 * Refresh the table from the the trace.
-	 */
-	public void refresh() {
-		updateTable(fInputTrace);
-	}
-	
-	/**
-	 * Shows a TestFailure
-	 * @param failure the failed test
-	 */
-	public void showFailure(TestRunInfo failure) {	
-	    fFailure= failure;
-	    String trace= ""; //$NON-NLS-1$
-	    updateEnablement(failure);
-	    if (failure != null) 
-	        trace= failure.getTrace();
-		if (fInputTrace == trace)
-			return;
-		fInputTrace= trace;
-		updateTable(trace);
-	}
-
-	public void updateEnablement(TestRunInfo failure) {
-		fCompareAction.setEnabled(failure != null && failure.isComparisonFailure());
-	}
-
-	private void updateTable(String trace) {
-		if(trace == null || trace.trim().equals("")) { //$NON-NLS-1$
-			clear();
-			return;
-		}
-		trace= trace.trim();
-		fTable.setRedraw(false);
-		fTable.removeAll();
-		fillTable(filterStack(trace));
-		fTable.setRedraw(true);
-	}
-
-	private void fillTable(String trace) {
-		StringReader stringReader= new StringReader(trace);
-		BufferedReader bufferedReader= new BufferedReader(stringReader);
-		String line;
-
-		try {	
-			// first line contains the thrown exception
-			line= bufferedReader.readLine();
-			if (line == null)
-				return;
-				
-			TableItem tableItem= new TableItem(fTable, SWT.NONE);
-			String itemLabel= line.replace('\t', ' ');
-			tableItem.setText(itemLabel);
-			tableItem.setImage(fExceptionIcon);
-			
-			// the stack frames of the trace
-			while ((line= bufferedReader.readLine()) != null) {
-				itemLabel= line.replace('\t', ' ');
-				tableItem= new TableItem(fTable, SWT.NONE);
-				// heuristic for detecting a stack frame - works for JDK
-				if ((itemLabel.indexOf(" at ") >= 0)) { //$NON-NLS-1$
-					tableItem.setImage(fStackIcon);
-				}
-				tableItem.setText(itemLabel);
-			}
-		} catch (IOException e) {
-			TableItem tableItem= new TableItem(fTable, SWT.NONE);
-			tableItem.setText(trace);
-		}			
-	}
-	
-	/**
-	 * Shows other information than a stack trace.
-	 * @param text the informational message to be shown
-	 */
-	public void setInformation(String text) {
-		clear();
-		TableItem tableItem= new TableItem(fTable, SWT.NONE);
-		tableItem.setText(text);
-	}
-	
-	/**
-	 * Clears the non-stack trace info
-	 */
-	public void clear() {
-		fTable.removeAll();
-		fInputTrace= null;
-	}
-	
-	private String filterStack(String stackTrace) {	
-		if (!JUnitPreferencePage.getFilterStack() || stackTrace == null) 
-			return stackTrace;
-			
-		StringWriter stringWriter= new StringWriter();
-		PrintWriter printWriter= new PrintWriter(stringWriter);
-		StringReader stringReader= new StringReader(stackTrace);
-		BufferedReader bufferedReader= new BufferedReader(stringReader);	
-			
-		String line;
-		String[] patterns= JUnitPreferencePage.getFilterPatterns();
-		try {	
-			while ((line= bufferedReader.readLine()) != null) {
-				if (!filterLine(patterns, line))
-					printWriter.println(line);
-			}
-		} catch (IOException e) {
-			return stackTrace; // return the stack unfiltered
-		}
-		return stringWriter.toString();
-	}
-	
-	private boolean filterLine(String[] patterns, String line) {
-		String pattern;
-		int len;
-		for (int i= (patterns.length - 1); i >= 0; --i) {
-			pattern= patterns[i];
-			len= pattern.length() - 1;
-			if (pattern.charAt(len) == '*') {
-				//strip trailing * from a package filter
-				pattern= pattern.substring(0, len);
-			} else if (Character.isUpperCase(pattern.charAt(0))) {
-				//class in the default package
-				pattern= FRAME_PREFIX + pattern + '.';
-			} else {
-				//class names start w/ an uppercase letter after the .
-				final int lastDotIndex= pattern.lastIndexOf('.');
-				if ((lastDotIndex != -1) && (lastDotIndex != len) && Character.isUpperCase(pattern.charAt(lastDotIndex + 1)))
-					pattern += '.'; //append . to a class filter
-			}
-
-			if (line.indexOf(pattern) > 0)
-				return true;
-		}		
-		return false;
-	}
-
-    public TestRunInfo getFailedTest() {
-        return fFailure;
-    }
-
-    public Shell getShell() {
-        return fTable.getShell();
-    }
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/GotoReferencedTestAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/GotoReferencedTestAction.java
deleted file mode 100644
index c059250..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/GotoReferencedTestAction.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-
-/**
- * Shows a dialog with test methods that refer to the selection.
- */
-public class GotoReferencedTestAction implements IWorkbenchWindowActionDelegate {
-	ISelection fSelection;
-	IWorkbenchWindow fWorkbench;
-	
-	private void run(IStructuredSelection selection) {
-		IJavaElement[] elements= getSelectedElements(selection);
-		if (elements.length == 0) {
-			MessageDialog.openInformation(getShell(), JUnitMessages.getString("GotoReferencedTestAction.dialog.title"), JUnitMessages.getString("GotoReferencedTestAction.dialog.message")); //$NON-NLS-1$ //$NON-NLS-2$
-			return;
-		}
-		try {
-			run(elements);
-		} catch (CoreException e) {
-			ErrorDialog.openError(getShell(), JUnitMessages.getString("GotoReferencedTestAction.dialog.title"), JUnitMessages.getString("GotoReferencedTestAction.dialog.error"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-			
-	private void run(ITextSelection ITextSelection) {
-		try {
-			JavaEditor editor= getActiveEditor();
-			if (editor == null)
-				return;
-			IJavaElement element= SelectionConverter.getElementAtOffset(editor);
-			int type= element != null ? element.getElementType() : -1;
-			if (type != IJavaElement.METHOD && type != IJavaElement.TYPE) {
-		 		element= SelectionConverter.getTypeAtOffset(editor);
-		 		if (element == null) {
-					MessageDialog.openInformation(getShell(), JUnitMessages.getString("GotoReferencedTestAction.dialog.title"), JUnitMessages.getString("GotoReferencedTestAction.dialog.error.nomethod")); //$NON-NLS-1$ //$NON-NLS-2$
-					return;
-		 		}
-			}
-			run(new IMember[] { (IMember)element });
-		} catch (CoreException e) {
-			ErrorDialog.openError(getShell(), JUnitMessages.getString("GotoReferencedTestAction.dialog.title"), JUnitMessages.getString("GotoReferencedTestAction.dialog.error"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	private void run(IJavaElement[] elements) throws PartInitException, JavaModelException {
-		IJavaElement element= elements[0];
-		
-		SelectionStatusDialog dialog = new TestMethodSelectionDialog(getShell(), element); 
-		dialog.setTitle(JUnitMessages.getString("GotoReferencedTestAction.selectdialog.title"));  //$NON-NLS-1$
-		String msg= JUnitMessages.getFormattedString("GotoReferencedTestAction.dialog.select_message", element.getElementName()); //$NON-NLS-1$
-		dialog.setMessage(msg); 
-		
-		if (dialog.open() == Window.CANCEL) 
-			return;
-	
-		Object result = dialog.getFirstResult();
-		if (result == null) 
-			return;
-				
-		openElement((IJavaElement)result);
-	}
-
-	private void openElement(IJavaElement result) throws JavaModelException, PartInitException {
-		IEditorPart part= JavaUI.openInEditor(result);
-		JavaUI.revealInEditor(part, result);
-	}
-		
-	private IJavaElement[] getSelectedElements(IStructuredSelection selection) {
-		List elements= selection.toList();
-		int size= elements.size();
-		if (size == 0)
-			return new IJavaElement[0];
-			
-		ArrayList result= new ArrayList(size);
-			
-		for (int i= 0; i < size; i++) {
-			Object e= elements.get(i);
-			if (e instanceof ICompilationUnit) {
-				ICompilationUnit unit= (ICompilationUnit) e;
-				IType[] types= new IType[0];
-				try {
-					types= unit.getTypes();
-				} catch (JavaModelException ex) {
-				}
-				for (int j= 0; j < types.length; j++) {
-					result.add(types[j]);
-				} 
-			}
-			else if (e instanceof IMethod || e instanceof IType || e instanceof IField) {
-				result.add(e);
-			} else {
-				return new IJavaElement[0];
-			}
-		}
-		return (IJavaElement[])result.toArray(new IJavaElement[result.size()]);
-	}
-		
-	public void run(IAction action) {
-		if (fSelection instanceof IStructuredSelection)
-			run((IStructuredSelection)fSelection);
-		else if (fSelection instanceof ITextSelection) 
-			run((ITextSelection)fSelection);
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		fSelection= selection;
-	}
-		
-	private Shell getShell() {
-		if (fWorkbench != null)
-			return fWorkbench.getShell();
-		return JUnitPlugin.getActiveWorkbenchShell();
-	}
-	
-	public void dispose() {
-	}
-	
-	public void init(IWorkbenchWindow window) {
-		fWorkbench= window;
-	}
-	
-	private JavaEditor getActiveEditor() {
-		IEditorPart editor= fWorkbench.getActivePage().getActiveEditor();
-		if (editor instanceof JavaEditor)
-			return (JavaEditor) editor;
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/IJUnitHelpContextIds.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/IJUnitHelpContextIds.java
deleted file mode 100644
index fe4c090..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/IJUnitHelpContextIds.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-/**
- * Help context ids for the JUnit UI.
- */
-public interface IJUnitHelpContextIds {
-	public static final String PREFIX= JUnitPlugin.PLUGIN_ID + '.';
-
-	// Actions
-	public static final String COPYTRACE_ACTION= PREFIX + "copy_trace_action_context"; //$NON-NLS-1$
-	public static final String COPYFAILURELIST_ACTION= PREFIX + "copy_failure_list_action_context"; //$NON-NLS-1$
-	public static final String ENABLEFILTER_ACTION= PREFIX + "enable_filter_action_context"; //$NON-NLS-1$
-	public static final String OPENEDITORATLINE_ACTION= PREFIX + "open_editor_atline_action_context"; //$NON-NLS-1$
-	public static final String OPENTEST_ACTION= PREFIX + "open_test_action_context"; //$NON-NLS-1$
-	public static final String RERUN_ACTION= PREFIX + "rerun_test_action_context"; //$NON-NLS-1$
-	public static final String GOTO_REFERENCED_TEST_ACTION_CONTEXT= PREFIX + "goto_referenced_test_action_context"; //$NON-NLS-1$
-	public static final String OUTPUT_SCROLL_LOCK_ACTION= PREFIX + "scroll_lock"; //$NON-NLS-1$
-	
-	// view parts
-	public static final String RESULTS_VIEW= PREFIX + "results_view_context"; //$NON-NLS-1$
-	public static final String RESULTS_VIEW_TOGGLE_ORIENTATION_ACTION= PREFIX + "results_view_toggle_call_mode_action_context"; //$NON-NLS-1$
-	
-	// Preference/Property pages
-	public static final String JUNIT_PREFERENCE_PAGE= PREFIX + "junit_preference_page_context"; //$NON-NLS-1$
-
-	// Wizard pages
-	public static final String NEW_TESTCASE_WIZARD_PAGE= PREFIX + "new_testcase_wizard_page_context"; //$NON-NLS-1$
-	public static final String NEW_TESTCASE_WIZARD_PAGE2= PREFIX + "new_testcase_wizard_page2_context"; //$NON-NLS-1$
-	public static final String NEW_TESTSUITE_WIZARD_PAGE= PREFIX + "new_testsuite_wizard_page2_context"; //$NON-NLS-1$
-	
-	// Dialogs
-	public static final String TEST_SELECTION_DIALOG= PREFIX + "test_selection_context"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/IJUnitPreferencesConstants.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/IJUnitPreferencesConstants.java
deleted file mode 100644
index 9dc419a..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/IJUnitPreferencesConstants.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-/**
- * Defines constants which are used to refer to values in the plugin's preference store.
- */
-public interface IJUnitPreferencesConstants {
-	/**
-	 * Boolean preference controlling whether the failure stack should be
-	 * filtered.
-	 */	
-	public static String DO_FILTER_STACK= JUnitPlugin.PLUGIN_ID + ".do_filter_stack"; //$NON-NLS-1$
-
-	/**
-	 * Boolean preference controlling whether the JUnit view should be shown on
-	 * errors only.
-	 */	
-	public static String SHOW_ON_ERROR_ONLY= JUnitPlugin.PLUGIN_ID + ".show_on_error"; //$NON-NLS-1$
-	
-	/**
-	 * List of active stack filters. A String containing a comma separated list
-	 * of fully qualified type names/patterns.
-	 */			
-	public static final String PREF_ACTIVE_FILTERS_LIST = JUnitPlugin.PLUGIN_ID + ".active_filters"; //$NON-NLS-1$
-	
-	/**
-	 * List of inactive stack filters. A String containing a comma separated
-	 * list of fully qualified type names/patterns.
-	 */				
-	public static final String PREF_INACTIVE_FILTERS_LIST = JUnitPlugin.PLUGIN_ID + ".inactive_filters"; //$NON-NLS-1$	
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ITestRunListener2.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ITestRunListener2.java
deleted file mode 100644
index 13eae36..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ITestRunListener2.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.jdt.junit.ITestRunListener;
-
-/**
- * Extends ITestRunListener with a call back to trace the test contents
- */
-public interface ITestRunListener2 extends ITestRunListener {
-
-	/**
-	 * Information about a member of the test suite that is about to be run.
-	 * The format of the string is: 
-	 * <pre>
-	 * "testId","testName","isSuite","testcount"
-	 * 
-	 * testId: a unique id for the test
-	 * testName: the name of the test
-	 * isSuite: true or false depending on whether the test is a suite
-	 * testCount: an integer indicating the number of tests 
-	 * 
-	 * Example: "324968,testPass(junit.tests.MyTest),false,1"
-	 * </pre>
-	 * 
-	 * @param description a string describing a tree entry
-	 */ 
-	public void testTreeEntry(String description);
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ITestRunListener3.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ITestRunListener3.java
deleted file mode 100644
index 01e54c0..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ITestRunListener3.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-
-/**
- * Extends ITestRunListener2 with a call back to trace the test contents
- */
-public interface ITestRunListener3 extends ITestRunListener2 {
-
-    public void testFailed(int status, String testId, String testName, String trace, String expected, String actual);
-
-	public void testReran(String testId, String className, String testName, int statusCode, String trace, String expectedResult, String actualResult);
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java
deleted file mode 100644
index 9a9a91f..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jul 16, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.wizards.NewTestCaseCreationWizardPage;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @author egamma
- */
-final class JUnitAddLibraryProposal implements IJavaCompletionProposal {
-	private final IInvocationContext fContext;
-
-	public JUnitAddLibraryProposal(IInvocationContext context) {
-		fContext= context;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.text.java.IJavaCompletionProposal#getRelevance()
-	 */
-	public int getRelevance() {
-		return 0;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument)
-	 */
-	public void apply(IDocument document) {   
-		IJavaProject project= fContext.getCompilationUnit().getJavaProject();
-		try {
-			NewTestCaseCreationWizardPage.addJUnitToBuildPath(JUnitPlugin.getActiveWorkbenchShell(), project);
-			// force a reconcile
-			int offset= fContext.getSelectionOffset();
-			int length= fContext.getSelectionLength();
-			String s= document.get(offset, length);
-			document.replace(offset, length, s);
-		} catch (JavaModelException e) {
-			ErrorDialog.openError(JUnitPlugin.getActiveWorkbenchShell(), JUnitMessages.getString("JUnitAddLibraryProposal.title"), JUnitMessages.getString("JUnitAddLibraryProposal.cannotAdd"), e.getStatus());  //$NON-NLS-1$ //$NON-NLS-2$
-
-		} catch (BadLocationException e) {
-			//ignore
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument)
-	 */
-	public Point getSelection(IDocument document) {
-		return new Point(fContext.getSelectionOffset(), fContext.getSelectionLength());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-		return JUnitMessages.getString("JUnitAddLibraryProposal.info"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		return JUnitMessages.getString("JUnitAddLibraryProposal.label"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
-	 */
-	public IContextInformation getContextInformation() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitHomeInitializer.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitHomeInitializer.java
deleted file mode 100644
index 9f187c6..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitHomeInitializer.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.ClasspathVariableInitializer;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.osgi.framework.Bundle;
-
-public class JUnitHomeInitializer extends ClasspathVariableInitializer {	
-	/**
-	 * @see ClasspathVariableInitializer#initialize(String)
-	 */
-	public void initialize(String variable) {
-		Bundle bundle= Platform.getBundle("org.junit"); //$NON-NLS-1$
-		if (bundle == null) {
-			JavaCore.removeClasspathVariable(JUnitPlugin.JUNIT_HOME, null);
-			return;
-		}
-		URL installLocation= bundle.getEntry("/"); //$NON-NLS-1$
-		URL local= null;
-		try {
-			local= Platform.asLocalURL(installLocation);
-		} catch (IOException e) {
-			JavaCore.removeClasspathVariable(JUnitPlugin.JUNIT_HOME, null);
-			return;
-		}
-		try {
-			String fullPath= new File(local.getPath()).getAbsolutePath();
-			JavaCore.setClasspathVariable(JUnitPlugin.JUNIT_HOME, new Path(fullPath), null);
-		} catch (JavaModelException e1) {
-			JavaCore.removeClasspathVariable(JUnitPlugin.JUNIT_HOME, null);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java
deleted file mode 100644
index f276af8..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class JUnitMessages {
-
-	private static final String BUNDLE_NAME= "org.eclipse.jdt.internal.junit.ui.JUnitMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private JUnitMessages() {
-	}
-
-	/**
-	 * Gets a string from the resource bundle and formats it with the argument
-	 * 
-	 * @param key	the string used to get the bundle value, must not be null
-	 */
-	public static String getFormattedString(String key, Object arg) {
-		return MessageFormat.format(getString(key), new Object[] { arg });
-	}
-
-	/**
-	 * Gets a string from the resource bundle and formats it with arguments
-	 */	
-	public static String getFormattedString(String key, Object[] args) {
-		return MessageFormat.format(getString(key), args);
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties
deleted file mode 100644
index cd71ad5..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties
+++ /dev/null

@@ -1,196 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-CopyTrace.action.label=Copy Trace
-CopyTraceAction.problem=Problem Copying to Clipboard
-CopyTraceAction.clipboard_busy=There was a problem when accessing the system clipboard. Retry?
-
-CopyFailureList.action.label=Copy Failure List
-CopyFailureList.problem=Problem Copying Failure List to Clipboard
-CopyFailureList.clipboard_busy=There was a problem when accessing the system clipboard. Retry?
-
-CounterPanel.label.runs=Runs: 
-CounterPanel.label.errors=Errors: 
-CounterPanel.label.failures=Failures: 
-CounterPanel.runcount= {0}/{1}
-
-EnableStackFilterAction.action.label=Filter
-EnableStackFilterAction.action.description=Filter the stack trace
-EnableStackFilterAction.action.tooltip=Filter Stack Trace
-
-ScrollLockAction.action.label=Scroll Lock
-ScrollLockAction.action.description=Scroll lock
-ScrollLockAction.action.tooltip=Scroll Lock
-
-FailureRunView.tab.tooltip=Failures and Errors
-FailureRunView.tab.title=Failures
-FailureRunView.labelfmt= {0} - {1}
-
-FilterPatternsDialog.message.notempty=Filter must not be empty
-
-HierarchyRunView.tab.tooltip=Test Hierarchy
-HierarchyRunView.tab.title=Hierarchy
-
-JUnitPlugin.error.cannotshow=Could not show JUnit Result View
-JUnitPlugin.searching=Searching
-
-JUnitPreferencePage.description=JUnit settings:
-JUnitPreferencePage.addfilterbutton.label=Add &Filter
-JUnitPreferencePage.addfilterbutton.tooltip=Type the Name of a New Stack Filter
-JUnitPreferencePage.addtypebutton.label=Add &Class...
-JUnitPreferencePage.addtypebutton.tooltip=Choose a Java Type and Add It to Stack Filters
-JUnitPreferencePage.addpackagebutton.label=Add &Packages...
-JUnitPreferencePage.addpackagebutton.tooltip=Choose Package(s) to Add to Stack Filters
-JUnitPreferencePage.removefilterbutton.label=&Remove
-JUnitPreferencePage.removefilterbutton.tooltip=Remove All Selected Stack Filters
-JUnitPreferencePage.enableallbutton.label=&Enable All
-JUnitPreferencePage.enableallbutton.tooltip=Enables All Stack Filters
-JUnitPreferencePage.disableallbutton.label=Disa&ble All
-JUnitPreferencePage.disableallbutton.tooltip=Disables All Stack Filters
-JUnitPreferencePage.filter.label=&Stack trace filter patterns (changes only apply to new test runs):
-JUnitPreferencePage.adddialog.title=Add Stack Filter Pattern
-JUnitPreferencePage.addialog.prompt=Enter Filter Pattern:
-JUnitPreferencePage.showcheck.label=Show the JUnit results &view only when an error or failure occurs
-JUnitPreferencePage.invalidstepfilterreturnescape=Invalid stack filter. Press Enter to continue editing or Escape to cancel.  
-JUnitPreferencePage.addtypedialog.title=Add Class to Stack Filters
-JUnitPreferencePage.addtypedialog.message=&Select a class to filter in the failure stack trace.
-JUnitPreferencePage.addtypedialog.error.message=Could not open type selection dialog for stack filters.
-JUnitPreferencePage.addpackagedialog.title=Add Packages to Stack Filters
-JUnitPreferencePage.addpackagedialog.message=&Select a package to filter in the failure stack trace.
-JUnitPreferencePage.addpackagedialog.error.message=Could not open package selection dialog for stack filters.
-
-OpenEditorAction.action.label=&Go to File
-OpenEditorAction.error.cannotopen.title=Cannot Open Editor
-OpenEditorAction.error.cannotopen.message=Test class not found in selected project
-OpenEditorAction.error.dialog.title=Error
-OpenEditorAction.error.dialog.message=Cannot open editor
-OpenEditorAction.message.cannotopen=Cannot open editor
-
-OpenTestAction.error.title=Go To Test
-OpenTestAction.error.methodNoFound=Method ''{0}'' not found. Opening the test class.
-
-
-TestRunnerViewPart.jobName=Update JUnit
-TestRunnerViewPart.stopaction.text=Stop JUnit Test
-TestRunnerViewPart.stopaction.tooltip=Stop JUnit Test Run
-TestRunnerViewPart.rerunaction.label=Rerun Last Test
-TestRunnerViewPart.rerunaction.tooltip=Rerun Last Test
-TestRunnerViewPart.error.cannotrerun=Could not rerun test
-TestRunnerViewPart.message.terminated=Terminated
-TestRunnerViewPart.message.launching=Launching...
-TestRunnerViewPart.cannotrerun.title=Rerun Test
-TestRunnerViewPart.cannotrerurn.message=To rerun tests they must be launched under the debugger\nand \'Keep JUnit running\' must be set in the launch configuration.
-TestRunnerViewPart.message.cannotshow=Could not show JUnit Result View
-TestRunnerViewPart.label.failure=Failure Trace
-TestRunnerViewPart.message.finish= Finished after {0} seconds
-TestRunnerViewPart.message.stopped= Stopped
-TestRunnerViewPart.message.started= {0} - {1}
-TestRunnerViewPart.message.failure= {0}({1}) had a failure
-TestRunnerViewPart.message.error= {0}({1}) had an error
-TestRunnerViewPart.message.success= {0}({1}) was successful
-TestRunnerViewPart.title= JUnit ({0})
-TestRunnerViewPart.title_no_type=JUnit
-TestRunnerViewPart.configName=Rerun {0}
-TestRunnerViewPart.toggle.vertical.label=&Vertical View Orientation
-TestRunnerViewPart.toggle.horizontal.label=&Horizontal View Orientation
-TestRunnerViewPart.toggle.automatic.label=&Automatic View Orientation
-TestRunnerViewPart.terminate.title=Run Last Test
-TestRunnerViewPart.terminate.message=Terminate currently running tests?
-
-JUnitBaseLaunchConfiguration.error.invalidproject=Invalid project specified
-JUnitBaseLaunchConfiguration.error.novmrunner=Internal error: JRE {0} does not specify a VM Runner
-JUnitBaseLaunchConfiguration.error.notests=No tests found
-
-JUnitMainTab.label.oneTest=&Run a single test
-JUnitMainTab.label.project=&Project:
-JUnitMainTab.label.browse=&Browse...
-JUnitMainTab.label.test=T&est class:
-JUnitMainTab.label.search=&Search...
-JUnitMainTab.label.containerTest=Run &all tests in the selected project, package or source folder:
-JUnitMainTab.label.keeprunning=&Keep JUnit running after a test run when debugging
-JUnitMainTab.testdialog.title=Test Selection
-JUnitMainTab.testdialog.message=Choose a test case or test suite:
-JUnitMainTab.projectdialog.title=Project Selection
-JUnitMainTab.projectdialog.message=Choose a project to constrain the search for main types:
-JUnitMainTab.tab.label=Test
-JUnitMainTab.label.defaultpackage=(default package)
-JUnitMainTab.label.method=Test method: 
-JUnitMainTab.folderdialog.title=Folder Selection
-JUnitMainTab.folderdialog.message=Choose a Project, Source Folder or Package:
-JUnitMainTab.error.projectnotdefined=Project not specified
-JUnitMainTab.error.projectnotexists=Project does not exist
-JUnitMainTab.error.notJavaProject=Specified project is not a Java project
-JUnitMainTab.error.testnotdefined=Test not specified
-JUnitMainTab.error.testnotexists=Test class does not exist
-JUnitMainTab.error.invalidTest=Specified class is not a valid test class
-JUnitMainTab.error.noContainer=No project, source folder or package is specified 
-
-TestSearchEngine.message.searching=Searching suites
-LaunchTestAction.dialog.title=JUnit Launch
-LaunchTestAction.message.notests=No JUnit tests found.
-LaunchTestAction.dialog.title2=Test Selection
-LaunchTestAction.message.selectTestToRun=Select Test to debug
-LaunchConfigProjectChange.configDeleted=A launch configuration affected by this change was deleted.
-LaunchConfigTypeChange.configDeleted=A launch configuration affected by this change was deleted.
-LaunchTestAction.message.selectTestToDebug=Select Test to run
-LaunchTestAction.message.launchFailed=JUnit Launch Failed
-LaunchTestAction.message.selectConfiguration=Select a Test Configuration
-LaunchTestAction.message.selectDebugConfiguration=Select JUnit configuration to debug
-LaunchTestAction.message.selectRunConfiguration=Select JUnit configuration to run
-
-ShowNextFailureAction.label=Next Failure
-ShowNextFailureAction.tooltip=Next Failed Test
-ShowPreviousFailureAction.label=Previous Failure
-ShowPreviousFailureAction.tooltip=Previous Failed Test
-
-GotoReferencedTestAction.dialog.message=Select a method, type, or compilation unit to open tests that refer to them.
-GotoReferencedTestAction.dialog.title=Search Referring Tests
-GotoReferencedTestAction.dialog.error.nomethod=Selection is not inside a type or method.
-GotoReferencedTestAction.dialog.error=Test cannot be found
-GotoReferencedTestAction.selectdialog.title=Select Test
-GotoReferencedTestAction.dialog.select_message=Select a test that refers to ''{0}''.
-
-TestMethodSelectionDialog.error.title=Select Test
-TestMethodSelectionDialog.no_tests.title=Go to Test
-TestMethodSelectionDialog.error.notfound.title=Find Test
-TestMethodSelectionDialog.error.notfound.message=Could not find test
-TestMethodSelectionDialog.select_dialog.title=Select Test
-TestMethodSelectionDialog.dialog.title=Go to Referring Tests
-TestMethodSelectionDialog.notfound_message=No tests found that reference ''{0}''.
-TestMethodSelectionDialog.test_not_found=Cannot find ''{0}'' - make sure that JUnit is on the project's classpath.
-TestMethodSelectionDialog.testproject=Multiple projects contain ''{0}''. Select one project to be used when searching for tests.
-
-Resources.outOfSyncResources= Some resources are out of sync
-Resources.outOfSync= Resource ''{0}'' is out of sync with file system.
-Resources.modifiedResources= There are modified resources
-Resources.fileModified= File ''{0}'' has been modified since the beginning of the operation
-
-ExpandAllAction.text=Expand All
-ExpandAllAction.tooltip=Expand All Nodes
-
-JUnitAddLibraryProposal.info=Add the JUnit library to the project\'s build class path
-JUnitAddLibraryProposal.label=Add JUnit libraries
-JUnitAddLibraryProposal.title=Error
-JUnitAddLibraryProposal.cannotAdd=Cannot add the JUnit library to the build path.
-
-CompareResultsAction.label=Compare Result
-CompareResultsAction.description=Compare the actual and expected test result
-CompareResultsAction.tooltip=Compare Actual With Expected Test Result
-
-CompareResultDialog.title=Result Comparison
-CompareResultDialog.labelOK=OK
-CompareResultDialog.expectedLabel=Expected
-CompareResultDialog.actualLabel=Actual
-
-TypeRenameParticipant.name=JUnit Launch configuration participant
-TypeRenameParticipant.change.name=JUnit Launch configuration update
-
-RerunAction.label.run=&Run
-RerunAction.label.debug=&Debug

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
deleted file mode 100644
index 360af78..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
+++ /dev/null

@@ -1,454 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *   Julien Ruaux: jruaux@octo.com
- * 	 Vincent Massol: vmassol@octo.com
- ******************************************************************************/
-
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.AbstractSet;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchListener;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.launcher.JUnitBaseLaunchConfiguration;
-import org.eclipse.jdt.junit.ITestRunListener;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The plug-in runtime class for the JUnit plug-in.
- */
-public class JUnitPlugin extends AbstractUIPlugin implements ILaunchListener {
-	/**
-	 * The single instance of this plug-in runtime class.
-	 */
-	private static JUnitPlugin fgPlugin= null;
-
-	public static final String PLUGIN_ID= "org.eclipse.jdt.junit"; //$NON-NLS-1$
-	public static final String ID_EXTENSION_POINT_TESTRUN_LISTENERS= PLUGIN_ID + "." + "testRunListeners"; //$NON-NLS-1$ //$NON-NLS-2$
-	public static final String ID_EXTENSION_POINT_JUNIT_LAUNCHCONFIGS= PLUGIN_ID + "." + "junitLaunchConfigs"; //$NON-NLS-1$ //$NON-NLS-2$
-
-	public final static String TEST_SUPERCLASS_NAME= "junit.framework.TestCase"; //$NON-NLS-1$
-	public final static String TEST_INTERFACE_NAME= "junit.framework.Test"; //$NON-NLS-1$
-	public static final String SIMPLE_TEST_INTERFACE_NAME= "Test"; //$NON-NLS-1$
-	
-	/**
-	 * The class path variable referring to the junit home location
-	 */
-	public final static String JUNIT_HOME= "JUNIT_HOME"; //$NON-NLS-1$
-
-	private static URL fgIconBaseURL;
-
-	/**
-	 * Use to track new launches. We need to do this
-	 * so that we only attach a TestRunner once to a launch.
-	 * Once a test runner is connected it is removed from the set.
-	 */
-	private AbstractSet fTrackedLaunches= new HashSet(20);
-
-	/**
-	 * List storing the registered test run listeners
-	 */
-	private List fTestRunListeners;
-
-	/**
-	 * List storing the registered JUnit launch configuration types
-	 */
-	private List fJUnitLaunchConfigTypeIDs;
-
-
-	public JUnitPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		fgPlugin= this;
-		String pathSuffix= "icons/full/"; //$NON-NLS-1$
-		try {
-			fgIconBaseURL= new URL(Platform.getBundle(PLUGIN_ID).getEntry("/"), pathSuffix); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-			// do nothing
-		}
-	}
-	
-	public static JUnitPlugin getDefault() {
-		return fgPlugin;
-	}
-
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow workBenchWindow= getActiveWorkbenchWindow();
-		if (workBenchWindow == null)
-			return null;
-		return workBenchWindow.getShell();
-	}
-
-	/**
-	 * Returns the active workbench window
-	 * 
-	 * @return the active workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		if (fgPlugin == null)
-			return null;
-		IWorkbench workBench= fgPlugin.getWorkbench();
-		if (workBench == null)
-			return null;
-		return workBench.getActiveWorkbenchWindow();
-	}
-
-	public static IWorkbenchPage getActivePage() {
-		IWorkbenchWindow activeWorkbenchWindow= getActiveWorkbenchWindow();
-		if (activeWorkbenchWindow == null)
-			return null;
-		return activeWorkbenchWindow.getActivePage();
-	}
-
-	public static String getPluginId() {
-		return PLUGIN_ID;
-	}
-
-	/*
-	 * @see AbstractUIPlugin#initializeDefaultPreferences
-	 */
-	protected void initializeDefaultPreferences(IPreferenceStore store) {
-		super.initializeDefaultPreferences(store);
-		JUnitPreferencePage.initializeDefaults(store);
-	}
-
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, "Error", e)); //$NON-NLS-1$
-	}
-
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	public static URL makeIconFileURL(String name) throws MalformedURLException {
-		if (JUnitPlugin.fgIconBaseURL == null)
-			throw new MalformedURLException();
-		return new URL(JUnitPlugin.fgIconBaseURL, name);
-	}
-
-	static ImageDescriptor getImageDescriptor(String relativePath) {
-		try {
-			return ImageDescriptor.createFromURL(makeIconFileURL(relativePath));
-		} catch (MalformedURLException e) {
-			// should not happen
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-
-	/*
-	 * @see ILaunchListener#launchRemoved(ILaunch)
-	 */
-	public void launchRemoved(final ILaunch launch) {
-		fTrackedLaunches.remove(launch);
-		getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				TestRunnerViewPart testRunnerViewPart= findTestRunnerViewPartInActivePage();
-				if (testRunnerViewPart != null && testRunnerViewPart.isCreated() && launch.equals(testRunnerViewPart.getLastLaunch()))
-					testRunnerViewPart.reset();
-			}
-		});
-	}
-
-	/*
-	 * @see ILaunchListener#launchAdded(ILaunch)
-	 */
-	public void launchAdded(ILaunch launch) {
-		fTrackedLaunches.add(launch);
-	}
-
-	public void connectTestRunner(ILaunch launch, IType launchedType, int port) {
-		TestRunnerViewPart testRunnerViewPart= showTestRunnerViewPartInActivePage(findTestRunnerViewPartInActivePage());
-		if (testRunnerViewPart != null)
-			testRunnerViewPart.startTestRunListening(launchedType, port, launch);
-	}
-
-	private TestRunnerViewPart showTestRunnerViewPartInActivePage(TestRunnerViewPart testRunner) {
-		IWorkbenchPart activePart= null;
-		IWorkbenchPage page= null;
-		try {
-			// TODO: have to force the creation of view part contents 
-			// otherwise the UI will not be updated
-			if (testRunner != null && testRunner.isCreated())
-				return testRunner;
-			page= getActivePage();
-			if (page == null)
-				return null;
-			activePart= page.getActivePart();
-			//	show the result view if it isn't shown yet
-			return (TestRunnerViewPart) page.showView(TestRunnerViewPart.NAME);
-		} catch (PartInitException pie) {
-			log(pie);
-			return null;
-		} finally{
-			//restore focus stolen by the creation of the result view
-			if (page != null && activePart != null)
-				page.activate(activePart);
-		}
-	}
-
-	private TestRunnerViewPart findTestRunnerViewPartInActivePage() {
-		IWorkbenchPage page= getActivePage();
-		if (page == null)
-			return null;
-		return (TestRunnerViewPart) page.findView(TestRunnerViewPart.NAME);
-	}
-
-	/*
-	 * @see ILaunchListener#launchChanged(ILaunch)
-	 */
-	public void launchChanged(final ILaunch launch) {
-		if (!fTrackedLaunches.contains(launch))
-			return;
-
-		ILaunchConfiguration config= launch.getLaunchConfiguration();
-		IType launchedType= null;
-		int port= -1;
-		if (config != null) {
-			// test whether the launch defines the JUnit attributes
-			String portStr= launch.getAttribute(JUnitBaseLaunchConfiguration.PORT_ATTR);
-			String typeStr= launch.getAttribute(JUnitBaseLaunchConfiguration.TESTTYPE_ATTR);
-			if (portStr != null && typeStr != null) {
-				port= Integer.parseInt(portStr);
-				IJavaElement element= JavaCore.create(typeStr);
-				if (element instanceof IType)
-					launchedType= (IType) element;
-			}
-		}
-		if (launchedType != null) {
-			fTrackedLaunches.remove(launch);
-			final int finalPort= port;
-			final IType finalType= launchedType;
-			getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					connectTestRunner(launch, finalType, finalPort);
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see AbstractUIPlugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		ILaunchManager launchManager= DebugPlugin.getDefault().getLaunchManager();
-		launchManager.addLaunchListener(this);
-	}
-
-	/**
-	 * @see AbstractUIPlugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		try {
-			ILaunchManager launchManager= DebugPlugin.getDefault().getLaunchManager();
-			launchManager.removeLaunchListener(this);
-		} finally {
-			super.stop(context);
-		}
-	}
-
-	public static Display getDisplay() {
-//		Shell shell= getActiveWorkbenchShell();
-//		if (shell != null) {
-//			return shell.getDisplay();
-//		}
-		Display display= Display.getCurrent();
-		if (display == null) {
-			display= Display.getDefault();
-		}
-		return display;
-	}
-	/**
-	 * Utility method to create and return a selection dialog that allows
-	 * selection of a specific Java package.  Empty packages are not returned.
-	 * If Java Projects are provided, only packages found within those projects
-	 * are included.  If no Java projects are provided, all Java projects in the
-	 * workspace are considered.
-	 */
-	public static ElementListSelectionDialog createAllPackagesDialog(Shell shell, IJavaProject[] originals, final boolean includeDefaultPackage) throws JavaModelException {
-		final List packageList= new ArrayList();
-		if (originals == null) {
-			IWorkspaceRoot wsroot= ResourcesPlugin.getWorkspace().getRoot();
-			IJavaModel model= JavaCore.create(wsroot);
-			originals= model.getJavaProjects();
-		}
-		final IJavaProject[] projects= originals;
-		final JavaModelException[] exception= new JavaModelException[1];
-		
-		IRunnableWithProgress r= new IRunnableWithProgress() {
-			public void run(IProgressMonitor pm) {
-				try {
-					Set packageNameSet= new HashSet();
-					pm.beginTask(JUnitMessages.getString("JUnitPlugin.searching"), projects.length); //$NON-NLS-1$
-					for (int i= 0; i < projects.length; i++) {
-						IPackageFragment[] pkgs= projects[i].getPackageFragments();
-						for (int j= 0; j < pkgs.length; j++) {
-							IPackageFragment pkg= pkgs[j];
-							if (!pkg.hasChildren() && (pkg.getNonJavaResources().length > 0))
-								continue;
-
-							String pkgName= pkg.getElementName();
-							if (!includeDefaultPackage && pkgName.length() == 0)
-								continue;
-
-							if (packageNameSet.add(pkgName))
-								packageList.add(pkg);
-						}
-						pm.worked(1);
-					}
-					pm.done();
-				} catch (JavaModelException jme) {
-					exception[0]= jme;
-				}
-			}
-		};
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(r);
-		} catch (InvocationTargetException e) {
-			JUnitPlugin.log(e);
-		} catch (InterruptedException e) {
-			JUnitPlugin.log(e);
-		}
-		if (exception[0] != null)
-			throw exception[0];
-
-		int flags= JavaElementLabelProvider.SHOW_DEFAULT;
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(shell, new JavaElementLabelProvider(flags));
-		dialog.setIgnoreCase(false);
-		dialog.setElements(packageList.toArray()); // XXX inefficient
-		return dialog;
-	}
-
-	/**
-	 * Initializes TestRun Listener extensions
-	 */
-	private void loadTestRunListeners() {
-		fTestRunListeners= new ArrayList();
-		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(ID_EXTENSION_POINT_TESTRUN_LISTENERS);
-		if (extensionPoint == null) {
-			return;
-		}
-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
-		MultiStatus status= new MultiStatus(PLUGIN_ID, IStatus.OK, "Could not load some testRunner extension points", null); //$NON-NLS-1$ 	
-
-		for (int i= 0; i < configs.length; i++) {
-			try {
-				ITestRunListener testRunListener= (ITestRunListener) configs[i].createExecutableExtension("class"); //$NON-NLS-1$
-				fTestRunListeners.add(testRunListener);
-			} catch (CoreException e) {
-				status.add(e.getStatus());
-			}
-		}
-		if (!status.isOK()) {
-			JUnitPlugin.log(status);
-		}
-	}
-
-	/**
-	 * Loads the registered JUnit launch configurations
-	 */
-	private void loadLaunchConfigTypeIDs() {
-		fJUnitLaunchConfigTypeIDs= new ArrayList();
-		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(ID_EXTENSION_POINT_JUNIT_LAUNCHCONFIGS);
-		if (extensionPoint == null) {
-			return;
-		}
-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
-
-		for (int i= 0; i < configs.length; i++) {
-			String configTypeID= configs[i].getAttribute("configTypeID"); //$NON-NLS-1$
-			fJUnitLaunchConfigTypeIDs.add(configTypeID);
-		}
-	}
-
-	/**
-	 * Returns an array of all TestRun listeners
-	 */
-	public List getTestRunListeners() {
-		if (fTestRunListeners == null) {
-			loadTestRunListeners();
-		}
-		return fTestRunListeners;
-	}
-
-	/**
-	 * Returns an array of all JUnit launch config types
-	 */
-	public List getJUnitLaunchConfigTypeIDs() {
-		if (fJUnitLaunchConfigTypeIDs == null) {
-			loadLaunchConfigTypeIDs();
-		}
-		return fJUnitLaunchConfigTypeIDs;
-	}
-
-	/**
-	 * Adds a TestRun listener to the collection of listeners
-	 */
-	public void addTestRunListener(ITestRunListener newListener) {
-		if (fTestRunListeners == null) 
-			loadTestRunListeners();
-		for (Iterator iter= fTestRunListeners.iterator(); iter.hasNext();) {
-			Object o= iter.next();
-			if (o == newListener)
-				return;
-		}
-		fTestRunListeners.add(newListener);
-	}
-
-	/**
-	 * Removes a TestRun listener to the collection of listeners
-	 */
-	public void removeTestRunListener(ITestRunListener newListener) {
-		if (fTestRunListeners != null) 
-			fTestRunListeners.remove(newListener);
-	}
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
deleted file mode 100644
index b6a37bf..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
+++ /dev/null

@@ -1,853 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids: sdavids@gmx.de
- ******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.internal.junit.util.ExceptionHandler;
-import org.eclipse.jdt.internal.junit.util.SWTUtil;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnLayoutData;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ContentViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.model.WorkbenchViewerSorter;
-
-/**
- * Preference page for JUnit settings. Supports to define the failure
- * stack filter patterns.
- */
-public class JUnitPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	private static final String DEFAULT_NEW_FILTER_TEXT= ""; //$NON-NLS-1$
-	private static final Image IMG_CUNIT= JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
-	private static final Image IMG_PKG= JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-	
-	private static String[] fgDefaultFilterPatterns= new String[] { "org.eclipse.jdt.internal.junit.runner.*", //$NON-NLS-1$
-		"org.eclipse.jdt.internal.junit.ui.*", //$NON-NLS-1$
-		"junit.framework.TestCase", //$NON-NLS-1$
-		"junit.framework.TestResult", //$NON-NLS-1$
-		"junit.framework.TestSuite", //$NON-NLS-1$
-		"junit.framework.Assert", //$NON-NLS-1$
-		"java.lang.reflect.Method.invoke", //$NON-NLS-1$
-		"junit.framework.TestResult$1" //$NON-NLS-1$
-
-	};
-
-	// Step filter widgets
-	private CheckboxTableViewer fFilterViewer;
-	private Table fFilterTable;
-
-	private Button fShowOnErrorCheck;
-	private Button fAddPackageButton;
-	private Button fAddTypeButton;
-	private Button fRemoveFilterButton;
-	private Button fAddFilterButton;
-
-	private Button fEnableAllButton;
-	private Button fDisableAllButton;
-
-	private Text fEditorText;
-	private String fInvalidEditorText= null;
-	private TableEditor fTableEditor;
-	private TableItem fNewTableItem;
-	private Filter fNewStackFilter;
-	private Label fTableLabel;
-
-	private StackFilterContentProvider fStackFilterContentProvider;
-
-	/**
-	 * Model object that represents a single entry in the filter table.
-	 */
-	private static class Filter {
-
-		private String fName;
-		private boolean fChecked;
-
-		public Filter(String name, boolean checked) {
-			setName(name);
-			setChecked(checked);
-		}
-
-		public String getName() {
-			return fName;
-		}
-		
-		public void setName(String name) {
-			fName= name;
-		}
-				
-		public boolean isChecked() {
-			return fChecked;
-		}
-
-		public void setChecked(boolean checked) {
-			fChecked= checked;
-		}
-
-		public boolean equals(Object o) {
-			if (!(o instanceof Filter))
-				return false;
-
-			Filter other= (Filter) o;
-			return (getName().equals(other.getName()));
-		}
-
-		public int hashCode() {
-			return fName.hashCode();
-		}
-	}
-
-	/**
-	 * Sorter for the filter table; sorts alphabetically ascending.
-	 */
-	private static class FilterViewerSorter extends WorkbenchViewerSorter {
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			ILabelProvider lprov= (ILabelProvider) ((ContentViewer) viewer).getLabelProvider();
-			String name1= lprov.getText(e1);
-			String name2= lprov.getText(e2);
-			if (name1 == null)
-				name1= ""; //$NON-NLS-1$
-
-			if (name2 == null)
-				name2= ""; //$NON-NLS-1$
-
-			if (name1.length() > 0 && name2.length() > 0) {
-				char char1= name1.charAt(name1.length() - 1);
-				char char2= name2.charAt(name2.length() - 1);
-				if (char1 == '*' && char1 != char2)
-					return -1;
-
-				if (char2 == '*' && char2 != char1)
-					return 1;
-			}
-			return name1.compareTo(name2);
-		}
-	}
-
-	/**
-	 * Label provider for Filter model objects
-	 */
-	private static class FilterLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		public String getColumnText(Object object, int column) {
-			return (column == 0) ? ((Filter) object).getName() : ""; //$NON-NLS-1$
-		}
-
-		public String getText(Object element) {
-			return ((Filter) element).getName();
-		}
-
-		public Image getColumnImage(Object object, int column) {
-			String name= ((Filter) object).getName();
-			if (name.endsWith(".*") || name.equals(JUnitMessages.getString("JUnitMainTab.label.defaultpackage"))) { //$NON-NLS-1$ //$NON-NLS-2$
-				//package
-				return IMG_PKG;
-			} else if ("".equals(name)) { //$NON-NLS-1$
-				//needed for the in-place editor
-				return null;
-			} else if ((Character.isUpperCase(name.charAt(0))) && (name.indexOf('.') < 0)) {
-				//class in default package
-				return IMG_CUNIT;
-			} else {
-				//fully-qualified class or other filter
-				final int lastDotIndex= name.lastIndexOf('.');
-				if ((-1 != lastDotIndex) && ((name.length() - 1) != lastDotIndex) && Character.isUpperCase(name.charAt(lastDotIndex + 1)))
-					return IMG_CUNIT;
-			}
-			//other filter
-			return null;
-		}
-	}
-
-	/**
-	 * Content provider for the filter table.  Content consists of instances of
-	 * Filter.
-	 */
-	private class StackFilterContentProvider implements IStructuredContentProvider {
-
-		private List fFilters;
-
-		public StackFilterContentProvider() {
-			List active= createActiveStackFiltersList();
-			List inactive= createInactiveStackFiltersList();
-			populateFilters(active, inactive);
-		}
-
-		public void setDefaults() {
-			fFilterViewer.remove(fFilters.toArray());
-			List active= createDefaultStackFiltersList();
-			List inactive= new ArrayList();
-			populateFilters(active, inactive);
-		}
-
-		protected void populateFilters(List activeList, List inactiveList) {
-			fFilters= new ArrayList(activeList.size() + inactiveList.size());
-			populateList(activeList, true);
-			if (inactiveList.size() != 0)
-				populateList(inactiveList, false);
-		}
-
-		protected void populateList(List list, boolean checked) {
-			Iterator iterator= list.iterator();
-
-			while (iterator.hasNext()) {
-				String name= (String) iterator.next();
-				addFilter(name, checked);
-			}
-		}
-
-		public Filter addFilter(String name, boolean checked) {
-			Filter filter= new Filter(name, checked);
-			if (!fFilters.contains(filter)) {
-				fFilters.add(filter);
-				fFilterViewer.add(filter);
-				fFilterViewer.setChecked(filter, checked);
-			}
-			updateActions();
-			return filter;
-		}
-
-		public void saveFilters() {
-			List active= new ArrayList(fFilters.size());
-			List inactive= new ArrayList(fFilters.size());
-			Iterator iterator= fFilters.iterator();
-			while (iterator.hasNext()) {
-				Filter filter= (Filter) iterator.next();
-				String name= filter.getName();
-				if (filter.isChecked())
-					active.add(name);
-				else
-					inactive.add(name);
-			}
-			String pref= JUnitPreferencePage.serializeList((String[]) active.toArray(new String[active.size()]));
-			getPreferenceStore().setValue(IJUnitPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, pref);
-			pref= JUnitPreferencePage.serializeList((String[]) inactive.toArray(new String[inactive.size()]));
-			getPreferenceStore().setValue(IJUnitPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, pref);
-		}
-
-		public void removeFilters(Object[] filters) {
-			for (int i= (filters.length - 1); i >= 0; --i) {
-				Filter filter= (Filter) filters[i];
-				fFilters.remove(filter);
-			}
-			fFilterViewer.remove(filters);
-			updateActions();
-		}
-
-		public void toggleFilter(Filter filter) {
-			boolean newState= !filter.isChecked();
-			filter.setChecked(newState);
-			fFilterViewer.setChecked(filter, newState);
-		}
-
-		public Object[] getElements(Object inputElement) {
-			return fFilters.toArray();
-		}
-		
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-		public void dispose() {}
-
-	}
-		
-	public JUnitPreferencePage() {
-		super();
-		setDescription(JUnitMessages.getString("JUnitPreferencePage.description")); //$NON-NLS-1$
-		setPreferenceStore(JUnitPlugin.getDefault().getPreferenceStore());
-	}
-
-	protected Control createContents(Composite parent) {
-		WorkbenchHelp.setHelp(parent, IJUnitHelpContextIds.JUNIT_PREFERENCE_PAGE);
-
-		Composite composite= new Composite(parent, SWT.NULL);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 1;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		composite.setLayout(layout);
-		GridData data= new GridData();
-		data.verticalAlignment= GridData.FILL;
-		data.horizontalAlignment= GridData.FILL;
-		composite.setLayoutData(data);
-
-		createStackFilterPreferences(composite);
-		Dialog.applyDialogFont(composite);
-		return composite;
-	}
-
-	/**
-	 * Create a group to contain the step filter related widgetry
-	 */
-	private void createStackFilterPreferences(Composite composite) {
-		Composite container= new Composite(composite, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		container.setLayout(layout);
-		GridData gd= new GridData(GridData.FILL_BOTH);
-		container.setLayoutData(gd);
-
-		createShowCheck(container);
-		createFilterTable(container);
-		createStepFilterButtons(container);
-	}
-
-	private void createShowCheck(Composite composite) {
-		GridData data;
-		fShowOnErrorCheck= new Button(composite, SWT.CHECK);
-		fShowOnErrorCheck.setText(JUnitMessages.getString("JUnitPreferencePage.showcheck.label")); //$NON-NLS-1$
-		data= new GridData();
-		data.horizontalAlignment= GridData.FILL;
-		data.horizontalSpan= 2;
-		fShowOnErrorCheck.setLayoutData(data);
-		fShowOnErrorCheck.setSelection(getShowOnErrorOnly());
-	}
-
-	private void createFilterTable(Composite container) {
-		fTableLabel= new Label(container, SWT.NONE);
-		fTableLabel.setText(JUnitMessages.getString("JUnitPreferencePage.filter.label")); //$NON-NLS-1$
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan= 2;
-		fTableLabel.setLayoutData(gd);
-
-		fFilterTable= new Table(container, SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
-
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		fFilterTable.setLayoutData(gd);
-
-		TableLayout tableLayout= new TableLayout();
-		ColumnLayoutData[] columnLayoutData= new ColumnLayoutData[1];
-		columnLayoutData[0]= new ColumnWeightData(100);
-		tableLayout.addColumnData(columnLayoutData[0]);
-		fFilterTable.setLayout(tableLayout);
-		new TableColumn(fFilterTable, SWT.NONE);
-		fFilterViewer= new CheckboxTableViewer(fFilterTable);
-		fTableEditor= new TableEditor(fFilterTable);
-		fFilterViewer.setLabelProvider(new FilterLabelProvider());
-		fFilterViewer.setSorter(new FilterViewerSorter());
-		fStackFilterContentProvider= new StackFilterContentProvider();
-		fFilterViewer.setContentProvider(fStackFilterContentProvider);
-		// input just needs to be non-null
-		fFilterViewer.setInput(this);
-		gd= new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		fFilterViewer.getTable().setLayoutData(gd);
-		fFilterViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				Filter filter= (Filter) event.getElement();
-				fStackFilterContentProvider.toggleFilter(filter);
-			}
-		});
-		fFilterViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection= event.getSelection();
-				fRemoveFilterButton.setEnabled(!selection.isEmpty());
-			}
-		});
-	}
-
-	private void createStepFilterButtons(Composite container) {
-		Composite buttonContainer= new Composite(container, SWT.NONE);
-		GridData gd= new GridData(GridData.FILL_VERTICAL);
-		buttonContainer.setLayoutData(gd);
-		GridLayout buttonLayout= new GridLayout();
-		buttonLayout.numColumns= 1;
-		buttonLayout.marginHeight= 0;
-		buttonLayout.marginWidth= 0;
-		buttonContainer.setLayout(buttonLayout);
-
-		fAddFilterButton= new Button(buttonContainer, SWT.PUSH);
-		fAddFilterButton.setText(JUnitMessages.getString("JUnitPreferencePage.addfilterbutton.label")); //$NON-NLS-1$
-		fAddFilterButton.setToolTipText(JUnitMessages.getString("JUnitPreferencePage.addfilterbutton.tooltip")); //$NON-NLS-1$
-		gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		fAddFilterButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fAddFilterButton);
-		fAddFilterButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				editFilter();
-			}
-		});
-
-		fAddTypeButton= new Button(buttonContainer, SWT.PUSH);
-		fAddTypeButton.setText(JUnitMessages.getString("JUnitPreferencePage.addtypebutton.label")); //$NON-NLS-1$
-		fAddTypeButton.setToolTipText(JUnitMessages.getString("JUnitPreferencePage.addtypebutton.tooltip")); //$NON-NLS-1$
-		gd= getButtonGridData(fAddTypeButton);
-		fAddTypeButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fAddTypeButton);
-		fAddTypeButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				addType();
-			}
-		});
-
-		fAddPackageButton= new Button(buttonContainer, SWT.PUSH);
-		fAddPackageButton.setText(JUnitMessages.getString("JUnitPreferencePage.addpackagebutton.label")); //$NON-NLS-1$
-		fAddPackageButton.setToolTipText(JUnitMessages.getString("JUnitPreferencePage.addpackagebutton.tooltip")); //$NON-NLS-1$
-		gd= getButtonGridData(fAddPackageButton);
-		fAddPackageButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fAddPackageButton);
-		fAddPackageButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				addPackage();
-			}
-		});
-
-		fRemoveFilterButton= new Button(buttonContainer, SWT.PUSH);
-		fRemoveFilterButton.setText(JUnitMessages.getString("JUnitPreferencePage.removefilterbutton.label")); //$NON-NLS-1$
-		fRemoveFilterButton.setToolTipText(JUnitMessages.getString("JUnitPreferencePage.removefilterbutton.tooltip")); //$NON-NLS-1$
-		gd= getButtonGridData(fRemoveFilterButton);
-		fRemoveFilterButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fRemoveFilterButton);
-		fRemoveFilterButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				removeFilters();
-			}
-		});
-		fRemoveFilterButton.setEnabled(false);
-
-		fEnableAllButton= new Button(buttonContainer, SWT.PUSH);
-		fEnableAllButton.setText(JUnitMessages.getString("JUnitPreferencePage.enableallbutton.label")); //$NON-NLS-1$
-		fEnableAllButton.setToolTipText(JUnitMessages.getString("JUnitPreferencePage.enableallbutton.tooltip")); //$NON-NLS-1$
-		gd= getButtonGridData(fEnableAllButton);
-		fEnableAllButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fEnableAllButton);
-		fEnableAllButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				checkAllFilters(true);
-			}
-		});
-
-		fDisableAllButton= new Button(buttonContainer, SWT.PUSH);
-		fDisableAllButton.setText(JUnitMessages.getString("JUnitPreferencePage.disableallbutton.label")); //$NON-NLS-1$
-		fDisableAllButton.setToolTipText(JUnitMessages.getString("JUnitPreferencePage.disableallbutton.tooltip")); //$NON-NLS-1$
-		gd= getButtonGridData(fDisableAllButton);
-		fDisableAllButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fDisableAllButton);
-		fDisableAllButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				checkAllFilters(false);
-			}
-		});
-
-	}
-
-	private GridData getButtonGridData(Button button) {
-		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		int widthHint= convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		gd.widthHint= Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		gd.heightHint= convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-		return gd;
-	}
-
-	public void init(IWorkbench workbench) {}
-	
-	/**
-	 * Create a new filter in the table (with the default 'new filter' value),
-	 * then open up an in-place editor on it.
-	 */
-	private void editFilter() {
-		// if a previous edit is still in progress, finish it
-		if (fEditorText != null)
-			validateChangeAndCleanup();
-
-		fNewStackFilter= fStackFilterContentProvider.addFilter(DEFAULT_NEW_FILTER_TEXT, true);
-		fNewTableItem= fFilterTable.getItem(0);
-
-		// create & configure Text widget for editor
-		// Fix for bug 1766.  Border behavior on for text fields varies per platform.
-		// On Motif, you always get a border, on other platforms,
-		// you don't.  Specifying a border on Motif results in the characters
-		// getting pushed down so that only there very tops are visible.  Thus,
-		// we have to specify different style constants for the different platforms.
-		int textStyles= SWT.SINGLE | SWT.LEFT;
-		if (!SWT.getPlatform().equals("motif")) //$NON-NLS-1$
-			textStyles |= SWT.BORDER;
-
-		fEditorText= new Text(fFilterTable, textStyles);
-		GridData gd= new GridData(GridData.FILL_BOTH);
-		fEditorText.setLayoutData(gd);
-
-		// set the editor
-		fTableEditor.horizontalAlignment= SWT.LEFT;
-		fTableEditor.grabHorizontal= true;
-		fTableEditor.setEditor(fEditorText, fNewTableItem, 0);
-
-		// get the editor ready to use
-		fEditorText.setText(fNewStackFilter.getName());
-		fEditorText.selectAll();
-		setEditorListeners(fEditorText);
-		fEditorText.setFocus();
-	}
-
-	private void setEditorListeners(Text text) {
-		// CR means commit the changes, ESC means abort and don't commit
-		text.addKeyListener(new KeyAdapter() {
-			public void keyReleased(KeyEvent event) {
-				if (event.character == SWT.CR) {
-					if (fInvalidEditorText != null) {
-						fEditorText.setText(fInvalidEditorText);
-						fInvalidEditorText= null;
-					} else
-						validateChangeAndCleanup();
-				} else if (event.character == SWT.ESC) {
-					removeNewFilter();
-					cleanupEditor();
-				}
-			}
-		});
-		// Consider loss of focus on the editor to mean the same as CR
-		text.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent event) {
-				if (fInvalidEditorText != null) {
-					fEditorText.setText(fInvalidEditorText);
-					fInvalidEditorText= null;
-				} else
-					validateChangeAndCleanup();
-			}
-		});
-		// Consume traversal events from the text widget so that CR doesn't 
-		// traverse away to dialog's default button.  Without this, hitting
-		// CR in the text field closes the entire dialog.
-		text.addListener(SWT.Traverse, new Listener() {
-			public void handleEvent(Event event) {
-				event.doit= false;
-			}
-		});
-	}
-
-	private void validateChangeAndCleanup() {
-		String trimmedValue= fEditorText.getText().trim();
-		// if the new value is blank, remove the filter
-		if (trimmedValue.length() < 1)
-			removeNewFilter();
-
-		// if it's invalid, beep and leave sitting in the editor
-		else if (!validateEditorInput(trimmedValue)) {
-			fInvalidEditorText= trimmedValue;
-			fEditorText.setText(JUnitMessages.getString("JUnitPreferencePage.invalidstepfilterreturnescape")); //$NON-NLS-1$
-			getShell().getDisplay().beep();
-			return;
-			// otherwise, commit the new value if not a duplicate
-		} else {
-			Object[] filters= fStackFilterContentProvider.getElements(null);
-			for (int i= 0; i < filters.length; i++) {
-				Filter filter= (Filter) filters[i];
-				if (filter.getName().equals(trimmedValue)) {
-					removeNewFilter();
-					cleanupEditor();
-					return;
-				}
-			}
-			fNewTableItem.setText(trimmedValue);
-			fNewStackFilter.setName(trimmedValue);
-			fFilterViewer.refresh();
-		}
-		cleanupEditor();
-	}
-
-	/**
-	 * Cleanup all widgetry & resources used by the in-place editing
-	 */
-	private void cleanupEditor() {
-		if (fEditorText == null)
-			return;
-
-		fNewStackFilter= null;
-		fNewTableItem= null;
-		fTableEditor.setEditor(null, null, 0);
-		fEditorText.dispose();
-		fEditorText= null;
-	}
-
-	private void removeNewFilter() {
-		fStackFilterContentProvider.removeFilters(new Object[] { fNewStackFilter });
-	}
-
-	/**
-	 * A valid step filter is simply one that is a valid Java identifier.
-	 * and, as defined in the JDI spec, the regular expressions used for
-	 * step filtering must be limited to exact matches or patterns that
-	 * begin with '*' or end with '*'. Beyond this, a string cannot be validated
-	 * as corresponding to an existing type or package (and this is probably not
-	 * even desirable).  
-	 */
-	private boolean validateEditorInput(String trimmedValue) {
-		char firstChar= trimmedValue.charAt(0);
-		if ((!(Character.isJavaIdentifierStart(firstChar)) || (firstChar == '*')))
-			return false;
-
-		int length= trimmedValue.length();
-		for (int i= 1; i < length; i++) {
-			char c= trimmedValue.charAt(i);
-			if (!Character.isJavaIdentifierPart(c)) {
-				if (c == '.' && i != (length - 1))
-					continue;
-				if (c == '*' && i == (length - 1))
-					continue;
-
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private void addType() {
-		Shell shell= getShell();
-		SelectionDialog dialog= null;
-		try {
-			dialog=
-				JavaUI.createTypeDialog(
-					shell,
-					PlatformUI.getWorkbench().getProgressService(),
-					SearchEngine.createWorkspaceScope(),
-					IJavaElementSearchConstants.CONSIDER_CLASSES,
-					false);
-		} catch (JavaModelException jme) {
-			String title= JUnitMessages.getString("JUnitPreferencePage.addtypedialog.title"); //$NON-NLS-1$
-			String message= JUnitMessages.getString("JUnitPreferencePage.addtypedialog.error.message"); //$NON-NLS-1$
-			ExceptionHandler.handle(jme, shell, title, message);
-			return;
-		}
-
-		dialog.setTitle(JUnitMessages.getString("JUnitPreferencePage.addtypedialog.title")); //$NON-NLS-1$
-		dialog.setMessage(JUnitMessages.getString("JUnitPreferencePage.addtypedialog.message")); //$NON-NLS-1$
-		if (dialog.open() == IDialogConstants.CANCEL_ID)
-			return;
-
-		Object[] types= dialog.getResult();
-		if (types != null && types.length > 0) {
-			IType type= (IType) types[0];
-			fStackFilterContentProvider.addFilter(type.getFullyQualifiedName(), true);
-		}
-	}
-
-	private void addPackage() {
-		Shell shell= getShell();
-		ElementListSelectionDialog dialog= null;
-		try {
-			dialog= JUnitPlugin.createAllPackagesDialog(shell, null, true);
-		} catch (JavaModelException jme) {
-			String title= JUnitMessages.getString("JUnitPreferencePage.addpackagedialog.title"); //$NON-NLS-1$
-			String message= JUnitMessages.getString("JUnitPreferencePage.addpackagedialog.error.message"); //$NON-NLS-1$
-			ExceptionHandler.handle(jme, shell, title, message);
-			return;
-		}
-
-		dialog.setTitle(JUnitMessages.getString("JUnitPreferencePage.addpackagedialog.title")); //$NON-NLS-1$
-		dialog.setMessage(JUnitMessages.getString("JUnitPreferencePage.addpackagedialog.message")); //$NON-NLS-1$
-		dialog.setMultipleSelection(true);
-		if (dialog.open() == IDialogConstants.CANCEL_ID)
-			return;
-
-		Object[] packages= dialog.getResult();
-		if (packages == null)
-			return;
-
-		for (int i= 0; i < packages.length; i++) {
-			IJavaElement pkg= (IJavaElement) packages[i];
-
-			String filter= pkg.getElementName();
-			if (filter.length() < 1)
-				filter= JUnitMessages.getString("JUnitMainTab.label.defaultpackage"); //$NON-NLS-1$
-			else
-				filter += ".*"; //$NON-NLS-1$
-
-			fStackFilterContentProvider.addFilter(filter, true);
-		}
-	}
-	private void removeFilters() {
-		IStructuredSelection selection= (IStructuredSelection) fFilterViewer.getSelection();
-		fStackFilterContentProvider.removeFilters(selection.toArray());
-	}
-
-	private void checkAllFilters(boolean check) {
-		Object[] filters= fStackFilterContentProvider.getElements(null);
-		for (int i= (filters.length - 1); i >= 0; --i)
-			 ((Filter) filters[i]).setChecked(check);
-
-		fFilterViewer.setAllChecked(check);
-	}
-	
-	public boolean performOk() {
-		IPreferenceStore store= getPreferenceStore();
-		store.setValue(IJUnitPreferencesConstants.SHOW_ON_ERROR_ONLY, fShowOnErrorCheck.getSelection());
-		fStackFilterContentProvider.saveFilters();
-		return true;
-	}
-
-	protected void performDefaults() {
-		setDefaultValues();
-		super.performDefaults();
-	}
-
-	private void setDefaultValues() {
-		fStackFilterContentProvider.setDefaults();
-	}
-
-	/**
-	 * Returns the default list of active stack filters.
-	 * 
-	 * @return list
-	 */
-	protected List createDefaultStackFiltersList() {
-		return Arrays.asList(fgDefaultFilterPatterns);
-	}
-
-	/**
-	 * Returns a list of active stack filters.
-	 * 
-	 * @return list
-	 */
-	protected List createActiveStackFiltersList() {
-		return Arrays.asList(getFilterPatterns());
-	}
-
-	/**
-	 * Returns a list of active stack filters.
-	 * 
-	 * @return list
-	 */
-	protected List createInactiveStackFiltersList() {
-		String[] strings=
-			JUnitPreferencePage.parseList(getPreferenceStore().getString(IJUnitPreferencesConstants.PREF_INACTIVE_FILTERS_LIST));
-		return Arrays.asList(strings);
-	}
-
-	protected void updateActions() {
-		if (fEnableAllButton == null)
-			return;
-
-		boolean enabled= fFilterViewer.getTable().getItemCount() > 0;
-		fEnableAllButton.setEnabled(enabled);
-		fDisableAllButton.setEnabled(enabled);
-	}
-
-	public static String[] getFilterPatterns() {
-		IPreferenceStore store= JUnitPlugin.getDefault().getPreferenceStore();
-		return JUnitPreferencePage.parseList(store.getString(IJUnitPreferencesConstants.PREF_ACTIVE_FILTERS_LIST));
-	}
-
-	public static boolean getFilterStack() {
-		IPreferenceStore store= JUnitPlugin.getDefault().getPreferenceStore();
-		return store.getBoolean(IJUnitPreferencesConstants.DO_FILTER_STACK);
-	}
-
-	public static void setFilterStack(boolean filter) {
-		IPreferenceStore store= JUnitPlugin.getDefault().getPreferenceStore();
-		store.setValue(IJUnitPreferencesConstants.DO_FILTER_STACK, filter);
-	}
-
-	public static void initializeDefaults(IPreferenceStore store) {
-		store.setDefault(IJUnitPreferencesConstants.DO_FILTER_STACK, true);
-		store.setDefault(IJUnitPreferencesConstants.SHOW_ON_ERROR_ONLY, true);
-
-		String list= store.getString(IJUnitPreferencesConstants.PREF_ACTIVE_FILTERS_LIST);
-
-		if ("".equals(list)) { //$NON-NLS-1$
-			String pref= JUnitPreferencePage.serializeList(fgDefaultFilterPatterns);
-			store.setValue(IJUnitPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, pref);
-		}
-
-		store.setValue(IJUnitPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, ""); //$NON-NLS-1$
-	}
-
-	public static boolean getShowOnErrorOnly() {
-		IPreferenceStore store= JUnitPlugin.getDefault().getPreferenceStore();
-		return store.getBoolean(IJUnitPreferencesConstants.SHOW_ON_ERROR_ONLY);
-	}
-	
-	/**
-	 * Parses the comma separated string into an array of strings
-	 * 
-	 * @return list
-	 */
-	private static String[] parseList(String listString) {
-		List list= new ArrayList(10);
-		StringTokenizer tokenizer= new StringTokenizer(listString, ","); //$NON-NLS-1$
-		while (tokenizer.hasMoreTokens())
-			list.add(tokenizer.nextToken());
-		return (String[]) list.toArray(new String[list.size()]);
-	}
-
-	/**
-	 * Serializes the array of strings into one comma
-	 * separated string.
-	 * 
-	 * @param list array of strings
-	 * @return a single string composed of the given list
-	 */
-	private static String serializeList(String[] list) {
-		if (list == null)
-			return ""; //$NON-NLS-1$
-
-		StringBuffer buffer= new StringBuffer();
-		for (int i= 0; i < list.length; i++) {
-			if (i > 0)
-				buffer.append(',');
-
-			buffer.append(list[i]);
-		}
-		return buffer.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java
deleted file mode 100644
index 4593f65..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * A progress bar with a red/green indication for success or failure.
- */
-public class JUnitProgressBar extends Canvas {
-	private static final int DEFAULT_WIDTH = 160;
-	private static final int DEFAULT_HEIGHT = 18;
-
-	private int fCurrentTickCount= 0;
-	private int fMaxTickCount= 0;	
-	private int fColorBarWidth= 0;
-	private Color fOKColor;
-	private Color fFailureColor;
-	private Color fStoppedColor;
-	private boolean fError;
-	private boolean fStopped= false;
-	
-	public JUnitProgressBar(Composite parent) {
-		super(parent, SWT.NONE);
-		
-		addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				fColorBarWidth= scale(fCurrentTickCount);
-				redraw();
-			}
-		});	
-		addPaintListener(new PaintListener() {
-			public void paintControl(PaintEvent e) {
-				paint(e);
-			}
-		});
-		addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				fFailureColor.dispose();
-				fOKColor.dispose();
-				fStoppedColor.dispose();
-			}
-		});
-		Display display= parent.getDisplay();
-		fFailureColor= new Color(display, 159, 63, 63);
-		fOKColor= new Color(display, 95, 191, 95);
-		fStoppedColor= new Color(display, 120, 120, 120);
-	}
-
-	public void setMaximum(int max) {
-		fMaxTickCount= max;
-	}
-		
-	public void reset() {
-		fError= false;
-		fStopped= false;
-		fCurrentTickCount= 0;
-		fColorBarWidth= 0;
-		fMaxTickCount= 0;
-		redraw();
-	}
-	
-	private void paintStep(int startX, int endX) {
-		GC gc = new GC(this);	
-		setStatusColor(gc);
-		Rectangle rect= getClientArea();
-		startX= Math.max(1, startX);
-		gc.fillRectangle(startX, 1, endX-startX, rect.height-2);
-		gc.dispose();		
-	}
-
-	private void setStatusColor(GC gc) {
-		if (fStopped)
-			gc.setBackground(fStoppedColor);
-		else if (fError)
-			gc.setBackground(fFailureColor);
-		else if (fStopped)
-			gc.setBackground(fStoppedColor);
-		else
-			gc.setBackground(fOKColor);
-	}
-
-	public void stopped() {
-		fStopped= true;
-		redraw();
-	}
-	
-	private int scale(int value) {
-		if (fMaxTickCount > 0) {
-			Rectangle r= getClientArea();
-			if (r.width != 0)
-				return Math.max(0, value*(r.width-2)/fMaxTickCount);
-		}
-		return value; 
-	}
-	
-	private void drawBevelRect(GC gc, int x, int y, int w, int h, Color topleft, Color bottomright) {
-		gc.setForeground(topleft);
-		gc.drawLine(x, y, x+w-1, y);
-		gc.drawLine(x, y, x, y+h-1);
-		
-		gc.setForeground(bottomright);
-		gc.drawLine(x+w, y, x+w, y+h);
-		gc.drawLine(x, y+h, x+w, y+h);
-	}
-	
-	private void paint(PaintEvent event) {
-		GC gc = event.gc;
-		Display disp= getDisplay();
-			
-		Rectangle rect= getClientArea();
-		gc.fillRectangle(rect);
-		drawBevelRect(gc, rect.x, rect.y, rect.width-1, rect.height-1,
-			disp.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW),
-			disp.getSystemColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW));
-		
-		setStatusColor(gc);
-		fColorBarWidth= Math.min(rect.width-2, fColorBarWidth);
-		gc.fillRectangle(1, 1, fColorBarWidth, rect.height-2);
-	}	
-	
-	public Point computeSize(int wHint, int hHint, boolean changed) {
-		checkWidget();
-		Point size= new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);
-		if (wHint != SWT.DEFAULT) size.x= wHint;
-		if (hHint != SWT.DEFAULT) size.y= hHint;
-		return size;
-	}
-	
-	public void step(int failures) {
-		fCurrentTickCount++;
-		int x= fColorBarWidth;
-
-		fColorBarWidth= scale(fCurrentTickCount);
-
-		if (!fError && failures > 0) {
-			fError= true;
-			x= 1;
-		}
-		if (fCurrentTickCount == fMaxTickCount)
-			fColorBarWidth= getClientArea().width-1;
-		paintStep(x, fColorBarWidth);
-	}
-
-	public void refresh(boolean hasErrors) {
-		fError= hasErrors;
-		redraw();
-	}
-	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java
deleted file mode 100644
index 080bced..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids <sdavids@gmx.de> - bug 48696
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-import org.eclipse.jdt.ui.text.java.IQuickFixProcessor;
-
-public class JUnitQuickFixProcessor implements IQuickFixProcessor {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.text.java.IQuickFixProcessor#hasCorrections(org.eclipse.jdt.core.ICompilationUnit, int)
-	 */
-	public boolean hasCorrections(ICompilationUnit unit, int problemId) {
-		return IProblem.SuperclassNotFound == problemId || IProblem.ImportNotFound == problemId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.text.java.IQuickFixProcessor#getCorrections(org.eclipse.jdt.ui.text.java.IInvocationContext, org.eclipse.jdt.ui.text.java.IProblemLocation[])
-	 */
-	public IJavaCompletionProposal[] getCorrections(final IInvocationContext context, IProblemLocation[] locations)  {
-		if (isJUnitProblem(context, locations))
-			return new IJavaCompletionProposal[] { new JUnitAddLibraryProposal(context) };
-		return new IJavaCompletionProposal[] {};
-	}
-
-	private boolean isJUnitProblem(IInvocationContext context, IProblemLocation[] locations) {
-		ICompilationUnit unit= context.getCompilationUnit();
-		for (int i= 0; i < locations.length; i++) {
-			IProblemLocation location= locations[i];
-			try {
-				String s= unit.getBuffer().getText(location.getOffset(), location.getLength());
-				if (s.equals("TestCase") //$NON-NLS-1$
-						|| s.equals("junit") //$NON-NLS-1$
-						|| s.equals("TestSuite") //$NON-NLS-1$
-						|| s.equals("Test")) //$NON-NLS-1$
-					return true; //$NON-NLS-1$
-			} catch (JavaModelException e) {
-			    JUnitPlugin.log(e.getStatus());
-			}
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JavaTypeExtender.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JavaTypeExtender.java
deleted file mode 100644
index 8722033..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JavaTypeExtender.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-
-/**
- * Contributes an "isTest" property for ITypes.
- */
-public class JavaTypeExtender extends PropertyTester  {
-	private static final String PROPERTY_IS_Test= "isTest"; //$NON-NLS-1$
-	/**
-	 * @inheritDoc
-	 */
-	public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
-		IJavaElement javaElement = null;
-		if (receiver instanceof IAdaptable) {
-			javaElement = (IJavaElement) ((IAdaptable)receiver).getAdapter(IJavaElement.class);
-		}
-		if (javaElement != null) {
-			if (!javaElement.exists()) {
-				return false;
-			}
-		}
-		if (javaElement instanceof IJavaProject ||
-			javaElement instanceof IPackageFragmentRoot ||
-			javaElement instanceof IPackageFragment) {
-				return true;
-		}
-		if (javaElement != null) {
-			if (PROPERTY_IS_Test.equals(method)) { //$NON-NLS-1$
-				return isTest(javaElement);
-			}
-		}
-		return false;
-	}
-
-	private boolean isTest(IJavaElement element) {
-		try {
-			IType testType = null;
-			if (element instanceof ICompilationUnit) {
-				ICompilationUnit cu = (ICompilationUnit) element;
-				testType= cu.getType(Signature.getQualifier(cu.getElementName()));
-			} else if (element instanceof IClassFile) {
-					testType = ((IClassFile)element).getType();
-			} else if (element instanceof IType) {
-				testType = (IType) element;
-			} else if (element instanceof IMember) {
-				testType = ((IMember)element).getDeclaringType();
-			}
-			if (testType != null && testType.exists() && TestSearchEngine.isTestOrTestSuite(testType)) {
-				return true;
-			}
-		} catch (JavaModelException e) {
-		}
-		return false;
-	}	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAction.java
deleted file mode 100644
index 4be405e..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAction.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-
-/**
- * Abstract Action for opening a Java editor.
- */
-public abstract class OpenEditorAction extends Action {
-	protected String fClassName;
-	protected TestRunnerViewPart fTestRunner;
-	
-	/**
-	 * Constructor for OpenEditorAction.
-	 */
-	protected OpenEditorAction(TestRunnerViewPart testRunner, String testClassName) {
-		super(JUnitMessages.getString("OpenEditorAction.action.label")); //$NON-NLS-1$
-		fClassName= testClassName;
-		fTestRunner= testRunner;
-	}
-
-	/*
-	 * @see IAction#run()
-	 */
-	public void run() {
-		ITextEditor textEditor= null;
-		try {
-			IJavaElement element= findElement(getLaunchedProject(), fClassName);
-			if (element == null) {
-				MessageDialog.openError(getShell(), 
-					JUnitMessages.getString("OpenEditorAction.error.cannotopen.title"), JUnitMessages.getString("OpenEditorAction.error.cannotopen.message")); //$NON-NLS-1$ //$NON-NLS-2$
-				return;
-			} 
-			textEditor= (ITextEditor)EditorUtility.openInEditor(element, false);			
-		} catch (CoreException e) {
-			ErrorDialog.openError(getShell(), JUnitMessages.getString("OpenEditorAction.error.dialog.title"), JUnitMessages.getString("OpenEditorAction.error.dialog.message"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			return;
-		}
-		if (textEditor == null) {
-			fTestRunner.setInfoMessage(JUnitMessages.getString("OpenEditorAction.message.cannotopen")); //$NON-NLS-1$
-			return;
-		}
-		reveal(textEditor);
-	}
-	
-	protected Shell getShell() {
-		return fTestRunner.getSite().getShell();
-	}
-
-	protected IJavaProject getLaunchedProject() {
-		return fTestRunner.getLaunchedProject();
-	}
-	
-	protected String getClassName() {
-		return fClassName;
-	}
-
-	protected abstract IJavaElement findElement(IJavaProject project, String className) throws CoreException;
-	
-	protected abstract void reveal(ITextEditor editor);
-	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAtLineAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAtLineAction.java
deleted file mode 100644
index 4619ddf..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAtLineAction.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids: sdavids@gmx.de bug 37333 Failure Trace cannot 
- * 			navigate to non-public class in CU throwing Exception
-
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.core.search.SearchParticipant;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.SearchRequestor;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Open a test in the Java editor and reveal a given line
- */
-public class OpenEditorAtLineAction extends OpenEditorAction {
-
-	//fix for bug 37333
-	private class NonPublicClassInCUCollector extends SearchRequestor {
-		private IJavaElement fFound;
-		
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-			IJavaElement enclosingElement= (IJavaElement) match.getElement();
-			String resourceName= match.getResource().getName();
-			if ((enclosingElement instanceof IType) && (resourceName.equals(fCUName)))
-				fFound= enclosingElement;
-		}
-	}
-		
-	private int fLineNumber;
-	private String fCUName;
-	
-	/**
-	 * Constructor for OpenEditorAtLineAction.
-	 */
-	public OpenEditorAtLineAction(TestRunnerViewPart testRunner, String cuName, String className, int line) {
-		super(testRunner, className);
-		WorkbenchHelp.setHelp(this, IJUnitHelpContextIds.OPENEDITORATLINE_ACTION);
-		fLineNumber= line;
-		fCUName= cuName;
-	}
-		
-	protected void reveal(ITextEditor textEditor) {
-		if (fLineNumber >= 0) {
-			try {
-				IDocument document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-				textEditor.selectAndReveal(document.getLineOffset(fLineNumber-1), document.getLineLength(fLineNumber-1));
-			} catch (BadLocationException x) {
-				// marker refers to invalid text position -> do nothing
-			}
-		}
-	}
-	
-	protected IJavaElement findElement(IJavaProject project, String className) throws CoreException {
-		IJavaElement element= project.findType(className);
-		
-		//fix for bug 37333
-		if (element == null) {
-			SearchPattern pattern=	SearchPattern.createPattern(className, IJavaSearchConstants.TYPE, IJavaSearchConstants.DECLARATIONS,
-					SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE);
-			IJavaSearchScope scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { project }, false);
-			NonPublicClassInCUCollector requestor= new NonPublicClassInCUCollector();
-
-			SearchEngine searchEngine= new SearchEngine();
-			searchEngine.search(pattern, new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-					scope, requestor, new NullProgressMonitor());
-			
-			element= requestor.fFound;
-		}
-		
-		return element;
-	}
-
-	public boolean isEnabled() {
-		try {
-			return getLaunchedProject().findType(getClassName()) != null;
-		} catch (JavaModelException e) {
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java
deleted file mode 100644
index 4fb1e33..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Open a class on a Test method.
- */
-public class OpenTestAction extends OpenEditorAction {
-	
-	private String fMethodName;
-	private ISourceRange fRange;
-	
-	/**
-	 * Constructor for OpenTestAction.
-	 */
-	public OpenTestAction(TestRunnerViewPart testRunner, String className, String method) {
-		super(testRunner, className);
-		WorkbenchHelp.setHelp(this, IJUnitHelpContextIds.OPENTEST_ACTION);
-		fMethodName= method;
-	}
-	
-	public OpenTestAction(TestRunnerViewPart testRunner, String className) {
-		this(testRunner, className, null);
-	}
-
-	protected IJavaElement findElement(IJavaProject project, String className) throws JavaModelException {
-		IType type= project.findType(className);
-		if (type == null) 
-			return null;
-		
-		if (fMethodName == null)
-			return type;
-			
-		IMethod method= findMethod(type);
-		if (method == null) {
-			ITypeHierarchy typeHierarchy= type.newSupertypeHierarchy(null);
-			IType[] types= typeHierarchy.getAllSuperclasses(type);
-			for (int i= 0; i < types.length; i++) {
-				method= findMethod(types[i]);
-				if (method != null)
-					break;
-			}
-		}
-		if (method == null) {
-			String title= JUnitMessages.getString("OpenTestAction.error.title"); //$NON-NLS-1$
-			String message= JUnitMessages.getFormattedString("OpenTestAction.error.methodNoFound", fMethodName); //$NON-NLS-1$
-			MessageDialog.openInformation(getShell(), title, message);
-			return type;
-		}
-		fRange= method.getNameRange();
-		return method;
-	}
-	
-	IMethod findMethod(IType type) {
-		IMethod method= type.getMethod(fMethodName, new String[0]);
-		if (method != null && method.exists())
-			return method;
-		return null;
-	}
-	
-	protected void reveal(ITextEditor textEditor) {
-		if (fRange != null)
-			textEditor.selectAndReveal(fRange.getOffset(), fRange.getLength());
-	}
-
-	public boolean isEnabled() {
-		try {
-			return getLaunchedProject().findType(getClassName()) != null;
-		} catch (JavaModelException e) {
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ProgressImages.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ProgressImages.java
deleted file mode 100644
index 202000d..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ProgressImages.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Manages a set of images that can show progress in the image itself.
- */
-public class ProgressImages {
-	static final int PROGRESS_STEPS= 9;
-	
-	static final String BASE= "prgss/"; //$NON-NLS-1$
-	static final String FAILURE= "ff"; //$NON-NLS-1$
-	static final String OK= "ss"; //$NON-NLS-1$
-	
-	Image[] fOKImages= new Image[PROGRESS_STEPS];
-	Image[] fFailureImages= new Image[PROGRESS_STEPS];
-	Image fMissingImage= null;
-	
-	void load() {
-		if (isLoaded())
-			return;
-			
-		for (int i= 0; i < PROGRESS_STEPS; i++) {
-			String okname= BASE+OK+Integer.toString(i+1)+".gif"; //$NON-NLS-1$ 
-			fOKImages[i]= createImage(okname);
-			String failurename= BASE+FAILURE+Integer.toString(i+1)+".gif"; //$NON-NLS-1$ 
-			fFailureImages[i]= createImage(failurename);
-		}
-	}
-
-	Image createImage(String name) {
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(JUnitPlugin.makeIconFileURL(name));
-			return id.createImage();
-		} catch (MalformedURLException e) {
-			// fall through
-		}  
-		if (fMissingImage == null) 
-			fMissingImage= ImageDescriptor.getMissingImageDescriptor().createImage();
-		return fMissingImage;
-	}
-	
-	public void dispose() {
-		if (!isLoaded())
-			return; 
-			
-		if (fMissingImage != null)
-			fMissingImage.dispose();	
-				
-		for (int i= 0; i < PROGRESS_STEPS; i++) {
-			fOKImages[i].dispose();
-			fOKImages[i]= null;
-			fFailureImages[i].dispose();
-			fFailureImages[i]= null;
-		}
-	}
-	
-	public Image getImage(int current, int total, int errors, int failures) {
-		if (!isLoaded())
-			load();
-			
-		if (total == 0)
-			return fOKImages[0];
-		int index= ((current*PROGRESS_STEPS)/total)-1;
-		index= Math.min(Math.max(0, index), PROGRESS_STEPS-1);
-
-		if (errors + failures == 0)
-			return fOKImages[index];
-		return fFailureImages[index];
-	}
-	
-	boolean isLoaded() {
-		return fOKImages[0] != null;
-	}	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/RemoteTestRunnerClient.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/RemoteTestRunnerClient.java
deleted file mode 100644
index 8508522..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/RemoteTestRunnerClient.java
+++ /dev/null

@@ -1,524 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Julien Ruaux: jruaux@octo.com 
- * 	   Vincent Massol: vmassol@octo.com 
- ******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.internal.junit.runner.MessageIds;
-import org.eclipse.jdt.junit.ITestRunListener;
-
-/**
- * The client side of the RemoteTestRunner. Handles the
- * marshaling of the different messages.
- */
-public class RemoteTestRunnerClient {
-	public abstract class ListenerSafeRunnable implements ISafeRunnable {
-		public void handleException(Throwable exception) {
-			JUnitPlugin.log(exception);
-		}
-	}
-	/**
-	 * A simple state machine to process requests from the RemoteTestRunner
-	 */
-	abstract class ProcessingState {
-	    abstract ProcessingState readMessage(String message);
-	}
-	
-	class DefaultProcessingState extends ProcessingState {
-	    ProcessingState readMessage(String message) {
-	        if (message.startsWith(MessageIds.TRACE_START)) {
-	            fFailedTrace= ""; //$NON-NLS-1$
-	            return fTraceState;
-	        }
-	        if (message.startsWith(MessageIds.EXPECTED_START)) {
-	            fExpectedResult= null;
-	            return fExpectedState;
-	        }
-	        if (message.startsWith(MessageIds.ACTUAL_START)) {
-	            fActualResult= null;
-	            return fActualState;
-	        }
-	        if (message.startsWith(MessageIds.RTRACE_START)) {
-	            fFailedRerunTrace= ""; //$NON-NLS-1$
-	            return fRerunState;
-	        }
-	        String arg= message.substring(MessageIds.MSG_HEADER_LENGTH);
-	        if (message.startsWith(MessageIds.TEST_RUN_START)) {
-	            // version < 2 format: count
-	            // version >= 2 format: count+" "+version
-	            int count= 0;
-	            int v= arg.indexOf(' ');
-	            if (v == -1) {
-	                fVersion= "v1"; //$NON-NLS-1$
-	                count= Integer.parseInt(arg);
-	            } else {
-	                fVersion= arg.substring(v+1);
-	                String sc= arg.substring(0, v);
-	                count= Integer.parseInt(sc);
-	            }
-	            notifyTestRunStarted(count);
-	            return this;
-	        }
-	        if (message.startsWith(MessageIds.TEST_START)) {
-	            notifyTestStarted(arg);
-	            return this;
-	        }
-	        if (message.startsWith(MessageIds.TEST_END)) {
-	            notifyTestEnded(arg);
-	            return this;
-	        }
-	        if (message.startsWith(MessageIds.TEST_ERROR)) {
-	            extractFailure(arg, ITestRunListener.STATUS_ERROR);
-	            return this;
-	        }
-	        if (message.startsWith(MessageIds.TEST_FAILED)) {
-	            extractFailure(arg, ITestRunListener.STATUS_FAILURE);
-	            return this;
-	        }
-	        if (message.startsWith(MessageIds.TEST_RUN_END)) {
-	            long elapsedTime = Long.parseLong(arg);
-	            testRunEnded(elapsedTime);
-	            return this;
-	        }
-	        if (message.startsWith(MessageIds.TEST_STOPPED)) {
-	            long elapsedTime = Long.parseLong(arg);
-	            notifyTestRunStopped(elapsedTime);
-	            shutDown();
-	            return this;
-	        }
-	        if (message.startsWith(MessageIds.TEST_TREE)) {
-	            notifyTestTreeEntry(arg);
-	            return this;
-	        }
-	        if (message.startsWith(MessageIds.TEST_RERAN)) {
-	            if (hasTestId())
-	                scanReranMessage(arg);
-	            else 
-	                scanOldReranMessage(arg);
-	            return this;
-	        }	
-	        return this;
-	    }
-	}
-	
-	class TraceProcessingState extends ProcessingState {
-	    ProcessingState readMessage(String message) {
-	        if (message.startsWith(MessageIds.TRACE_END)) {
-	            notifyTestFailed();
-	            fFailedTrace = ""; //$NON-NLS-1$
-	            fExpectedResult= null;
-	            fActualResult = null;
-	            return fDefaultState;
-	        }
-	        fFailedTrace+= message + '\n';
-	        return this;
-	    }
-	}
-	class ExpectedProcessingState extends ProcessingState {
-	    ProcessingState readMessage(String message) {
-	        if (message.startsWith(MessageIds.EXPECTED_END)) 
-	            return fDefaultState;
-	        if (fExpectedResult == null)
-	        	fExpectedResult= message + '\n';
-	        else
-	        	fExpectedResult+= message + '\n';
-	        return this;
-	    }
-	}
-	class ActualProcessingState extends ProcessingState {
-	    ProcessingState readMessage(String message) {
-	        if (message.startsWith(MessageIds.ACTUAL_END)) 
-	            return fDefaultState;
-	        if (fActualResult == null)
-	        	fActualResult= message + '\n';
-	        else 
-				fActualResult+= message + '\n';
-	        return this;
-	    }
-	}
-	class RerunTraceProcessingState extends ProcessingState {
-	    ProcessingState readMessage(String message) {
-	        if (message.startsWith(MessageIds.RTRACE_END)) 
-	            return fDefaultState;
-	        fFailedRerunTrace+= message + '\n';
-	        return this;
-	    }
-	}
-	ProcessingState fDefaultState= new DefaultProcessingState();
-	ProcessingState fTraceState= new TraceProcessingState();
-	ProcessingState fExpectedState= new ExpectedProcessingState();
-	ProcessingState fActualState= new ActualProcessingState();
-	ProcessingState fRerunState= new RerunTraceProcessingState();
-	ProcessingState fCurrentState= fDefaultState;
-	
-	/**
-	 * An array of listeners that are informed about test events.
-	 */
-	private ITestRunListener[] fListeners;
-
-	/**
-	 * The server socket
-	 */
-	private ServerSocket fServerSocket;
-	private Socket fSocket;
-	private int fPort= -1;
-	private PrintWriter fWriter;
-	private BufferedReader fBufferedReader;
-	/**
-	 * The protocol version
-	 */ 
-	private String fVersion;
-	/**
-	 * The failed test that is currently reported from the RemoteTestRunner
-	 */
-	private String fFailedTest;
-	/**
-	 * The Id of the failed test
-	 */
-	private String fFailedTestId;
-	/**
-	 * The failed trace that is currently reported from the RemoteTestRunner
-	 */
-	private String fFailedTrace;
-	/**
-	 * The expected test result
-	 */
-	private String fExpectedResult;
-	/**
-	 * The actual test result
-	 */
-	private String fActualResult;
-	/**
-	 * The failed trace of a reran test
-	 */
-	private String fFailedRerunTrace;
-	/**
-	 * The kind of failure of the test that is currently reported as failed
-	 */
-	private int fFailureKind;
-	
-	private boolean fDebug= false;
-	
-	/**
-	 * Reads the message stream from the RemoteTestRunner
-	 */
-	private class ServerConnection extends Thread {
-		int fServerPort;
-		
-		public ServerConnection(int port) {
-			super("ServerConnection"); //$NON-NLS-1$
-			fServerPort= port;
-		}
-		
-		public void run() {
-			try {
-				if (fDebug)
-					System.out.println("Creating server socket "+fServerPort); //$NON-NLS-1$
-				fServerSocket= new ServerSocket(fServerPort);
-				fSocket= fServerSocket.accept();	
-				try {
-				    fBufferedReader= new BufferedReader(new InputStreamReader(fSocket.getInputStream(), "UTF-8")); //$NON-NLS-1$
-				} catch (UnsupportedEncodingException e) {
-				    fBufferedReader= new BufferedReader(new InputStreamReader(fSocket.getInputStream()));				    
-				}
-				try {
-				    fWriter= new PrintWriter(new OutputStreamWriter(fSocket.getOutputStream(), "UTF-8"), true); //$NON-NLS-1$
-	            } catch (UnsupportedEncodingException e1) {
-	                fWriter= new PrintWriter(new OutputStreamWriter(fSocket.getOutputStream()), true);
-	            }
-				String message;
-				while(fBufferedReader != null && (message= readMessage(fBufferedReader)) != null)
-					receiveMessage(message);
-			} catch (SocketException e) {
-				notifyTestRunTerminated();
-			} catch (IOException e) {
-				System.out.println(e);
-				// fall through
-			}
-			shutDown();
-		}
-	}
-
-	/**
-	 * Start listening to a test run. Start a server connection that
-	 * the RemoteTestRunner can connect to.
-	 */
-	public synchronized void startListening(
-		ITestRunListener[] listeners,
-		int port) {
-		fListeners = listeners;
-		fPort = port;
-		ServerConnection connection = new ServerConnection(port);
-		connection.start();
-	}
-	
-	/**
-	 * Requests to stop the remote test run.
-	 */
-	public synchronized void stopTest() {
-		if (isRunning()) {
-			fWriter.println(MessageIds.TEST_STOP);
-			fWriter.flush();
-		}
-	}
-
-	private synchronized void shutDown() {
-		if (fDebug) 
-			System.out.println("shutdown "+fPort); //$NON-NLS-1$
-		
-		if (fWriter != null) {
-			fWriter.close();
-			fWriter= null;
-		}
-		try {
-			if (fBufferedReader != null) {
-				fBufferedReader.close();
-				fBufferedReader= null;
-			}
-		} catch(IOException e) {
-		}	
-		try {
-			if (fSocket != null) {
-				fSocket.close();
-				fSocket= null;
-			}
-		} catch(IOException e) {
-		}
-		try{
-			if (fServerSocket != null) {
-				fServerSocket.close();
-				fServerSocket= null;
-			}
-		} catch(IOException e) {
-		}
-	}
-	
-	public boolean isRunning() {
-		return fSocket != null;
-	}
-	
-	private String readMessage(BufferedReader in) throws IOException {
-		return in.readLine();
-	}
-		
-	private void receiveMessage(String message) {
-	    fCurrentState= fCurrentState.readMessage(message);
-	}
-
-	private void scanOldReranMessage(String arg) {
-		// OLD V1 format
-		// format: className" "testName" "status
-		// status: FAILURE, ERROR, OK
-		int c= arg.indexOf(" "); //$NON-NLS-1$
-		int t= arg.indexOf(" ", c+1); //$NON-NLS-1$
-		String className= arg.substring(0, c);
-		String testName= arg.substring(c+1, t);
-		String status= arg.substring(t+1);
-		int statusCode= ITestRunListener.STATUS_OK;
-		if (status.equals("FAILURE")) //$NON-NLS-1$
-			statusCode= ITestRunListener.STATUS_FAILURE;
-		else if (status.equals("ERROR")) //$NON-NLS-1$
-			statusCode= ITestRunListener.STATUS_ERROR;
-				
-		String trace= ""; //$NON-NLS-1$
-		if (statusCode != ITestRunListener.STATUS_OK)
-			trace = fFailedRerunTrace;
-		// assumption a rerun trace was sent before
-		notifyTestReran(className+testName, className, testName, statusCode, trace);
-	}
-
-	private void scanReranMessage(String arg) {
-		// format: testId" "className" "testName" "status
-		// status: FAILURE, ERROR, OK
-		int i= arg.indexOf(' ');
-		int c= arg.indexOf(' ', i+1); //$NON-NLS-1$
-		int t= arg.indexOf(' ', c+1); //$NON-NLS-1$
-		String testId= arg.substring(0, i);
-		String className= arg.substring(i+1, c);
-		String testName= arg.substring(c+1, t);
-		String status= arg.substring(t+1);
-		int statusCode= ITestRunListener.STATUS_OK;
-		if (status.equals("FAILURE")) //$NON-NLS-1$
-			statusCode= ITestRunListener.STATUS_FAILURE;
-		else if (status.equals("ERROR")) //$NON-NLS-1$
-			statusCode= ITestRunListener.STATUS_ERROR;
-			
-		String trace= ""; //$NON-NLS-1$
-		if (statusCode != ITestRunListener.STATUS_OK)
-			trace = fFailedRerunTrace;
-		// assumption a rerun trace was sent before
-		notifyTestReran(testId, className, testName, statusCode, trace);
-	}
-
-	private void extractFailure(String arg, int status) {
-		String s[]= extractTestId(arg);
-		fFailedTestId= s[0];
-		fFailedTest= s[1];
-		fFailureKind= status;
-	}
-
-	/**
-	 * Returns an array with two elements. The first one is the testId, the second one the testName.
-	 */
-	String[] extractTestId(String arg) {
-		String[] result= new String[2];
-		if (!hasTestId()) {
-			result[0]= arg; // use the test name as the test Id
-			result[1]= arg;
-			return result;
-		}
-		int i= arg.indexOf(',');
-		result[0]= arg.substring(0, i);
-		result[1]= arg.substring(i+1, arg.length());
-		return result;
-	}
-	
-	private boolean hasTestId() {
-		if (fVersion == null) // TODO fix me
-			return true;
-		return fVersion.equals("v2"); //$NON-NLS-1$
-	}
-
-	private void notifyTestReran(final String testId, final String className, final String testName, final int statusCode, final String trace) {
-		for (int i= 0; i < fListeners.length; i++) {
-			final ITestRunListener listener= fListeners[i];
-			Platform.run(new ListenerSafeRunnable() { 
-				public void run() {
-				    if (listener instanceof ITestRunListener3 ) 
-				        ((ITestRunListener3)listener).testReran(testId, className, testName, statusCode, trace, fExpectedResult, fActualResult);
-				    else
-						listener.testReran(testId, className, testName, statusCode, trace);
-				}
-			});
-		}
-	}
-
-	private void notifyTestTreeEntry(final String treeEntry) {
-		for (int i= 0; i < fListeners.length; i++) {
-			if (fListeners[i] instanceof ITestRunListener2) {
-				ITestRunListener2 listener= (ITestRunListener2)fListeners[i];
-				if (!hasTestId()) 
-					listener.testTreeEntry(fakeTestId(treeEntry));
-				else
-					listener.testTreeEntry(treeEntry);
-			}
-		}
-	}
-
-	private String fakeTestId(String treeEntry) {
-		// extract the test name and add it as the testId
-		int index0= treeEntry.indexOf(',');
-		String testName= treeEntry.substring(0, index0).trim();
-		return testName+","+treeEntry; //$NON-NLS-1$
-	}
-
-	private void notifyTestRunStopped(final long elapsedTime) {
-		for (int i= 0; i < fListeners.length; i++) {
-			final ITestRunListener listener= fListeners[i];
-			Platform.run(new ListenerSafeRunnable() { 
-				public void run() {
-					listener.testRunStopped(elapsedTime);
-				}
-			});
-		}
-	}
-
-	private void testRunEnded(final long elapsedTime) {
-		for (int i= 0; i < fListeners.length; i++) {
-			final ITestRunListener listener= fListeners[i];
-			Platform.run(new ListenerSafeRunnable() { 
-				public void run() {
-					listener.testRunEnded(elapsedTime);
-				}
-			});
-		}
-	}
-
-	private void notifyTestEnded(final String test) {
-		for (int i= 0; i < fListeners.length; i++) {
-			final ITestRunListener listener= fListeners[i];
-			Platform.run(new ListenerSafeRunnable() { 
-				public void run() {
-					String s[]= extractTestId(test);
-					listener.testEnded(s[0], s[1]);
-				}
-			});
-		}
-	}
-
-	private void notifyTestStarted(final String test) {
-		for (int i= 0; i < fListeners.length; i++) {
-			final ITestRunListener listener= fListeners[i];
-			Platform.run(new ListenerSafeRunnable() { 
-				public void run() {
-					String s[]= extractTestId(test);
-					listener.testStarted(s[0], s[1]);
-				}
-			});
-		}
-	}
-
-	private void notifyTestRunStarted(final int count) {
-		for (int i= 0; i < fListeners.length; i++) {
-			final ITestRunListener listener= fListeners[i];
-			Platform.run(new ListenerSafeRunnable() { 
-				public void run() {
-					listener.testRunStarted(count);
-				}
-			});
-		}
-	}
-
-	private void notifyTestFailed() {
-		for (int i= 0; i < fListeners.length; i++) {
-			final ITestRunListener listener= fListeners[i];
-			Platform.run(new ListenerSafeRunnable() { 
-				public void run() {
-				    if (listener instanceof ITestRunListener3 )
-				        ((ITestRunListener3)listener).testFailed(fFailureKind, fFailedTestId, 
-				                fFailedTest, fFailedTrace, fExpectedResult, fActualResult);
-				    else
-				        listener.testFailed(fFailureKind, fFailedTestId, fFailedTest, fFailedTrace);
-				}
-			});
-		}
-	}
-	
-	private void notifyTestRunTerminated() {
-		for (int i= 0; i < fListeners.length; i++) {
-			final ITestRunListener listener= fListeners[i];
-			Platform.run(new ListenerSafeRunnable() { 
-				public void run() {
-					listener.testRunTerminated();
-				}
-			});
-		}
-	}
-
-	public void rerunTest(String testId, String className, String testName) {
-		if (isRunning()) {
-			fWriter.println(MessageIds.TEST_RERUN+testId+" "+className+" "+testName); //$NON-NLS-1$ //$NON-NLS-2$
-			fWriter.flush();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/RerunAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/RerunAction.java
deleted file mode 100644
index 5842142..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/RerunAction.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.action.Action;
-
-/**
- * Requests to rerun a test.
- */
-public class RerunAction extends Action {
-	private String fTestId;
-	private String fClassName;
-	private String fTestName;
-	private TestRunnerViewPart fTestRunner;
-	private String fLaunchMode;
-	
-	/**
-	 * Constructor for RerunAction.
-	 */
-	public RerunAction(TestRunnerViewPart runner, String testId, String className, String testName, String launchMode) {
-		super(); 
-		if (launchMode.equals(ILaunchManager.RUN_MODE))
-			setText(JUnitMessages.getString("RerunAction.label.run")); //$NON-NLS-1$
-		else if (launchMode.equals(ILaunchManager.DEBUG_MODE))
-			setText(JUnitMessages.getString("RerunAction.label.debug")); //$NON-NLS-1$
-		WorkbenchHelp.setHelp(this, IJUnitHelpContextIds.RERUN_ACTION);
-		fTestRunner= runner;
-		fTestId= testId;
-		fClassName= className;
-		fTestName= testName;
-		fLaunchMode= launchMode;
-	}
-
-	/*
-	 * @see IAction#run()
-	 */
-	public void run() {
-		fTestRunner.rerunTest(fTestId, fClassName, fTestName, fLaunchMode);
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ScrollLockAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ScrollLockAction.java
deleted file mode 100644
index bfeddd6..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ScrollLockAction.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Toggles console auto-scroll
- */
-public class ScrollLockAction extends Action {
-
-	private TestRunnerViewPart fRunnerViewPart;
-
-	public ScrollLockAction(TestRunnerViewPart viewer) {
-		super(JUnitMessages.getString("ScrollLockAction.action.label")); //$NON-NLS-1$
-		fRunnerViewPart= viewer;
-		setToolTipText(JUnitMessages.getString("ScrollLockAction.action.tooltip")); //$NON-NLS-1$
-		setDisabledImageDescriptor(JUnitPlugin.getImageDescriptor("dlcl16/lock.gif")); //$NON-NLS-1$
-		setHoverImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/lock.gif")); //$NON-NLS-1$
-		setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/lock.gif")); //$NON-NLS-1$
-		WorkbenchHelp.setHelp(
-			this,
-			IJUnitHelpContextIds.OUTPUT_SCROLL_LOCK_ACTION);
-		setChecked(false);
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		fRunnerViewPart.setAutoScroll(!isChecked());
-	}
-}
-

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ShowNextFailureAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ShowNextFailureAction.java
deleted file mode 100644
index d59c8b1..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ShowNextFailureAction.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.jface.action.Action;
-
-class ShowNextFailureAction extends Action {
-	
-	private TestRunnerViewPart fPart;
-
-	public ShowNextFailureAction(TestRunnerViewPart part) {
-		super(JUnitMessages.getString("ShowNextFailureAction.label"));  //$NON-NLS-1$
-		setDisabledImageDescriptor(JUnitPlugin.getImageDescriptor("dlcl16/select_next.gif")); //$NON-NLS-1$
-		setHoverImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/select_next.gif")); //$NON-NLS-1$
-		setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/select_next.gif")); //$NON-NLS-1$
-		setToolTipText(JUnitMessages.getString("ShowNextFailureAction.tooltip")); //$NON-NLS-1$
-		fPart= part;
-	}
-	
-	public void run() {
-		fPart.selectNextFailure();
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ShowPreviousFailureAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ShowPreviousFailureAction.java
deleted file mode 100644
index 66bdeb5..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/ShowPreviousFailureAction.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.jface.action.Action;
-
-class ShowPreviousFailureAction extends Action {
-	
-	private TestRunnerViewPart fPart;
-
-	public ShowPreviousFailureAction(TestRunnerViewPart part) {
-		super(JUnitMessages.getString("ShowPreviousFailureAction.label"));  //$NON-NLS-1$
-		setDisabledImageDescriptor(JUnitPlugin.getImageDescriptor("dlcl16/select_prev.gif")); //$NON-NLS-1$
-		setHoverImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/select_prev.gif")); //$NON-NLS-1$
-		setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/select_prev.gif")); //$NON-NLS-1$
-		setToolTipText(JUnitMessages.getString("ShowPreviousFailureAction.tooltip"));  //$NON-NLS-1$
-		fPart= part;
-	}
-	
-	public void run() {
-		fPart.selectPreviousFailure();
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TabFolderLayout.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TabFolderLayout.java
deleted file mode 100644
index 3604ec1..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TabFolderLayout.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Layout;
-
-/**
- * Layout that fixes an SWT limitation on Motif
- * TODO: check whether this is still required
- */
-public class TabFolderLayout extends Layout {
-	
-	protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) {
-		if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
-			return new Point(wHint, hHint);
-			
-		Control [] children = composite.getChildren ();
-		int count = children.length;
-		int maxWidth = 0, maxHeight = 0;
-		for (int i=0; i<count; i++) {
-			Control child = children [i];
-			Point pt = child.computeSize (SWT.DEFAULT, SWT.DEFAULT, flushCache);
-			maxWidth = Math.max (maxWidth, pt.x);
-			maxHeight = Math.max (maxHeight, pt.y);
-		}
-		if (wHint != SWT.DEFAULT)
-			maxWidth= wHint;
-		if (hHint != SWT.DEFAULT)
-			maxHeight= hHint;
-		
-		return new Point(maxWidth, maxHeight);	
-		
-	}
-	
-	protected void layout (Composite composite, boolean flushCache) {
-		Rectangle rect = composite.getClientArea();
-	
-		Control[] children = composite.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].setBounds(rect);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestHierarchyTab.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestHierarchyTab.java
deleted file mode 100644
index 734efa3..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestHierarchyTab.java
+++ /dev/null

@@ -1,705 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids - sdavids@gmx.de bugs 26754, 41228
-*******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.junit.ITestRunListener;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-/*
- * A view that shows the contents of a test suite
- * as a tree.
- */
-public class TestHierarchyTab extends TestRunTab implements IMenuListener {
-	 
-	private Tree fTree;
-	
-	private TreeItem fCachedParent;
-	private TreeItem[] fCachedItems;
-	
-	private TreeItem fLastParent;
-	private List fExecutionPath;
-	
-	private boolean fMoveSelection= false;
-	
-	/**
-	 * Helper used to resurrect test hierarchy
-	 */
-	private static class SuiteInfo {
-		public int fTestCount;
-		public TreeItem fTreeItem;
-		
-		public SuiteInfo(TreeItem treeItem, int testCount){
-			fTreeItem= treeItem;
-			fTestCount= testCount;
-		}
-	}
-		
-	/**
-	 * Vector of SuiteInfo items
-	 */
-	private Vector fSuiteInfos= new Vector();
-	/**
-	 * Maps test Ids to TreeItems. 
-	 */
-	private Map fTreeItemMap= new HashMap();
-	
-	private TestRunnerViewPart fTestRunnerPart;
-	
-	private final Image fOkIcon= TestRunnerViewPart.createImage("obj16/testok.gif"); //$NON-NLS-1$
-	private final Image fErrorIcon= TestRunnerViewPart.createImage("obj16/testerr.gif"); //$NON-NLS-1$
-	private final Image fFailureIcon= TestRunnerViewPart.createImage("obj16/testfail.gif"); //$NON-NLS-1$
-	private final Image fHierarchyIcon= TestRunnerViewPart.createImage("obj16/testhier.gif"); //$NON-NLS-1$
-	private final Image fSuiteIcon= TestRunnerViewPart.createImage("obj16/tsuite.gif"); //$NON-NLS-1$
-	private final Image fSuiteErrorIcon= TestRunnerViewPart.createImage("obj16/tsuiteerror.gif"); //$NON-NLS-1$
-	private final Image fSuiteFailIcon= TestRunnerViewPart.createImage("obj16/tsuitefail.gif"); //$NON-NLS-1$
-	private final Image fTestIcon= TestRunnerViewPart.createImage("obj16/test.gif"); //$NON-NLS-1$
-	private final Image fTestRunningIcon= TestRunnerViewPart.createImage("obj16/testrun.gif"); //$NON-NLS-1$
-	private final Image fSuiteRunningIcon= TestRunnerViewPart.createImage("obj16/tsuiterun.gif"); //$NON-NLS-1$
-	
-	private class ExpandAllAction extends Action {
-		public ExpandAllAction() {
-			setText(JUnitMessages.getString("ExpandAllAction.text"));  //$NON-NLS-1$
-			setToolTipText(JUnitMessages.getString("ExpandAllAction.tooltip"));  //$NON-NLS-1$
-		}
-		
-		public void run(){
-			expandAll();
-		}
-	}
-	public TestHierarchyTab() {
-	} 
-
-	public void createTabControl(CTabFolder tabFolder, Clipboard clipboard, TestRunnerViewPart runner) {
-		fTestRunnerPart= runner;
-		
-		CTabItem hierarchyTab= new CTabItem(tabFolder, SWT.NONE);
-		hierarchyTab.setText(getName());
-		hierarchyTab.setImage(fHierarchyIcon);
-		
-		Composite testTreePanel= new Composite(tabFolder, SWT.NONE);
-		GridLayout gridLayout= new GridLayout();
-		gridLayout.marginHeight= 0;
-		gridLayout.marginWidth= 0;
-		testTreePanel.setLayout(gridLayout);
-		
-		GridData gridData= new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		testTreePanel.setLayoutData(gridData);
-		
-		hierarchyTab.setControl(testTreePanel);
-		hierarchyTab.setToolTipText(JUnitMessages.getString("HierarchyRunView.tab.tooltip")); //$NON-NLS-1$
-		
-		fTree= new Tree(testTreePanel, SWT.V_SCROLL | SWT.SINGLE);
-		gridData= new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		fTree.setLayoutData(gridData);
-		
-		initMenu();
-		addListeners();
-	}
-
-	void disposeIcons() {
-		fErrorIcon.dispose();
-		fFailureIcon.dispose();
-		fOkIcon.dispose();
-		fHierarchyIcon.dispose();
-		fTestIcon.dispose();
-		fTestRunningIcon.dispose();
-		fSuiteRunningIcon.dispose();
-		fSuiteIcon.dispose();
-		fSuiteErrorIcon.dispose();
-		fSuiteFailIcon.dispose(); 
-	}
-	
-	private void initMenu() {
-		MenuManager menuMgr= new MenuManager();
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(this);
-		Menu menu= menuMgr.createContextMenu(fTree);
-		fTree.setMenu(menu);	
-	}
-
-	private String getTestMethod() {
-		return getTestInfo().getTestMethodName();
-	}
-
-	private TestRunInfo getTestInfo() {
-		TreeItem[] treeItems= fTree.getSelection();
-		if(treeItems.length == 0) 
-			return null;
-		return ((TestRunInfo)treeItems[0].getData());
-	}	
-	
-	private boolean isSuiteSelected() {
-		TreeItem[] treeItems= fTree.getSelection();
-		if(treeItems.length != 1) 
-			return false;
-		return treeItems[0].getItemCount() > 0;
-	}	
-	
-	private String getClassName() {
-		return getTestInfo().getClassName();
-	}
-	
-	public String getSelectedTestId() {
-		TestRunInfo testInfo= getTestInfo();
-		if (testInfo == null) 
-			return null;
-		return testInfo.getTestId();
-	}		
-
-	public String getName() {
-		return JUnitMessages.getString("HierarchyRunView.tab.title"); //$NON-NLS-1$
-	}
-	
-	public void setSelectedTest(String testId) {
-		TreeItem treeItem= findTreeItem(testId);
-		if (treeItem != null)
-			fTree.setSelection(new TreeItem[]{treeItem});
-	}
-	
-	public void startTest(String testId) {	
-		TreeItem treeItem= findTreeItem(testId);
-		if (treeItem == null)  
-			return;
-		TreeItem parent= treeItem.getParentItem();
-		if (fLastParent != parent) {
-			updatePath(parent);
-			fLastParent= parent;
-		}
-		setCurrentItem(treeItem);		
-	}
-
-	private void updatePath(TreeItem parent) {
-		List newPath= new ArrayList();
-		while (parent != null) {
-			newPath.add(parent);
-			parent= parent.getParentItem();
-		}
-		Collections.reverse(newPath);
-		
-		// common path
-		ListIterator old= fExecutionPath.listIterator();
-		ListIterator np= newPath.listIterator();
-		int c= 0;
-		while (old.hasNext() && np.hasNext()) {
-			if (old.next() != np.next())
-				break;
-			c++;
-		}
-		// clear old path
-		for (ListIterator iter= fExecutionPath.listIterator(c); iter.hasNext(); ) 
-			refreshItem((TreeItem) iter.next(), false);		
-		// update new path
-		for (ListIterator iter= newPath.listIterator(c); iter.hasNext(); ) 
-			refreshItem((TreeItem) iter.next(), true);		
-		fExecutionPath= newPath;
-	}
-	
-	private void refreshItem(TreeItem item, boolean onPath) {
-		if (onPath)
-			item.setImage(fSuiteRunningIcon);
-		else {
-			TestRunInfo info= getTestRunInfo(item);
-			switch (info.getStatus()) {
-			case  ITestRunListener.STATUS_ERROR:
-				item.setImage(fSuiteErrorIcon);
-				break;
-			case  ITestRunListener.STATUS_FAILURE:
-				item.setImage(fSuiteFailIcon);
-				break;
-			default:
-				item.setImage(fSuiteIcon);
-			}
-		}
-	}
-	
-	private void setCurrentItem(TreeItem treeItem) {
-		treeItem.setImage(fTestRunningIcon);
-	
-		TreeItem parent= treeItem.getParentItem();
-		if (fTestRunnerPart.isAutoScroll()) {
-			fTree.showItem(treeItem);
-			while (parent != null) {
-				if (parent.getExpanded()) 
-					break;
-				parent.setExpanded(true);
-				parent= parent.getParentItem();
-			}
-		}
-	}
-
-	public void endTest(String testId) {	
-		TreeItem treeItem= findTreeItem(testId);
-		if (treeItem == null)  
-			return;
-			
-		TestRunInfo testInfo= fTestRunnerPart.getTestInfo(testId);
-		// fix for 61709 NPE in JUnit view plus strange behavior 
-		// the testInfo map can already be destroyed at this point
-		if (testInfo == null)
-			return;
-		
-		updateItem(treeItem, testInfo);
-		
-		if (fTestRunnerPart.isAutoScroll()) {
-			fTree.showItem(treeItem);
-			cacheItems(treeItem);
-			collapsePassedTests(treeItem);
-		} 
-	}
-
-	private void cacheItems(TreeItem treeItem) {
-		TreeItem parent= treeItem.getParentItem();
-		if (parent == fCachedParent)
-			return;
-		fCachedItems= parent.getItems();
-		fCachedParent= parent;	
-	}
-
-	private void collapsePassedTests(TreeItem treeItem) {
-		TreeItem parent= treeItem.getParentItem();
-		if (parent != null) {
-			TreeItem[] items= null;
-			if (parent == fCachedParent)
-				items= fCachedItems;
-			else 
-				items= parent.getItems();
-				
-			if (isLast(treeItem, items)) {
-				boolean ok= true;
-				for (int i= 0; i < items.length; i++) {
-					if (isFailure(items[i])) {
-						ok= false;
-						break;
-					}
-				}
-				if (ok) {
-					parent.setExpanded(false);
-					collapsePassedTests(parent);
-				}
-			}
-		}
-	}
-
-	private boolean isLast(TreeItem treeItem, TreeItem[] items) {
-		return items[items.length-1] == treeItem;
-	}
-
-	private void updateItem(TreeItem treeItem, TestRunInfo testInfo) {
-		treeItem.setData(testInfo);
-		if(testInfo.getStatus() == ITestRunListener.STATUS_OK) {
-			treeItem.setImage(fOkIcon);	
-			return;
-		}		
-		if (testInfo.getStatus() == ITestRunListener.STATUS_FAILURE) 
-			treeItem.setImage(fFailureIcon);
-		else if (testInfo.getStatus() == ITestRunListener.STATUS_ERROR)
-			treeItem.setImage(fErrorIcon);
-		propagateStatus(treeItem, testInfo.getStatus());	
-	}
-
-	private void propagateStatus(TreeItem item, int status) {
-		TreeItem parent= item.getParentItem();
-		TestRunInfo testRunInfo= getTestRunInfo(item);
-		
-		if (parent == null)
-			return;
-		TestRunInfo parentInfo= getTestRunInfo(parent);
-		int parentStatus= parentInfo.getStatus();
-		
-		if (status == ITestRunListener.STATUS_FAILURE) {
-			if (parentStatus == ITestRunListener.STATUS_ERROR || parentStatus == ITestRunListener.STATUS_FAILURE) 
-				return;
-			parentInfo.setStatus(ITestRunListener.STATUS_FAILURE);
-			testRunInfo.setStatus(ITestRunListener.STATUS_FAILURE);
-		} else {
-			if (parentStatus == ITestRunListener.STATUS_ERROR) 
-				return;
-			parentInfo.setStatus(ITestRunListener.STATUS_ERROR);
-			testRunInfo.setStatus(ITestRunListener.STATUS_ERROR);
-		}
-		propagateStatus(parent, status);
-	}
-	
-	private TestRunInfo getTestRunInfo(TreeItem item) {
-		return (TestRunInfo)item.getData();
-	}
-
-	public void activate() {
-		fMoveSelection= false;
-		testSelected();
-	}
-	
-	public void setFocus() {
-		fTree.setFocus();
-	}
-
-	public void aboutToStart() {
-		fTree.removeAll();
-		fSuiteInfos.removeAllElements();
-		fTreeItemMap= new HashMap();
-		fCachedParent= null;
-		fCachedItems= null;
-		fMoveSelection= false;
-		fExecutionPath= new ArrayList();
-	}
-	
-	private void testSelected() {
-		fTestRunnerPart.handleTestSelected(getSelectedTestId());
-	}
-	
-	private void addListeners() {
-		fTree.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				activate();
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-				activate();
-			}
-		});
-		
-		fTree.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				disposeIcons();
-			}
-		});
-
-		fTree.addMouseListener(new MouseAdapter() {
-			public void mouseDoubleClick(MouseEvent e) {
-				handleDoubleClick(e);
-			}
-		});
-	}
-	
-	void handleDoubleClick(MouseEvent e) {
-		TestRunInfo testInfo= getTestInfo();
-		
-		if (testInfo == null)
-			return;
-			
-		String testLabel= testInfo.getTestName();
-		OpenTestAction action= null;
-		
-		if (isSuiteSelected()) 	
-			action= new OpenTestAction(fTestRunnerPart, testLabel);
-		else 
-			action= new OpenTestAction(fTestRunnerPart, getClassName(), getTestMethod());
-
-		if (action.isEnabled())
-			action.run();													
-	}
-
-	public void menuAboutToShow(IMenuManager manager) {
-		if (fTree.getSelectionCount() > 0) {
-			TreeItem treeItem= fTree.getSelection()[0];
-			TestRunInfo testInfo= (TestRunInfo) treeItem.getData();
-			String testLabel= testInfo.getTestName();
-			if (isSuiteSelected()) {	
-				manager.add(new OpenTestAction(fTestRunnerPart, testLabel));
-				manager.add(new Separator());
-				if (testClassExists(getClassName()) && !fTestRunnerPart.lastLaunchIsKeptAlive()) {
-					manager.add(new RerunAction(fTestRunnerPart, getSelectedTestId(), getClassName(), null, ILaunchManager.RUN_MODE));
-					manager.add(new RerunAction(fTestRunnerPart, getSelectedTestId(), getClassName(), null, ILaunchManager.DEBUG_MODE));
-				}
-			} else {
-				manager.add(new OpenTestAction(fTestRunnerPart, getClassName(), getTestMethod()));
-				manager.add(new Separator());
-				if (fTestRunnerPart.lastLaunchIsKeptAlive()) {
-					manager.add(new RerunAction(fTestRunnerPart, getSelectedTestId(), getClassName(), getTestMethod(), ILaunchManager.RUN_MODE));
-					
-				} else {
-					manager.add(new RerunAction(fTestRunnerPart, getSelectedTestId(), getClassName(), getTestMethod(), ILaunchManager.RUN_MODE));
-					manager.add(new RerunAction(fTestRunnerPart, getSelectedTestId(), getClassName(), getTestMethod(), ILaunchManager.DEBUG_MODE));
-				} 
-			}
-			manager.add(new Separator());
-			manager.add(new ExpandAllAction());
-		}
-	}	
-	
-	private boolean testClassExists(String className) {
-		IJavaProject project= fTestRunnerPart.getLaunchedProject();
-		try {
-			IType type= project.findType(className);
-			return type != null;
-		} catch (JavaModelException e) {
-			// fall through
-		}
-		return false;
-	}
-
-	public void newTreeEntry(String treeEntry) {
-		// format: testId","testName","isSuite","testcount
-		int index0= treeEntry.indexOf(',');
-		StringBuffer testStringBuffer= new StringBuffer(100);
-		int index1= scanTestName(treeEntry, index0+1, testStringBuffer);
-		int index2= treeEntry.indexOf(',', index1+1);
-		String testString= testStringBuffer.toString().trim();
-		String id= treeEntry.substring(0, index0);
-		TestRunInfo testInfo= new TestRunInfo(id, testString);
-		
-		String isSuite= treeEntry.substring(index1+1, index2);
-		int testCount= Integer.parseInt(treeEntry.substring(index2+1));
-		TreeItem treeItem;
-
-		while((fSuiteInfos.size() > 0) && (((SuiteInfo) fSuiteInfos.lastElement()).fTestCount == 0))	{
-			fSuiteInfos.removeElementAt(fSuiteInfos.size()-1);
-		}
-	
-		if(fSuiteInfos.size() == 0){
-			treeItem= new TreeItem(fTree, SWT.NONE);
-			treeItem.setImage(fSuiteIcon);
-			fSuiteInfos.addElement(new SuiteInfo(treeItem, testCount));
-		} else if(isSuite.equals("true")) { //$NON-NLS-1$
-			treeItem= new TreeItem(((SuiteInfo) fSuiteInfos.lastElement()).fTreeItem, SWT.NONE);
-			treeItem.setImage(fSuiteIcon);
-			((SuiteInfo)fSuiteInfos.lastElement()).fTestCount -= 1;
-			fSuiteInfos.addElement(new SuiteInfo(treeItem, testCount));
-		} else {
-			treeItem= new TreeItem(((SuiteInfo) fSuiteInfos.lastElement()).fTreeItem, SWT.NONE);
-			treeItem.setImage(fTestIcon);
-			((SuiteInfo)fSuiteInfos.lastElement()).fTestCount -= 1;
-		}
-		mapTest(testInfo, treeItem);
-		treeItem.setText(testInfo.getTestMethodName());
-		treeItem.setData(testInfo);
-	}
-	
-	private int scanTestName(String s, int start, StringBuffer testName) {
-		boolean inQuote= false;
-		int i= start;
-		for (; i < s.length(); i++) {
-			char c= s.charAt(i);
-			if (c == '\\' && !inQuote) {
-				inQuote= true;
-				continue;
-			} else if (inQuote) {
-				inQuote= false;
-				testName.append(c);
-			} else if (c == ',')
-				break;
-			else
-				testName.append(c);
-		}
-		return i;
-	}
-
-
-	private void mapTest(TestRunInfo info, TreeItem item) {
-		fTreeItemMap.put(info.getTestId(), item);
-	}
-	
-	private TreeItem findTreeItem(String testId) {
-		Object o= fTreeItemMap.get(testId);
-		if (o instanceof TreeItem) 
-			return (TreeItem)o;
-		return null;
-	}
-	
-	/*
-	 * @see ITestRunView#testStatusChanged(TestRunInfo, int)
-	 */
-	public void testStatusChanged(TestRunInfo newInfo) {
-		Object o= fTreeItemMap.get(newInfo.getTestId());
-		if (o instanceof TreeItem) {
-			updateItem((TreeItem)o, newInfo);
-			return;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.junit.ui.ITestRunView#selectNext()
-	 */
-	public void selectNext() {
-		TreeItem selection= getInitialSearchSelection();
-		if (!moveSelection(selection))
-			return;
-			
-		TreeItem failure= findFailure(selection, true, !isLeafFailure(selection));
-		if (failure != null)
-			selectTest(failure);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.junit.ui.ITestRunView#selectPrevious()
-	 */
-	public void selectPrevious() {
-		TreeItem selection= getInitialSearchSelection();		
-		if (!moveSelection(selection))
-			return;
-		
-		TreeItem failure= findFailure(selection, false, !isLeafFailure(selection));
-		if (failure != null)
-			selectTest(failure);
-	}
-
-	private boolean moveSelection(TreeItem selection) {
-		if (!fMoveSelection) {
-			fMoveSelection= true;
-			if (isLeafFailure(selection)) {
-				selectTest(selection);
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private TreeItem getInitialSearchSelection() {
-		TreeItem[] treeItems= fTree.getSelection();	
-		TreeItem selection= null;
-		
-		if (treeItems.length == 0)	
-			selection= fTree.getItems()[0];
-		else
-			selection= treeItems[0];
-		return selection;
-	}
-
-	private boolean isFailure(TreeItem selection) {
-		return !(getTestRunInfo(selection).getStatus() == ITestRunListener.STATUS_OK);
-	}
-
-	private boolean isLeafFailure(TreeItem selection) {
-		boolean isLeaf= selection.getItemCount() == 0;
-		return isLeaf && isFailure(selection);
-	}
-
-	private void selectTest(TreeItem selection) {
-		fTestRunnerPart.showTest(getTestRunInfo(selection));
-	}
-
-	private TreeItem findFailure(TreeItem start, boolean next, boolean includeNode) {
-		TreeItem[] sib= findSiblings(start, next, includeNode);
-		if (next) {
-			for (int i= 0; i < sib.length; i++) {
-				TreeItem failure= findFailureInTree(sib[i]);
-				if (failure != null)
-					return failure;
-			}
-		} else {
-			for (int i= sib.length-1; i >= 0; i--) {
-				TreeItem failure= findFailureInTree(sib[i]);
-				if (failure != null)
-					return failure;
-			}
-		}
-		TreeItem parent= start.getParentItem();
-		if (parent == null)
-			return null;
-		return findFailure(parent, next, false);
-	}
-
-	private TreeItem[] findSiblings(TreeItem item, boolean next, boolean includeNode) {
-		TreeItem parent= item.getParentItem();
-		TreeItem[] children= null;
-		if (parent == null) 
-			children= item.getParent().getItems();
-		else	
-			children= parent.getItems();
-		
-		for (int i= 0; i < children.length; i++) {
-			TreeItem item2= children[i];
-			if (item2 == item) {
-				TreeItem[] result= null;
-				if (next) {
-					if (!includeNode) {
-						result= new TreeItem[children.length-i-1];
-						System.arraycopy(children, i+1, result, 0, children.length-i-1);
-					} else {
-						result= new TreeItem[children.length-i];
-						System.arraycopy(children, i, result, 0, children.length-i);
-						
-					}
-				} else {
-					if (!includeNode) {
-						result= new TreeItem[i];
-						System.arraycopy(children, 0, result, 0, i);
-					} else {
-						result= new TreeItem[i+1];
-						System.arraycopy(children, 0, result, 0, i+1);
-					}
-				}
-				return result;
-			}	
-		}
-		return new TreeItem[0];
-	}
-
-	private TreeItem findFailureInTree(TreeItem item) {
-		if (item.getItemCount() == 0) {
-			if (isFailure(item))
-				return item;			
-		}
-		TreeItem[] children= item.getItems();
-		for (int i= 0; i < children.length; i++) {
-			TreeItem item2= findFailureInTree(children[i]);
-			if (item2 != null)
-				return item2;
-		}
-		return null;
-	}
-	
-	protected void expandAll() {
-		TreeItem[] treeItems= fTree.getSelection();
-		fTree.setRedraw(false);
-		for (int i= 0; i < treeItems.length; i++) {
-			expandAll(treeItems[i]);
-		}
-		fTree.setRedraw(true);
-	}
-	
-	private void expandAll(TreeItem item) {
-		item.setExpanded(true);
-		TreeItem[] items= item.getItems();
-		for (int i= 0; i < items.length; i++) {
-			expandAll(items[i]);
-		}
-	}
-
-	public void aboutToEnd() {
-		for (int i= 0; i < fExecutionPath.size(); i++) {
-			refreshItem((TreeItem) fExecutionPath.get(i), false);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestMethodSelectionDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestMethodSelectionDialog.java
deleted file mode 100644
index 7025a53..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestMethodSelectionDialog.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
- 
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.core.search.SearchParticipant;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.SearchRequestor;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-
-/**
- * A dialog to select a test method.
- */
-public class TestMethodSelectionDialog extends ElementListSelectionDialog {
-
-	private IJavaElement fElement;
-
-	public static class TestReferenceCollector extends SearchRequestor {
-		Set fResult= new HashSet(200);
-		
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-			IJavaElement enclosingElement= (IJavaElement) match.getElement();
-			if (enclosingElement.getElementName().startsWith("test")) //$NON-NLS-1$
-				fResult.add(enclosingElement);
-		}
-	
-		public Object[] getResult() {
-			return fResult.toArray();
-		}
-	}
-
-	public TestMethodSelectionDialog(Shell shell, IJavaElement element) {
-		super(shell, new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_PARAMETERS | JavaElementLabelProvider.SHOW_POST_QUALIFIED));
-		fElement= element;
-	}
-	
-	/*
-	 * @see Windows#configureShell
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		WorkbenchHelp.setHelp(newShell, IJUnitHelpContextIds.TEST_SELECTION_DIALOG);
-	}
-
-	/*
-	 * @see Window#open()
-	 */
-	public int open() {
-		Object[] elements;
-		IType testType= findTestType();
-		
-		if (testType == null) 
-			return CANCEL;
-		
-		try {
-			elements= searchTestMethods(fElement, testType);
-		} catch (InterruptedException e) {
-			return CANCEL;
-		} catch (InvocationTargetException e) {
-			MessageDialog.openError(getParentShell(), JUnitMessages.getString("TestMethodSelectionDialog.error.title"), e.getTargetException().getMessage()); //$NON-NLS-1$
-			return CANCEL;
-		}
-		
-		if (elements.length == 0) {
-			String msg= JUnitMessages.getFormattedString("TestMethodSelectionDialog.notfound_message", fElement.getElementName()); //$NON-NLS-1$
-			MessageDialog.openInformation(getParentShell(), JUnitMessages.getString("TestMethodSelectionDialog.no_tests.title"), msg); //$NON-NLS-1$
-			return CANCEL;
-		}
-		setElements(elements);
-		return super.open();
-	}
-	
-	private IType findTestType() {
-		String qualifiedName= JUnitPlugin.TEST_INTERFACE_NAME;
-		IJavaProject[] projects;
-		Set result= new HashSet();
-		try {
-			projects= JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()).getJavaProjects();
-			for (int i= 0; i < projects.length; i++) {
-				IJavaProject project= projects[i];
-				IType type= project.findType(qualifiedName);
-				if (type != null) 
-					result.add(type);
-			}
-		} catch (JavaModelException e) {
-			ErrorDialog.openError(getParentShell(), JUnitMessages.getString("TestMethodSelectionDialog.error.notfound.title"), JUnitMessages.getString("TestMethodSelectionDialog.error.notfound.message"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			return null;
-		}
-		if (result.size() == 0) {
-			String msg= JUnitMessages.getFormattedString("TestMethodSelectionDialog.test_not_found", JUnitPlugin.TEST_INTERFACE_NAME); //$NON-NLS-1$
-			MessageDialog.openError(getParentShell(), JUnitMessages.getString("TestMethodSelectionDialog.select_dialog.title"), msg); //$NON-NLS-1$
-			return null;
-		}
-		if (result.size() == 1)
-			return (IType)result.toArray()[0];
-		
-		return selectTestType(result);
-	}
-	
-	private IType selectTestType(Set result) {
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_PARAMETERS | JavaElementLabelProvider.SHOW_ROOT);
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getParentShell(), labelProvider);
-		dialog.setTitle(JUnitMessages.getString("TestMethodSelectionDialog.dialog.title"));  //$NON-NLS-1$
-		String msg= JUnitMessages.getFormattedString("TestMethodSelectionDialog.testproject", "junit.framework.Test"); //$NON-NLS-1$ //$NON-NLS-2$
-		dialog.setMessage(msg);
-		IJavaProject[] projects= new IJavaProject[result.size()];
-		IType[] testTypes= (IType[]) result.toArray(new IType[result.size()]);
-		for (int i= 0; i < projects.length; i++) 
-			projects[i]= testTypes[i].getJavaProject();
-		dialog.setElements(projects);
-		if (dialog.open() == Window.CANCEL)	
-			return null;
-		IJavaProject project= (IJavaProject) dialog.getFirstResult();
-		for (int i= 0; i < testTypes.length; i++) {
-			if (testTypes[i].getJavaProject().equals(project))
-				return testTypes[i];
-		}
-		return null;	
-	}
-	
-	public Object[] searchTestMethods(final IJavaElement element, final IType testType) throws InvocationTargetException, InterruptedException  {
-		final TestReferenceCollector[] col= new TestReferenceCollector[1];
-		
-		IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			public void run(IProgressMonitor pm) throws InvocationTargetException {
-				try {
-					col[0]= doSearchTestMethods(element, testType, pm);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
-			}
-		};
-		PlatformUI.getWorkbench().getProgressService().busyCursorWhile(runnable);
-		return col[0].getResult();
-	}
-
-	private TestReferenceCollector doSearchTestMethods(IJavaElement element, IType testType, IProgressMonitor pm) throws CoreException{
-		SearchPattern pattern= SearchPattern.createPattern(element, IJavaSearchConstants.REFERENCES);
-		SearchParticipant[] participants= new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()};
-		IJavaSearchScope scope= SearchEngine.createHierarchyScope(testType);
-		TestReferenceCollector requestor= new TestReferenceCollector();
-		new SearchEngine().search(pattern, participants, scope, requestor, pm);
-		return requestor;
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunInfo.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunInfo.java
deleted file mode 100644
index e4c7678..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunInfo.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-/**
- * Store information about an executed test.
- */
-public class TestRunInfo extends Object {
-	private String fTestId;
-	private String fTestName;
-	private String fTrace;
-	private String fExpected;
-	private String fActual;
-	
-	private int fStatus;
-
-	public TestRunInfo(String testId, String testName){
-		fTestName= testName;
-		fTestId= testId;
-	}	
-	
-	/*
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		return getTestId().hashCode();
-	}
-
-	/*
-	 * @see Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-		return getTestId().equals(obj);
-	}
-
-	public String getTestId() {
-		return fTestId;
-	}
-
-	public String getTestName() {
-		return fTestName;
-	}
-
-	public String getClassName() {
-		return extractClassName(getTestName());
-	}
-	
-	public String getTestMethodName() {
-		int index= fTestName.indexOf('(');
-		if (index > 0)
-			return fTestName.substring(0, index);
-		index= fTestName.indexOf('@');
-		if(index > 0)
-			return fTestName.substring(0, index);
-		return fTestName;
-	}
-	
-	private String extractClassName(String testNameString) {
-		if (testNameString == null) 
-			return null;
-		int index= testNameString.indexOf('(');
-		if (index < 0) 
-			return testNameString;
-		testNameString= testNameString.substring(index + 1);
-		return testNameString.substring(0, testNameString.indexOf(')'));
-	}		
-
-	public void setTrace(String trace) {
-		fTrace= trace;
-	}
-
-	public String getTrace() {
-		return fTrace;
-	}
-
-	public void setStatus(int status) {
-		fStatus= status;
-	}
-
-	public int getStatus() {
-		return fStatus;
-	}
-	
-    public String getActual() {
-        return fActual;
-    }
-    
-    public void setActual(String actual) {
-        fActual = actual;
-    }
-    
-    public String getExpected() {
-        return fExpected;
-    }
-    
-    public void setExpected(String expected) {
-        fExpected = expected;
-    }
-    
-    public boolean isComparisonFailure() {
-        return fExpected != null && fActual != null;
-    }
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunTab.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunTab.java
deleted file mode 100644
index 7557fc4..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunTab.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.dnd.Clipboard;
-
-
-/**
- * A TestRunTab is shown as a tab in a tabbed folder.
- */
-public abstract class TestRunTab {
-	
-	/**
-	 * Create the tab control
-	 * @param tabFolder the containing tab folder
-	 * @param clipboard the clipboard to be used by the tab
-	 * @param runner the testRunnerViewPart containing the tab folder
-	 */
-	public abstract void createTabControl(CTabFolder tabFolder, Clipboard clipboard, TestRunnerViewPart runner);
-	
-	/**
-	 * Returns the name of the currently selected Test in the View
-	 */
-	public abstract String getSelectedTestId();
-
-	/**
-	 * Activates the TestRunView
-	 */
-	public void activate() {
-	}
-	
-	/**
-	 * Sets the focus in the TestRunView
-	 */
-	public void setFocus() {
-	}
-	
-	/**
-	 * Informs that the suite is about to start 
-	 */
-	public void aboutToStart() { 
-	}
-
-	/**
-	 * Informs that the suite is about to start 
-	 */
-	public void aboutToEnd() {
-	}
-	
-	/**
-	 * Returns the name of the RunView
-	 */
-	public abstract String getName();
-	
-	/**
-	 * Sets the current Test in the View
-	 */
-	public void setSelectedTest(String testId) {
-	}
-	
-	/**
-	 * A test has started
-	 */
-	public void startTest(String testId) {
-	}
-
-	/**
-	 * A test has ended
-	 */
-	public void endTest(String testId) {
-	}
-	
-	/**
-	 * The status of a test has changed
-	 */
-	public void testStatusChanged(TestRunInfo newInfo) {
-	}
-	/**
-	 * A new tree entry got posted.
-	 */
-	public void newTreeEntry(String treeEntry) {
-	}
-	
-	/**
-	 * Select next test failure.
-	 */
-	public void selectNext() {
-	}
-	
-	/**
-	 * Select previous test failure.
-	 */
-	public void selectPrevious() {
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
deleted file mode 100644
index 68aa623..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
+++ /dev/null

@@ -1,1357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Julien Ruaux: jruaux@octo.com see bug 25324 Ability to know when tests are finished [junit] 
- *     Vincent Massol: vmassol@octo.com 25324 Ability to know when tests are finished [junit]
- *     Sebastian Davids: sdavids@gmx.de 35762 JUnit View wasting a lot of screen space [JUnit]
- ******************************************************************************/
-package org.eclipse.jdt.internal.junit.ui;
-
-import java.net.MalformedURLException;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.junit.launcher.JUnitBaseLaunchConfiguration;
-import org.eclipse.jdt.junit.ITestRunListener;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.progress.UIJob;
-
-/**
- * A ViewPart that shows the results of a test run.
- */
-public class TestRunnerViewPart extends ViewPart implements ITestRunListener3, IPropertyChangeListener {
-
-	public static final String NAME= "org.eclipse.jdt.junit.ResultView"; //$NON-NLS-1$
-	public static final String ID_EXTENSION_POINT_TESTRUN_TABS= JUnitPlugin.PLUGIN_ID + "." + "internal-testRunTabs"; //$NON-NLS-1$ //$NON-NLS-2$
-
-	static final int REFRESH_INTERVAL= 200;
- 	/**
- 	 * Number of executed tests during a test run
- 	 */
-	protected volatile int fExecutedTests;
-	/**
-	 * Number of errors during this test run
-	 */
-	protected volatile int fErrorCount;
-	/**
-	 * Number of failures during this test run
-	 */
-	protected volatile int fFailureCount;
-	/**
-	 * Number of tests run
-	 */
-	protected volatile int fTestCount;
-	/**
-	 * Whether the output scrolls and reveals tests as they are executed.
-	 */
-	protected boolean fAutoScroll = true;
-	/**
-	 * The current orientation; either <code>VIEW_ORIENTATION_HORIZONTAL</code>
-	 * <code>VIEW_ORIENTATION_VERTICAL</code>, or <code>VIEW_ORIENTATION_AUTOMATIC</code>.
-	 */
-	private int fOrientation= VIEW_ORIENTATION_AUTOMATIC;
-	/**
-	 * The current orientation; either <code>VIEW_ORIENTATION_HORIZONTAL</code>
-	 * <code>VIEW_ORIENTATION_VERTICAL</code>.
-	 */
-	private int fCurrentOrientation;
-	/**
-	 * Map storing TestInfos for each executed test keyed by
-	 * the test name.
-	 */
-	private Map fTestInfos= new HashMap();
-	/**
-	 * The first failure of a test run. Used to reveal the
-	 * first failed tests at the end of a run.
-	 */
-	private List fFailures= new ArrayList();
-	private boolean fTestIsRunning= false;
-
-	protected JUnitProgressBar fProgressBar;
-	protected ProgressImages fProgressImages;
-	protected Image fViewImage;
-	protected CounterPanel fCounterPanel;
-	protected boolean fShowOnErrorOnly= false;
-	protected Clipboard fClipboard;
-	protected volatile String fStatus;
-
-	/** 
-	 * The tab that shows the stack trace of a failure
-	 */
-	private FailureTrace fFailureTrace;
-	/** 
-	 * The collection of ITestRunTabs
-	 */
-	protected Vector fTestRunTabs = new Vector();
-	/**
-	 * The currently active run tab
-	 */
-	private TestRunTab fActiveRunTab;
-	/**
-	 * Is the UI disposed
-	 */
-	private boolean fIsDisposed= false;
-	/**
-	 * The launched project
-	 */
-	private IJavaProject fTestProject;
-	/**
-	 * The launcher that has started the test
-	 */
-	private String fLaunchMode;
-	private ILaunch fLastLaunch;
-	
-	/**
-	 * Actions
-	 */
-	private Action fRerunLastTestAction;
-	private ScrollLockAction fScrollLockAction;
-	private ToggleOrientationAction[] fToggleOrientationActions;
-	
-	/**
-	 * The client side of the remote test runner
-	 */
-	private RemoteTestRunnerClient fTestRunnerClient;
-
-	final Image fStackViewIcon= TestRunnerViewPart.createImage("eview16/stackframe.gif");//$NON-NLS-1$
-	final Image fTestRunOKIcon= TestRunnerViewPart.createImage("eview16/junitsucc.gif"); //$NON-NLS-1$
-	final Image fTestRunFailIcon= TestRunnerViewPart.createImage("eview16/juniterr.gif"); //$NON-NLS-1$
-	final Image fTestRunOKDirtyIcon= TestRunnerViewPart.createImage("eview16/junitsuccq.gif"); //$NON-NLS-1$
-	final Image fTestRunFailDirtyIcon= TestRunnerViewPart.createImage("eview16/juniterrq.gif"); //$NON-NLS-1$
-	
-	// Persistence tags.
-	static final String TAG_PAGE= "page"; //$NON-NLS-1$
-	static final String TAG_RATIO= "ratio"; //$NON-NLS-1$
-	static final String TAG_TRACEFILTER= "tracefilter"; //$NON-NLS-1$ 
-	static final String TAG_ORIENTATION= "orientation"; //$NON-NLS-1$
-	static final String TAG_SCROLL= "scroll"; //$NON-NLS-1$
-	
-	//orientations
-	static final int VIEW_ORIENTATION_VERTICAL= 0;
-	static final int VIEW_ORIENTATION_HORIZONTAL= 1;
-	static final int VIEW_ORIENTATION_AUTOMATIC= 2;
-	
-	private IMemento fMemento;	
-
-	Image fOriginalViewImage;
-	IElementChangedListener fDirtyListener;
-	
-	
-	private CTabFolder fTabFolder;
-	private SashForm fSashForm;
-	
-	private Action fNextAction;
-	private Action fPreviousAction;
-	private Composite fCounterComposite;
-	private Composite fParent;
-	private UpdateUIJob fUpdateJob;
-
-	private StopAction fStopAction;
-	protected boolean fPartIsVisible= false;
-
-
-	private class StopAction extends Action {
-		public StopAction() {
-			setText(JUnitMessages.getString("TestRunnerViewPart.stopaction.text"));//$NON-NLS-1$
-			setToolTipText(JUnitMessages.getString("TestRunnerViewPart.stopaction.tooltip"));//$NON-NLS-1$
-			setDisabledImageDescriptor(JUnitPlugin.getImageDescriptor("dlcl16/stop.gif")); //$NON-NLS-1$
-			setHoverImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/stop.gif")); //$NON-NLS-1$
-			setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/stop.gif")); //$NON-NLS-1$
-		}
-
-		public void run() {
-			stopTest();
-			setEnabled(false);
-		}
-	}
-
-	private class RerunLastAction extends Action {
-		public RerunLastAction() {
-			setText(JUnitMessages.getString("TestRunnerViewPart.rerunaction.label")); //$NON-NLS-1$
-			setToolTipText(JUnitMessages.getString("TestRunnerViewPart.rerunaction.tooltip")); //$NON-NLS-1$
-			setDisabledImageDescriptor(JUnitPlugin.getImageDescriptor("dlcl16/relaunch.gif")); //$NON-NLS-1$
-			setHoverImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/relaunch.gif")); //$NON-NLS-1$
-			setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/relaunch.gif")); //$NON-NLS-1$
-		}
-		
-		public void run(){
-			rerunTestRun();
-		}
-	}
-	
-	private class ToggleOrientationAction extends Action {
-		private final int fActionOrientation;
-		
-		public ToggleOrientationAction(TestRunnerViewPart v, int orientation) {
-			super("", AS_RADIO_BUTTON); //$NON-NLS-1$
-			if (orientation == TestRunnerViewPart.VIEW_ORIENTATION_HORIZONTAL) {
-				setText(JUnitMessages.getString("TestRunnerViewPart.toggle.horizontal.label")); //$NON-NLS-1$
-				setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/th_horizontal.gif")); //$NON-NLS-1$				
-			} else if (orientation == TestRunnerViewPart.VIEW_ORIENTATION_VERTICAL) {
-				setText(JUnitMessages.getString("TestRunnerViewPart.toggle.vertical.label")); //$NON-NLS-1$
-				setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/th_vertical.gif")); //$NON-NLS-1$				
-			} else if (orientation == TestRunnerViewPart.VIEW_ORIENTATION_AUTOMATIC) {
-				setText(JUnitMessages.getString("TestRunnerViewPart.toggle.automatic.label"));  //$NON-NLS-1$
-				setImageDescriptor(JUnitPlugin.getImageDescriptor("elcl16/th_automatic.gif")); //$NON-NLS-1$				
-			}
-			fActionOrientation= orientation;
-			WorkbenchHelp.setHelp(this, IJUnitHelpContextIds.RESULTS_VIEW_TOGGLE_ORIENTATION_ACTION);
-		}
-		
-		public int getOrientation() {
-			return fActionOrientation;
-		}
-		
-		public void run() {
-			if (isChecked()) {
-				fOrientation= fActionOrientation;
-				computeOrientation();
-			}
-		}		
-	}
-
-	/**
-	 * Listen for for modifications to Java elements
-	 */
-	private class DirtyListener implements IElementChangedListener {
-		public void elementChanged(ElementChangedEvent event) {
-			processDelta(event.getDelta());				
-		}
-		
-		private boolean processDelta(IJavaElementDelta delta) {
-			int kind= delta.getKind();
-			int details= delta.getFlags();
-			int type= delta.getElement().getElementType();
-			
-			switch (type) {
-				// Consider containers for class files.
-				case IJavaElement.JAVA_MODEL:
-				case IJavaElement.JAVA_PROJECT:
-				case IJavaElement.PACKAGE_FRAGMENT_ROOT:
-				case IJavaElement.PACKAGE_FRAGMENT:
-					// If we did some different than changing a child we flush the the undo / redo stack.
-					if (kind != IJavaElementDelta.CHANGED || details != IJavaElementDelta.F_CHILDREN) {
-						codeHasChanged();
-						return false;
-					}
-					break;
-				case IJavaElement.COMPILATION_UNIT:
-					// if we have changed a primary working copy (e.g created, removed, ...)
-					// then we do nothing.
-					if ((details & IJavaElementDelta.F_PRIMARY_WORKING_COPY) != 0) 
-						return true;
-					codeHasChanged();
-					return false;
-					
-				case IJavaElement.CLASS_FILE:
-					// Don't examine children of a class file but keep on examining siblings.
-					return true;
-				default:
-					codeHasChanged();
-					return false;	
-			}
-				
-			IJavaElementDelta[] affectedChildren= delta.getAffectedChildren();
-			if (affectedChildren == null)
-				return true;
-	
-			for (int i= 0; i < affectedChildren.length; i++) {
-				if (!processDelta(affectedChildren[i]))
-					return false;
-			}
-			return true;			
-		}
-	}
-	
-	private IPartListener2 fPartListener= new IPartListener2() {
-		public void partActivated(IWorkbenchPartReference ref) {
-		}
-		public void partBroughtToTop(IWorkbenchPartReference ref) {
-		}
-	 	public void partInputChanged(IWorkbenchPartReference ref) {
-	 	}
-		public void partClosed(IWorkbenchPartReference ref) {
-		}
-		public void partDeactivated(IWorkbenchPartReference ref) {
-		}
-		public void partOpened(IWorkbenchPartReference ref) {
-		}
-		public void partVisible(IWorkbenchPartReference ref) {
-			if (getSite().getId().equals(ref.getId())) {
-				fPartIsVisible= true;
-			}
-		}
-		public void partHidden(IWorkbenchPartReference ref) {
-			if (getSite().getId().equals(ref.getId())) {
-				fPartIsVisible= false;
-			}
-		}
-	};
-
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-		fMemento= memento;
-	}
-
-	private void restoreLayoutState(IMemento memento) {
-		Integer page= memento.getInteger(TAG_PAGE);
-		if (page != null) {
-			int p= page.intValue();
-			fTabFolder.setSelection(p);
-			fActiveRunTab= (TestRunTab)fTestRunTabs.get(p);
-		}
-		Integer ratio= memento.getInteger(TAG_RATIO);
-		if (ratio != null) 
-			fSashForm.setWeights(new int[] { ratio.intValue(), 1000 - ratio.intValue()} );
-		Integer orientation= memento.getInteger(TAG_ORIENTATION);
-		if (orientation != null)
-			fOrientation= orientation.intValue();
-		computeOrientation();
-		String scrollLock= memento.getString(TAG_SCROLL);
-		if (scrollLock != null) {
-			fScrollLockAction.setChecked(scrollLock.equals("true")); //$NON-NLS-1$
-			setAutoScroll(!fScrollLockAction.isChecked());
-		}
-	}
-	
-	/**
-	 * Stops the currently running test and shuts down the RemoteTestRunner
-	 */
-	public void stopTest() {
-		if (fTestRunnerClient != null)
-			fTestRunnerClient.stopTest();
-		stopUpdateJob();
-	}
-
-	/**
-	 * Stops the currently running test and shuts down the RemoteTestRunner
-	 */
-	public void rerunTestRun() {
-		if (lastLaunchIsKeptAlive()) {
-			// prompt for terminating the existing run
-			if (MessageDialog.openQuestion(getSite().getShell(), JUnitMessages.getString("TestRunnerViewPart.terminate.title"), JUnitMessages.getString("TestRunnerViewPart.terminate.message"))) {  //$NON-NLS-1$ //$NON-NLS-2$
-				if (fTestRunnerClient != null)
-					fTestRunnerClient.stopTest();
-			}
-		}
-		if (fLastLaunch != null && fLastLaunch.getLaunchConfiguration() != null) {
-			DebugUITools.launch(fLastLaunch.getLaunchConfiguration(), fLastLaunch.getLaunchMode());
-		}
-	}
-
-	public void setAutoScroll(boolean scroll) {
-		fAutoScroll = scroll;
-	}
-	
-	public boolean isAutoScroll() {
-		return fAutoScroll;
-	}	
-
-	/*
-	 * @see ITestRunListener#testRunStarted(testCount)
-	 */
-	public void testRunStarted(final int testCount){
-		reset(testCount);
-		fShowOnErrorOnly= JUnitPreferencePage.getShowOnErrorOnly();
-		fExecutedTests++;
-		stopUpdateJob();
-		fUpdateJob= new UpdateUIJob(JUnitMessages.getString("TestRunnerViewPart.jobName")); //$NON-NLS-1$  
-		fUpdateJob.schedule(REFRESH_INTERVAL);
-	}
-	
-	public void selectNextFailure() {
-		fActiveRunTab.selectNext();
-	}
-	
-	public void selectPreviousFailure() {
-		fActiveRunTab.selectPrevious();
-	}
-
-	public void showTest(TestRunInfo test) {
-		fActiveRunTab.setSelectedTest(test.getTestId());
-		handleTestSelected(test.getTestId());
-		new OpenTestAction(this, test.getClassName(), test.getTestMethodName()).run();
-	}
-
-	
-	public void reset(){
-		reset(0);
-		setViewPartTitle(null);
-		clearStatus();
-		resetViewIcon();
-	}
-
-	/*
-	 * @see ITestRunListener#testRunEnded
-	 */
-	public void testRunEnded(long elapsedTime){
-		fExecutedTests--;
-		String[] keys= {elapsedTimeAsString(elapsedTime)};
-		String msg= JUnitMessages.getFormattedString("TestRunnerViewPart.message.finish", keys); //$NON-NLS-1$
-		if (hasErrorsOrFailures())
-			postError(msg);
-		else
-			setInfoMessage(msg);
-			
-		postSyncRunnable(new Runnable() {				
-			public void run() {
-				if(isDisposed()) 
-					return;	
-				fStopAction.setEnabled(lastLaunchIsKeptAlive());
-				if (fFailures.size() > 0) {
-					selectFirstFailure();
-				}
-				updateViewIcon();
-				if (fDirtyListener == null) {
-					fDirtyListener= new DirtyListener();
-					JavaCore.addElementChangedListener(fDirtyListener);
-				}
-				for (Enumeration e= fTestRunTabs.elements(); e.hasMoreElements();) {
-					TestRunTab v= (TestRunTab) e.nextElement();
-					v.aboutToEnd();
-				}
-			}
-		});	
-		stopUpdateJob();
-	}
-
-	private void stopUpdateJob() {
-		if (fUpdateJob != null) {
-			fUpdateJob.stop();
-			fUpdateJob= null;
-		}
-	}
-
-	protected void selectFirstFailure() {
-		TestRunInfo firstFailure= (TestRunInfo)fFailures.get(0);
-		if (firstFailure != null && fActiveRunTab.getSelectedTestId() == null) {
-			fActiveRunTab.setSelectedTest(firstFailure.getTestId());
-			handleTestSelected(firstFailure.getTestId());
-		}
-	}
-
-	private void updateViewIcon() {
-		if (hasErrorsOrFailures()) 
-			fViewImage= fTestRunFailIcon;
-		else 
-			fViewImage= fTestRunOKIcon;
-		firePropertyChange(IWorkbenchPart.PROP_TITLE);	
-	}
-
-	private boolean hasErrorsOrFailures() {
-		return fErrorCount+fFailureCount > 0;
-	}
-
-	private String elapsedTimeAsString(long runTime) {
-		return NumberFormat.getInstance().format((double)runTime/1000);
-	}
-
-	/*
-	 * @see ITestRunListener#testRunStopped
-	 */
-	public void testRunStopped(final long elapsedTime) {
-		String msg= JUnitMessages.getString("TestRunnerViewPart.message.stopped"); //$NON-NLS-1$ 
-		setInfoMessage(msg);
-		handleStopped();
-	}
-
-	private void handleStopped() {
-		postSyncRunnable(new Runnable() {				
-			public void run() {
-				if(isDisposed()) 
-					return;	
-				resetViewIcon();
-				fStopAction.setEnabled(false);
-				fProgressBar.stopped();
-			}
-		});	
-		stopUpdateJob();
-	}
-
-	private void resetViewIcon() {
-		fViewImage= fOriginalViewImage;
-		firePropertyChange(IWorkbenchPart.PROP_TITLE);
-	}
-
-	/*
-	 * @see ITestRunListener#testRunTerminated
-	 */
-	public void testRunTerminated() {
-		String msg= JUnitMessages.getString("TestRunnerViewPart.message.terminated"); //$NON-NLS-1$
-		showMessage(msg);
-		handleStopped(); 
-	}
-
-	private void showMessage(String msg) {
-		//showInformation(msg);
-		postError(msg);
-	}
-
-	/*
-	 * @see ITestRunListener#testStarted
-	 */
-	public void testStarted(String testId, String testName) {
-		fTestIsRunning= true;
-		postStartTest(testId, testName);
-		// reveal the part when the first test starts
-		if (!fShowOnErrorOnly && fExecutedTests == 1) 
-			postShowTestResultsView();
-			
-		TestRunInfo testInfo= getTestInfo(testId);
-		if (testInfo == null) {
-			testInfo= new TestRunInfo(testId, testName);
-			fTestInfos.put(testId, testInfo);
-		}
-		String className= testInfo.getClassName();
-		String method= testInfo.getTestMethodName();		
-		String status= JUnitMessages.getFormattedString("TestRunnerViewPart.message.started", new String[] { className, method }); //$NON-NLS-1$
-		setInfoMessage(status); 
-	}
-	
-	/*
-	 * @see ITestRunListener#testEnded
-	 */
-	public void testEnded(String testId, String testName){
-		postEndTest(testId, testName);
-		fExecutedTests++;
-	}
-
-	/*
-	 * @see ITestRunListener#testFailed
-	 */
-	public void testFailed(int status, String testId, String testName, String trace){
-		testFailed(status, testId, testName, trace, null, null);
-	}
-
-	/*
-	 * @see ITestRunListener#testFailed
-	 */
-	public void testFailed(int status, String testId, String testName, String trace, String expected, String actual) {
-	    TestRunInfo testInfo= getTestInfo(testId);
-	    if (testInfo == null) {
-	        testInfo= new TestRunInfo(testId, testName);
-	        fTestInfos.put(testId, testInfo);
-	    }
-	    testInfo.setTrace(trace);
-	    testInfo.setStatus(status);
-	    if (expected != null) {
-			testInfo.setExpected(expected.substring(0, expected.length()-1));
-		}
-	    if (actual != null)
-	        testInfo.setActual(actual.substring(0, actual.length()-1));
-	    
-	    if (status == ITestRunListener.STATUS_ERROR)
-	        fErrorCount++;
-	    else
-	        fFailureCount++;
-	    fFailures.add(testInfo);
-	    // show the view on the first error only
-	    if (fShowOnErrorOnly && (fErrorCount + fFailureCount == 1)) 
-	        postShowTestResultsView();
-	    
-	    // [Bug 35590] JUnit window doesn't report errors from junit.extensions.TestSetup [JUnit]
-	    // when a failure occurs in test setup then no test is running
-	    // to update the views we artificially signal the end of a test run
-	    if (!fTestIsRunning) {
-	    	fTestIsRunning= false;
-	    	testEnded(testId, testName);
-	    }
-	}
-	
-	/*
-	 * @see ITestRunListener#testReran
-	 */
-	public void testReran(String testId, String className, String testName, int status, String trace) {
-		if (status == ITestRunListener.STATUS_ERROR) {
-			String msg= JUnitMessages.getFormattedString("TestRunnerViewPart.message.error", new String[]{testName, className}); //$NON-NLS-1$
-			postError(msg); 
-		} else if (status == ITestRunListener.STATUS_FAILURE) {
-			String msg= JUnitMessages.getFormattedString("TestRunnerViewPart.message.failure", new String[]{testName, className}); //$NON-NLS-1$
-			postError(msg);
-		} else {
-			String msg= JUnitMessages.getFormattedString("TestRunnerViewPart.message.success", new String[]{testName, className}); //$NON-NLS-1$
-			setInfoMessage(msg);
-		}
-		TestRunInfo info= getTestInfo(testId);
-		updateTest(info, status);
-		if (info.getTrace() == null || !info.getTrace().equals(trace)) {
-			info.setTrace(trace);
-			showFailure(info);
-		}
-	}
-
-	public void testReran(String testId, String className, String testName, int statusCode, String trace, String expectedResult, String actualResult) {
-		testReran(testId, className, testName, statusCode, trace);
-		TestRunInfo info= getTestInfo(testId);
-		info.setActual(actualResult);
-		info.setExpected(expectedResult);
-		fFailureTrace.updateEnablement(info);
-	}
-	
-	private void updateTest(TestRunInfo info, final int status) {
-		if (status == info.getStatus())
-			return;
-		if (info.getStatus() == ITestRunListener.STATUS_OK) {
-			if (status == ITestRunListener.STATUS_FAILURE) 
-				fFailureCount++;
-			else if (status == ITestRunListener.STATUS_ERROR)
-				fErrorCount++;
-		} else if (info.getStatus() == ITestRunListener.STATUS_ERROR) {
-			if (status == ITestRunListener.STATUS_OK) 
-				fErrorCount--;
-			else if (status == ITestRunListener.STATUS_FAILURE) {
-				fErrorCount--;
-				fFailureCount++;
-			}
-		} else if (info.getStatus() == ITestRunListener.STATUS_FAILURE) {
-			if (status == ITestRunListener.STATUS_OK) 
-				fFailureCount--;
-			else if (status == ITestRunListener.STATUS_ERROR) {
-				fFailureCount--;
-				fErrorCount++;
-			}
-		}			
-		info.setStatus(status);	
-		final TestRunInfo finalInfo= info;
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				//refreshCounters();
-				for (Enumeration e= fTestRunTabs.elements(); e.hasMoreElements();) {
-					TestRunTab v= (TestRunTab) e.nextElement();
-					v.testStatusChanged(finalInfo);
-				}
-			}
-		});
-		
-	}
-
-	/*
-	 * @see ITestRunListener#testTreeEntry
-	 */
-	public void testTreeEntry(final String treeEntry){
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				if(isDisposed()) 
-					return;
-				for (Enumeration e= fTestRunTabs.elements(); e.hasMoreElements();) {
-					TestRunTab v= (TestRunTab) e.nextElement();
-					v.newTreeEntry(treeEntry);
-				}
-			}
-		});	
-	}
-
-	public void startTestRunListening(IJavaElement type, int port, ILaunch launch) {
-		fTestProject= type.getJavaProject();
-		fLaunchMode= launch.getLaunchMode();
-		aboutToLaunch();
-		
-		if (fTestRunnerClient != null) {
-			stopTest();
-		}
-		fTestRunnerClient= new RemoteTestRunnerClient();
-		
-		// add the TestRunnerViewPart to the list of registered listeners
-		List listeners= JUnitPlugin.getDefault().getTestRunListeners();	
-		ITestRunListener[] listenerArray= new ITestRunListener[listeners.size()+1];
-		listeners.toArray(listenerArray);
-		System.arraycopy(listenerArray, 0, listenerArray, 1, listenerArray.length-1);
-		listenerArray[0]= this;
-		fTestRunnerClient.startListening(listenerArray, port);
-		
-		fLastLaunch= launch;
-		setViewPartTitle(type);
-		if (type instanceof IType)
-			setTitleToolTip(((IType)type).getFullyQualifiedName());
-		else
-			setTitleToolTip(type.getElementName());
-			
-	}
-
-	private void setViewPartTitle(IJavaElement type) {
-		String title;
-		if (type == null)
-			title= " "; //$NON-NLS-1$
-		else	
-			title= type.getElementName();
-		setContentDescription(title);
-	}
-
-	protected void aboutToLaunch() {
-		String msg= JUnitMessages.getString("TestRunnerViewPart.message.launching"); //$NON-NLS-1$
-		//showInformation(msg);
-		setInfoMessage(msg);
-		fViewImage= fOriginalViewImage;
-		firePropertyChange(IWorkbenchPart.PROP_TITLE);
-	}
-
-	public synchronized void dispose(){
-		fIsDisposed= true;
-		stopTest();
-		if (fProgressImages != null)
-			fProgressImages.dispose();
-		JUnitPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
-		getViewSite().getPage().removePartListener(fPartListener);
-		fTestRunOKIcon.dispose();
-		fTestRunFailIcon.dispose();
-		fStackViewIcon.dispose();
-		fTestRunOKDirtyIcon.dispose();
-		fTestRunFailDirtyIcon.dispose();
-		if (fClipboard != null) 
-			fClipboard.dispose();
-	}
-
-	protected void start(final int total) {
-		resetProgressBar(total);
-		fCounterPanel.setTotal(total);
-		fCounterPanel.setRunValue(0);	
-	}
-
-	private void resetProgressBar(final int total) {
-		fProgressBar.reset();
-		fProgressBar.setMaximum(total);
-	}
-
-	private void postSyncRunnable(Runnable r) {
-		if (!isDisposed())
-			getDisplay().syncExec(r);
-	}
-
-	private void aboutToStart() {
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				if (!isDisposed()) {
-					for (Enumeration e= fTestRunTabs.elements(); e.hasMoreElements();) {
-						TestRunTab v= (TestRunTab) e.nextElement();
-						v.aboutToStart();
-					}
-					fNextAction.setEnabled(false);
-					fPreviousAction.setEnabled(false);
-				}
-			}
-		});
-	}
-	
-	private void postEndTest(final String testId, final String testName) {
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				if(isDisposed()) 
-					return;
-				handleEndTest();
-				for (Enumeration e= fTestRunTabs.elements(); e.hasMoreElements();) {
-					TestRunTab v= (TestRunTab) e.nextElement();
-					v.endTest(testId);
-				}
-				
-				if (fFailureCount + fErrorCount > 0) {
-					fNextAction.setEnabled(true);
-					fPreviousAction.setEnabled(true);
-				}
-			}
-		});	
-	}
-
-	private void postStartTest(final String testId, final String testName) {
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				if(isDisposed()) 
-					return;
-				for (Enumeration e= fTestRunTabs.elements(); e.hasMoreElements();) {
-					TestRunTab v= (TestRunTab) e.nextElement();
-					v.startTest(testId);
-				}
-			}
-		});	
-	}
-
-	private void handleEndTest() {
-		fTestIsRunning= false;
-		//refreshCounters();
-		fProgressBar.step(fFailureCount+fErrorCount);
-		if (!fPartIsVisible) 
-			updateViewTitleProgress();
-	}
-
-	private void updateViewTitleProgress() {
-		Image progress= fProgressImages.getImage(fExecutedTests, fTestCount, fErrorCount, fFailureCount);
-		if (progress != fViewImage) {
-			fViewImage= progress;
-			firePropertyChange(IWorkbenchPart.PROP_TITLE);
-		}
-	}
-
-	private void refreshCounters() {
-		fCounterPanel.setErrorValue(fErrorCount);
-		fCounterPanel.setFailureValue(fFailureCount);
-		fCounterPanel.setRunValue(fExecutedTests);
-		fProgressBar.refresh(fErrorCount+fFailureCount> 0);
-	}
-
-	protected void postShowTestResultsView() {
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				if (isDisposed()) 
-					return;
-				showTestResultsView();
-			}
-		});
-	}
-
-	public void showTestResultsView() {
-		IWorkbenchWindow window= getSite().getWorkbenchWindow();
-		IWorkbenchPage page= window.getActivePage();
-		TestRunnerViewPart testRunner= null;
-		
-		if (page != null) {
-			try { // show the result view
-				testRunner= (TestRunnerViewPart)page.findView(TestRunnerViewPart.NAME);
-				if(testRunner == null) {
-					IWorkbenchPart activePart= page.getActivePart();
-					testRunner= (TestRunnerViewPart)page.showView(TestRunnerViewPart.NAME);
-					//restore focus 
-					page.activate(activePart);
-				} else {
-					page.bringToTop(testRunner);
-				}
-			} catch (PartInitException pie) {
-				JUnitPlugin.log(pie);
-			}
-		}
-	}
-	
-	class UpdateUIJob extends UIJob {
-		private boolean fRunning= true; 
-		
-		public UpdateUIJob(String name) {
-			super(name);
-			setSystem(true);
-		}
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			if (!isDisposed()) { 
-				doShowStatus();
-				refreshCounters();
-			}
-			schedule(REFRESH_INTERVAL);
-			return Status.OK_STATUS;
-		}
-		
-		public void stop() {
-			fRunning= false;
-		}
-		public boolean shouldSchedule() {
-			return fRunning;
-		}
-		
-		
-	}
-
-	protected void doShowStatus() {
-		setContentDescription(fStatus);
-	}
-
-	protected void setInfoMessage(final String message) {
-		fStatus= message;
-	}
-
-	protected void postError(final String message) {
-		fStatus= message;
-	}
-
-	protected void showInformation(final String info){
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				if (!isDisposed())
-					fFailureTrace.setInformation(info);
-			}
-		});
-	}
-
-	protected CTabFolder createTestRunTabs(Composite parent) {
-		CTabFolder tabFolder= new CTabFolder(parent, SWT.TOP);
-		tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL));
-
-		loadTestRunTabs(tabFolder);
-		tabFolder.setSelection(0);				
-		fActiveRunTab= (TestRunTab)fTestRunTabs.firstElement();		
-				
-		tabFolder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				testTabChanged(event);
-			}
-		});
-		return tabFolder;
-	}
-
-	private void loadTestRunTabs(CTabFolder tabFolder) {
-		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(ID_EXTENSION_POINT_TESTRUN_TABS);
-		if (extensionPoint == null) {
-			return;
-		}
-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
-		MultiStatus status= new MultiStatus(JUnitPlugin.PLUGIN_ID, IStatus.OK, "Could not load some testRunTabs extension points", null); //$NON-NLS-1$ 	
-
-		for (int i= 0; i < configs.length; i++) {
-			try {
-				TestRunTab testRunTab= (TestRunTab) configs[i].createExecutableExtension("class"); //$NON-NLS-1$
-				testRunTab.createTabControl(tabFolder, fClipboard, this);
-				fTestRunTabs.addElement(testRunTab);
-			} catch (CoreException e) {
-				status.add(e.getStatus());
-			}
-		}
-		if (!status.isOK()) {
-			JUnitPlugin.log(status);
-		}
-	}
-
-	private void testTabChanged(SelectionEvent event) {
-		for (Enumeration e= fTestRunTabs.elements(); e.hasMoreElements();) {
-			TestRunTab v= (TestRunTab) e.nextElement();
-			if (((CTabFolder) event.widget).getSelection().getText() == v.getName()){
-				v.setSelectedTest(fActiveRunTab.getSelectedTestId());
-				fActiveRunTab= v;
-				fActiveRunTab.activate();
-			}
-		}
-	}
-
-	private SashForm createSashForm(Composite parent) {
-		fSashForm= new SashForm(parent, SWT.VERTICAL);
-		ViewForm top= new ViewForm(fSashForm, SWT.NONE);
-		fTabFolder= createTestRunTabs(top);
-		fTabFolder.setLayoutData(new TabFolderLayout());
-		top.setContent(fTabFolder);
-		
-		ViewForm bottom= new ViewForm(fSashForm, SWT.NONE);
-		CLabel label= new CLabel(bottom, SWT.NONE);
-		label.setText(JUnitMessages.getString("TestRunnerViewPart.label.failure")); //$NON-NLS-1$
-		label.setImage(fStackViewIcon);
-		bottom.setTopLeft(label);
-
-		ToolBar failureToolBar= new ToolBar(bottom, SWT.FLAT | SWT.WRAP);
-		bottom.setTopCenter(failureToolBar);
-		fFailureTrace= new FailureTrace(bottom, fClipboard, this, failureToolBar);
-		bottom.setContent(fFailureTrace.getComposite()); 
-		
-		fSashForm.setWeights(new int[]{50, 50});
-		return fSashForm;
-	}
-
-	private void reset(final int testCount) {
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				if (isDisposed()) 
-					return;
-				fCounterPanel.reset();
-				fFailureTrace.clear();
-				fProgressBar.reset();
-				fStopAction.setEnabled(true);
-				clearStatus();
-				start(testCount);
-			}
-		});
-		fExecutedTests= 0;
-		fFailureCount= 0;
-		fErrorCount= 0;
-		fTestCount= testCount;
-		aboutToStart();
-		fTestInfos.clear();
-		fFailures= new ArrayList();
-	}
-
-	private void clearStatus() {
-		getStatusLine().setMessage(null);
-		getStatusLine().setErrorMessage(null);
-	}
-
-    public void setFocus() {
-    	if (fActiveRunTab != null)
-    		fActiveRunTab.setFocus();
-    }
-
-    public void createPartControl(Composite parent) {	
-    	fParent= parent;
-    	addResizeListener(parent);
-		fClipboard= new Clipboard(parent.getDisplay());
-
-		GridLayout gridLayout= new GridLayout(); 
-		gridLayout.marginWidth= 0;
-		gridLayout.marginHeight= 0;
-		parent.setLayout(gridLayout);
-
-		configureToolBar();
-		
-		fCounterComposite= createProgressCountPanel(parent);
-		fCounterComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-		SashForm sashForm= createSashForm(parent);
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-		IActionBars actionBars= getViewSite().getActionBars();
-		actionBars.setGlobalActionHandler(
-			ActionFactory.COPY.getId(),
-			new CopyTraceAction(fFailureTrace, fClipboard));
-		
-		JUnitPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);
-		fOriginalViewImage= getTitleImage();
-		fProgressImages= new ProgressImages();
-		WorkbenchHelp.setHelp(parent, IJUnitHelpContextIds.RESULTS_VIEW);
-		
-		getViewSite().getPage().addPartListener(fPartListener);
-
-		if (fMemento != null) {
-			restoreLayoutState(fMemento);
-		}
-		fMemento= null;
-	}
-
-	private void addResizeListener(Composite parent) {
-		parent.addControlListener(new ControlListener() {
-			public void controlMoved(ControlEvent e) {
-			}
-			public void controlResized(ControlEvent e) {
-				computeOrientation();
-			}
-		});
-	}
-
-	void computeOrientation() {
-		if (fOrientation != VIEW_ORIENTATION_AUTOMATIC) {
-			fCurrentOrientation= fOrientation;
-			setOrientation(fCurrentOrientation);
-		}
-		else {
-			Point size= fParent.getSize();
-			if (size.x != 0 && size.y != 0) {
-				if (size.x > size.y) 
-					setOrientation(VIEW_ORIENTATION_HORIZONTAL);
-				else 
-					setOrientation(VIEW_ORIENTATION_VERTICAL);
-			}
-		}
-	}
-
-	public void saveState(IMemento memento) {
-		if (fSashForm == null) {
-			// part has not been created
-			if (fMemento != null) //Keep the old state;
-				memento.putMemento(fMemento);
-			return;
-		}
-		
-		int activePage= fTabFolder.getSelectionIndex();
-		memento.putInteger(TAG_PAGE, activePage);
-		memento.putString(TAG_SCROLL, fScrollLockAction.isChecked() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		int weigths[]= fSashForm.getWeights();
-		int ratio= (weigths[0] * 1000) / (weigths[0] + weigths[1]);
-		memento.putInteger(TAG_RATIO, ratio);
-		memento.putInteger(TAG_ORIENTATION, fOrientation);
-	}
-	
-	private void configureToolBar() {
-		IActionBars actionBars= getViewSite().getActionBars();
-		IToolBarManager toolBar= actionBars.getToolBarManager();
-		IMenuManager viewMenu = actionBars.getMenuManager();
-		fRerunLastTestAction= new RerunLastAction();
-		fScrollLockAction= new ScrollLockAction(this);
-		fToggleOrientationActions =
-			new ToggleOrientationAction[] {
-				new ToggleOrientationAction(this, VIEW_ORIENTATION_VERTICAL),
-				new ToggleOrientationAction(this, VIEW_ORIENTATION_HORIZONTAL),
-				new ToggleOrientationAction(this, VIEW_ORIENTATION_AUTOMATIC)};
-		fNextAction= new ShowNextFailureAction(this);
-		fPreviousAction= new ShowPreviousFailureAction(this);
-		fStopAction= new StopAction();
-		fNextAction.setEnabled(false);
-		fPreviousAction.setEnabled(false);
-		fStopAction.setEnabled(false);
-		actionBars.setGlobalActionHandler(ActionFactory.NEXT.getId(), fNextAction);
-		actionBars.setGlobalActionHandler(ActionFactory.PREVIOUS.getId(), fPreviousAction);
-		
-		toolBar.add(fNextAction);
-		toolBar.add(fPreviousAction);
-		toolBar.add(fStopAction);
-		toolBar.add(new Separator());
-		toolBar.add(fRerunLastTestAction);
-		toolBar.add(fScrollLockAction);
-
-		for (int i = 0; i < fToggleOrientationActions.length; ++i)
-			viewMenu.add(fToggleOrientationActions[i]);
-		
-		fScrollLockAction.setChecked(!fAutoScroll);
-
-		actionBars.updateActionBars();
-	}
-
-	private IStatusLineManager getStatusLine() {
-		// we want to show messages globally hence we
-		// have to go through the active part
-		IViewSite site= getViewSite();
-		IWorkbenchPage page= site.getPage();
-		IWorkbenchPart activePart= page.getActivePart();
-	
-		if (activePart instanceof IViewPart) {
-			IViewPart activeViewPart= (IViewPart)activePart;
-			IViewSite activeViewSite= activeViewPart.getViewSite();
-			return activeViewSite.getActionBars().getStatusLineManager();
-		}
-		
-		if (activePart instanceof IEditorPart) {
-			IEditorPart activeEditorPart= (IEditorPart)activePart;
-			IEditorActionBarContributor contributor= activeEditorPart.getEditorSite().getActionBarContributor();
-			if (contributor instanceof EditorActionBarContributor) 
-				return ((EditorActionBarContributor) contributor).getActionBars().getStatusLineManager();
-		}
-		// no active part
-		return getViewSite().getActionBars().getStatusLineManager();
-	}
-
-	protected Composite createProgressCountPanel(Composite parent) {
-		Composite composite= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		composite.setLayout(layout);
-		setCounterColumns(layout); 
-		
-		fCounterPanel = new CounterPanel(composite);
-		fCounterPanel.setLayoutData(
-			new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-		fProgressBar = new JUnitProgressBar(composite);
-		fProgressBar.setLayoutData(
-				new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-		return composite;
-	}
-
-	public TestRunInfo getTestInfo(String testId) {
-		if (testId == null)
-			return null;
-		return (TestRunInfo) fTestInfos.get(testId);
-	}
-
-	public void handleTestSelected(String testId) {
-		TestRunInfo testInfo= getTestInfo(testId);
-
-		if (testInfo == null) {
-			showFailure(null); //$NON-NLS-1$
-		} else {
-			showFailure(testInfo);
-		}
-	}
-
-	private void showFailure(final TestRunInfo failure) {
-		postSyncRunnable(new Runnable() {
-			public void run() {
-				if (!isDisposed())
-					fFailureTrace.showFailure(failure);
-			}
-		});		
-	}
-
-	public IJavaProject getLaunchedProject() {
-		return fTestProject;
-	}
-	
-	public ILaunch getLastLaunch() {
-		return fLastLaunch;
-	}
-	
-	public static Image createImage(String path) {
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(JUnitPlugin.makeIconFileURL(path));
-			return id.createImage();
-		} catch (MalformedURLException e) {
-			// fall through
-		}  
-		return null;
-	}
-
-	private boolean isDisposed() {
-		return fIsDisposed || fCounterPanel.isDisposed();
-	}
-
-	private Display getDisplay() {
-		return getViewSite().getShell().getDisplay();
-	}
-	/**
-	 * @see IWorkbenchPart#getTitleImage()
-	 */
-	public Image getTitleImage() {
-		if (fOriginalViewImage == null)
-			fOriginalViewImage= super.getTitleImage();
-			
-		if (fViewImage == null)
-			return super.getTitleImage();
-		return fViewImage;
-	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		if (isDisposed())
-			return;
-
-		if (IJUnitPreferencesConstants.SHOW_ON_ERROR_ONLY.equals(event.getProperty())) {
-			if (!JUnitPreferencePage.getShowOnErrorOnly()) {
-				fViewImage= fOriginalViewImage;
-				firePropertyChange(IWorkbenchPart.PROP_TITLE);
-			}
-		}
-	}
-
-	void codeHasChanged() {
-		if (fDirtyListener != null) {
-			JavaCore.removeElementChangedListener(fDirtyListener);
-			fDirtyListener= null;
-		}
-		if (fViewImage == fTestRunOKIcon) 
-			fViewImage= fTestRunOKDirtyIcon;
-		else if (fViewImage == fTestRunFailIcon)
-			fViewImage= fTestRunFailDirtyIcon;
-		
-		Runnable r= new Runnable() {
-			public void run() {
-				if (isDisposed())
-					return;
-				firePropertyChange(IWorkbenchPart.PROP_TITLE);
-			}
-		};
-		if (!isDisposed())
-			getDisplay().asyncExec(r);
-	}
-	
-	boolean isCreated() {
-		return fCounterPanel != null;
-	}
-
-	public void rerunTest(String testId, String className, String testName, String launchMode) {
-		DebugUITools.saveAndBuildBeforeLaunch();
-		if (lastLaunchIsKeptAlive())
-			fTestRunnerClient.rerunTest(testId, className, testName);
-		else if (fLastLaunch != null) {
-			// run the selected test using the previous launch configuration
-			ILaunchConfiguration launchConfiguration= fLastLaunch.getLaunchConfiguration();
-			if (launchConfiguration != null) {
-				try {
-					String name= className;
-					if (testName != null) 
-						name+= "."+testName; //$NON-NLS-1$
-					String configName= JUnitMessages.getFormattedString("TestRunnerViewPart.configName", name); //$NON-NLS-1$
-					ILaunchConfigurationWorkingCopy tmp= launchConfiguration.copy(configName); 
-					// fix for bug: 64838  junit view run single test does not use correct class [JUnit] 
-					tmp.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, className);
-					// reset the container
-					tmp.setAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, ""); //$NON-NLS-1$
-					if (testName != null) {
-						tmp.setAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR, testName);
-						//	String args= "-rerun "+testId;
-						//	tmp.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args);
-					}
-					tmp.launch(launchMode, null);	
-					return;	
-				} catch (CoreException e) {
-					ErrorDialog.openError(getSite().getShell(), 
-						JUnitMessages.getString("TestRunnerViewPart.error.cannotrerun"), e.getMessage(), e.getStatus() //$NON-NLS-1$
-					);
-				}
-			}
-			MessageDialog.openInformation(getSite().getShell(), 
-				JUnitMessages.getString("TestRunnerViewPart.cannotrerun.title"),  //$NON-NLS-1$
-				JUnitMessages.getString("TestRunnerViewPart.cannotrerurn.message") //$NON-NLS-1$
-			); 
-		}
-	}
-	
-	public boolean lastLaunchIsKeptAlive() {
-		return fTestRunnerClient != null && fTestRunnerClient.isRunning() && ILaunchManager.DEBUG_MODE.equals(fLaunchMode);
-	}
-
-	private void setOrientation(int orientation) {
-		if ((fSashForm == null) || fSashForm.isDisposed())
-			return;
-		boolean horizontal = orientation == VIEW_ORIENTATION_HORIZONTAL;
-		fSashForm.setOrientation(horizontal ? SWT.HORIZONTAL : SWT.VERTICAL);
-		for (int i = 0; i < fToggleOrientationActions.length; ++i)
-			fToggleOrientationActions[i].setChecked(fOrientation == fToggleOrientationActions[i].getOrientation());
-		fCurrentOrientation = orientation;
-		GridLayout layout= (GridLayout) fCounterComposite.getLayout();
-		setCounterColumns(layout); 
-		fParent.layout();
-	}
-
-	private void setCounterColumns(GridLayout layout) {
-		if (fCurrentOrientation == VIEW_ORIENTATION_HORIZONTAL)
-			layout.numColumns= 2; 
-		else
-			layout.numColumns= 1;
-	}
-
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
deleted file mode 100644
index 8de2adf..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
+++ /dev/null

@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.internal.junit.wizards.WizardMessages;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-
-/**
- * A dialog with checked table viewer.
- * 
- * TO DO: this class is duplicated from org.eclipse.jdt.ui
- */
-public class CheckedTableSelectionDialog extends SelectionStatusDialog {
-	
-	private CheckboxTableViewer fViewer;
-	
-	private ILabelProvider fLabelProvider;
-	private IStructuredContentProvider fContentProvider;
-	
-	private ISelectionStatusValidator fValidator= null; 
-	private ViewerSorter fSorter;
-	private String fEmptyListMessage= WizardMessages.getString("CheckedTableSelectionDialog.emptyListMessage"); //$NON-NLS-1$
-	
-	private IStatus fCurrStatus= new JUnitStatus();
-	private List fFilters;
-	private Object fInput;		
-	private boolean fIsEmpty;
-	
-	private int fWidth= 40;
-	private int fHeight= 18;
-	
-	/**
-	 * Constructs an instance of <code>ElementTreeSelectionDialog</code>.
-	 * @param labelProvider   the label provider to render the entries
-	 * @param contentProvider the content provider to evaluate the tree structure
-	 */	
-	public CheckedTableSelectionDialog(Shell parent, ILabelProvider labelProvider,
-		IStructuredContentProvider contentProvider) {
-		super(parent);
-		
-		fLabelProvider= labelProvider;
-		fContentProvider= contentProvider;
-
-		setResult(new ArrayList(0));
-		setStatusLineAboveButtons(true);
-	}
-
-	/**
-	 * Sets the initial selection.
-	 * Convenience method.
-	 * @param selection the initial selection.
-	 */
-	public void setInitialSelection(Object selection) {
-		setInitialSelections(new Object[] {selection});
-	}
-
-	/**
-	 * Sets the message to be displayed if the list is empty.
-	 * @param message the message to be displayed.
-	 */	
-	public void setEmptyListMessage(String message) {
-		fEmptyListMessage= message;
-	}	
-	
-	/**
-	 * Sets the sorter used by the tree viewer.
-	 */
-	public void setSorter(ViewerSorter sorter) {
-		fSorter= sorter;
-	}		
-	
-	/**
-	 * Adds a filter to the tree viewer.
-	 * @param filter a filter.
-	 */
-	public void addFilter(ViewerFilter filter) {
-		if (fFilters == null)
-			fFilters= new ArrayList(4);
-			
-		fFilters.add(filter);
-	}
-	
-	/**
-	 * Sets an optional validator to check if the selection is valid.
-	 * The validator is invoked whenever the selection changes.
-	 * @param validator the validator to validate the selection.
-	 */
-	public void setValidator(ISelectionStatusValidator validator) {
-		fValidator= validator;
-	}			
-	
-	/**
-	 * Sets the tree input.
-	 * @param input the tree input.
-	 */
-	public void setInput(Object input) {
-		fInput= input;
-	}
-
-	/**
-	 * Sets the size of the tree in unit of characters.
-	 * @param width  the width of the tree.
-	 * @param height the height of the tree.
-	 */
-	public void setSize(int width, int height) {
-		fWidth= width;
-		fHeight= height;
-	}
-
-	protected void updateOKStatus() {
-		if (!fIsEmpty) {
-			if (fValidator != null) {
-				fCurrStatus= fValidator.validate(fViewer.getCheckedElements());
-				updateStatus(fCurrStatus);
-			} else if (!fCurrStatus.isOK()) {
-				fCurrStatus= new JUnitStatus();
-			}
-		} else {
-			fCurrStatus= new JUnitStatus(IStatus.ERROR, fEmptyListMessage);
-		}
-		updateStatus(fCurrStatus);
-	}
-	
-	/*
-	 * @see Window#open()
-	 */	 
-	public int open() {
-		fIsEmpty= evaluateIfTableEmpty(fInput);
-		BusyIndicator.showWhile(null, new Runnable() {
-			public void run() {
-				access$superOpen();
-			}
-		});
-		return getReturnCode();
-	}
-
-	private void access$superOpen() {
-		super.open();
-	}	
-	 		
-	/**
-	 * Handles cancel button pressed event.
-	 */	 
-	protected void cancelPressed() {
-		setResult(null);
-		super.cancelPressed();
-	} 
-
-	/*
-	 * @see SelectionStatusDialog#computeResult()
-	 */	 
-	protected void computeResult() {
-		setResult(Arrays.asList(fViewer.getCheckedElements()));
-	} 
-	 
-	/*
-	 * @see Window#create()
-	 */	 
-	public void create() {
-		super.create();
-
-		List initialSelections= getInitialElementSelections();
-		if (initialSelections.size() > 0) {
-			fViewer.setCheckedElements(initialSelections.toArray());			
-		}
-			
-		updateOKStatus();
-	}		
-	
-	/*
-	 * @see Dialog#createDialogArea(Composite)
-	 */	 
-	protected Control createDialogArea(Composite parent) {
-		Composite composite= (Composite) super.createDialogArea(parent);
-		
-		Label messageLabel= createMessageArea(composite);
-		Control treeWidget= createTableViewer(composite);
-		Control buttonComposite= createSelectionButtons(composite);
-
-		GridData data= new GridData(GridData.FILL_BOTH);
-		data.widthHint= convertWidthInCharsToPixels(fWidth);
-		data.heightHint= convertHeightInCharsToPixels(fHeight);
-		treeWidget.setLayoutData(data);
-		
-		if (fIsEmpty) {
-			messageLabel.setEnabled(false);
-			treeWidget.setEnabled(false);
-			buttonComposite.setEnabled(false);
-		}
-		applyDialogFont(composite);
-		return composite;
-	}
-	
-	private Table createTableViewer(Composite parent) {
-		fViewer= CheckboxTableViewer.newCheckList(parent, SWT.BORDER);
-			
-		fViewer.setContentProvider(fContentProvider);
-		fViewer.setLabelProvider(fLabelProvider);
-		fViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				updateOKStatus();
-			}	
-		});
-		
-		fViewer.setSorter(fSorter);
-		if (fFilters != null) {
-			for (int i= 0; i != fFilters.size(); i++)
-				fViewer.addFilter((ViewerFilter) fFilters.get(i));
-		}
-				
-		fViewer.setInput(fInput);
-		return fViewer.getTable();	
-	}
-		
-	/**
-	 * Add the selection and deselection buttons to the dialog.
-	 * @param composite org.eclipse.swt.widgets.Composite
-	 */
-	private Composite createSelectionButtons(Composite composite) {
-		Composite buttonComposite= new Composite(composite, SWT.RIGHT);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		buttonComposite.setLayout(layout);
-		GridData data= new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.GRAB_HORIZONTAL);
-		data.grabExcessHorizontalSpace= true;
-		composite.setData(data);
-
-		Button selectButton= createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, WizardMessages.getString("CheckedTableSelectionDialog.selectAll"), false); //$NON-NLS-1$
-
-		SelectionListener listener= new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fViewer.setCheckedElements(fContentProvider.getElements(fInput));
-				updateOKStatus();
-			}
-		};
-		selectButton.addSelectionListener(listener);
-
-		Button deselectButton= createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, WizardMessages.getString("CheckedTableSelectionDialog.deselectAll"), false); //$NON-NLS-1$
-
-		listener= new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fViewer.setCheckedElements(new Object[0]);
-				updateOKStatus();
-			}
-		};
-		deselectButton.addSelectionListener(listener);
-		return buttonComposite;
-	}
-	
-	private boolean evaluateIfTableEmpty(Object input) {
-		Object[] elements= fContentProvider.getElements(input);
-		if (elements.length > 0) {
-			if (fFilters != null) {
-				for (int i= 0; i < fFilters.size(); i++) {
-					ViewerFilter curr= (ViewerFilter)fFilters.get(i);
-					elements= curr.filter(fViewer, input, elements);
-				}
-			}
-		}
-		return elements.length == 0;
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/ExceptionHandler.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/ExceptionHandler.java
deleted file mode 100644
index ae91bfe..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/ExceptionHandler.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.wizards.WizardMessages;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The default exception handler shows an error dialog when one of its handle methods
- * is called. If the passed exception is a <code>CoreException</code> an error dialog
- * pops up showing the exception's status information. For a <code>InvocationTargetException</code>
- * a normal message dialog pops up showing the exception's message. Additionally the exception
- * is written to the platform log.
- * 
- * TO DO: this class is duplicated from org.eclipse.jdt.ui
- */
-public class ExceptionHandler {
-
-	private static ExceptionHandler fgInstance= new ExceptionHandler();
-	
-	/**
-	 * Handles the given <code>CoreException</code>. 
-	 * 
-	 * @param e the <code>CoreException</code> to be handled
-	 * @param parent the dialog window's parent shell
-	 * @param title the dialog window's window title
-	 * @param message message to be displayed by the dialog window
-	 */
-	public static void handle(CoreException e, Shell parent, String title, String message) {
-		fgInstance.perform(e, parent, title, message);
-	}
-	
-	/**
-	 * Handles the given <code>InvocationTargetException</code>. 
-	 * 
-	 * @param e the <code>InvocationTargetException</code> to be handled
-	 * @param parent the dialog window's parent shell
-	 * @param title the dialog window's window title
-	 * @param message message to be displayed by the dialog window
-	 */
-	public static void handle(InvocationTargetException e, Shell parent, String title, String message) {
-		fgInstance.perform(e, parent, title, message);
-	}
-
-	//---- Hooks for subclasses to control exception handling ------------------------------------
-	
-	protected void perform(CoreException e, Shell shell, String title, String message) {
-		JUnitPlugin.log(e);
-		IStatus status= e.getStatus();
-		if (status != null) {
-			ErrorDialog.openError(shell, title, message, status);
-		} else {
-			displayMessageDialog(e, e.getMessage(), shell, title, message);
-		}
-	}
-
-	protected void perform(InvocationTargetException e, Shell shell, String title, String message) {
-		Throwable target= e.getTargetException();
-		if (target instanceof CoreException) {
-			perform((CoreException)target, shell, title, message);
-		} else {
-			JUnitPlugin.log(e);
-			if (e.getMessage() != null && e.getMessage().length() > 0) {
-				displayMessageDialog(e, e.getMessage(), shell, title, message);
-			} else {
-				displayMessageDialog(e, target.getMessage(), shell, title, message);
-			}
-		}
-	}
-	
-	private void displayMessageDialog(Throwable t, String exceptionMessage, Shell shell, String title, String message) {
-		StringWriter msg= new StringWriter();
-		if (message != null) {
-			msg.write(message);
-			msg.write("\n\n"); //$NON-NLS-1$
-		}
-		if (exceptionMessage == null || exceptionMessage.length() == 0)
-			msg.write(WizardMessages.getString("ExceptionDialog.seeErrorLogMessage")); //$NON-NLS-1$
-		else
-			msg.write(exceptionMessage);
-		MessageDialog.openError(shell, title, msg.toString());			
-	}	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/IJUnitStatusConstants.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/IJUnitStatusConstants.java
deleted file mode 100644
index 2b19523..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/IJUnitStatusConstants.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-public interface IJUnitStatusConstants {
-
-	// JUnit UI status constants start at 10000 to make sure that we don't
-	// collide with resource and java model constants.
-	
-	public static final int INTERNAL_ERROR= 10001;
-	
-	/**
-	 * Status constant indicating that an validateEdit call has changed the
-	 * content of a file on disk.
-	 */
-	public static final int VALIDATE_EDIT_CHANGED_CONTENT= 10003;
-	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStatus.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStatus.java
deleted file mode 100644
index 06aa48e..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStatus.java
+++ /dev/null

@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.junit.util;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jface.util.Assert;
-
-/**
- * An implemention of IStatus. 
- * TO DO: Why is it duplicated, it should leverage the Status base class???
- */
-public class JUnitStatus implements IStatus {
-	private String fStatusMessage;
-	private int fSeverity;
-	
-	/**
-	 * Creates a status set to OK (no message)
-	 */
-	public JUnitStatus() {
-		this(OK, null);
-	}
-
-	/**
-	 * Creates a status .
-	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
-	 * @param message The message of the status. Applies only for ERROR,
-	 * WARNING and INFO.
-	 */	
-	public JUnitStatus(int severity, String message) {
-		fStatusMessage= message;
-		fSeverity= severity;
-	}		
-
-	public static IStatus createError(String message) {
-		return new JUnitStatus(IStatus.ERROR, message);
-	}
-	
-	public static IStatus createWarning(String message) {
-		return new JUnitStatus(IStatus.WARNING, message);
-	}
-
-	public static IStatus createInfo(String message) {
-		return new JUnitStatus(IStatus.INFO, message);
-	}
-	
-	/**
-	 *  Returns if the status' severity is OK.
-	 */
-	public boolean isOK() {
-		return fSeverity == IStatus.OK;
-	}
-
-	/**
-	 *  Returns if the status' severity is WARNING.
-	 */	
-	public boolean isWarning() {
-		return fSeverity == IStatus.WARNING;
-	}
-
-	/**
-	 *  Returns if the status' severity is INFO.
-	 */	
-	public boolean isInfo() {
-		return fSeverity == IStatus.INFO;
-	}	
-
-	/**
-	 *  Returns if the status' severity is ERROR.
-	 */	
-	public boolean isError() {
-		return fSeverity == IStatus.ERROR;
-	}
-	
-	/**
-	 * @see IStatus#getMessage()
-	 */
-	public String getMessage() {
-		return fStatusMessage;
-	}
-	
-	/**
-	 * Sets the status to ERROR.
-	 * @param errorMessage the error message (can be empty, but not null)
-	 */	
-	public void setError(String errorMessage) {
-		Assert.isNotNull(errorMessage);
-		fStatusMessage= errorMessage;
-		fSeverity= IStatus.ERROR;
-	}
-
-	/**
-	 * Sets the status to WARNING.
-	 * @param warningMessage the warning message (can be empty, but not null)
-	 */		
-	public void setWarning(String warningMessage) {
-		Assert.isNotNull(warningMessage);
-		fStatusMessage= warningMessage;
-		fSeverity= IStatus.WARNING;
-	}
-
-	/**
-	 * Sets the status to INFO.
-	 * @param infoMessage the info message (can be empty, but not null)
-	 */		
-	public void setInfo(String infoMessage) {
-		Assert.isNotNull(infoMessage);
-		fStatusMessage= infoMessage;
-		fSeverity= IStatus.INFO;
-	}	
-
-	/**
-	 * Sets the status to OK.
-	 */		
-	public void setOK() {
-		fStatusMessage= null;
-		fSeverity= IStatus.OK;
-	}
-	
-	/*
-	 * @see IStatus#matches(int)
-	 */
-	public boolean matches(int severityMask) {
-		return (fSeverity & severityMask) != 0;
-	}
-
-	/**
-	 * Returns always <code>false</code>.
-	 * @see IStatus#isMultiStatus()
-	 */
-	public boolean isMultiStatus() {
-		return false;
-	}
-
-	/*
-	 * @see IStatus#getSeverity()
-	 */
-	public int getSeverity() {
-		return fSeverity;
-	}
-
-	/*
-	 * @see IStatus#getPlugin()
-	 */
-	public String getPlugin() {
-		return JUnitPlugin.PLUGIN_ID;
-	}
-
-	/**
-	 * Returns always <code>null</code>.
-	 * @see IStatus#getException()
-	 */
-	public Throwable getException() {
-		return null;
-	}
-
-	/**
-	 * Returns always the error severity.
-	 * @see IStatus#getCode()
-	 */
-	public int getCode() {
-		return fSeverity;
-	}
-
-	/**
-	 * Returns always <code>null</code>.
-	 * @see IStatus#getChildren()
-	 */
-	public IStatus[] getChildren() {
-		return new IStatus[0];
-	}	
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStubUtility.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStubUtility.java
deleted file mode 100644
index cd56073..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStubUtility.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.junit.util;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICodeFormatter;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.ToolFactory;
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.jdt.ui.wizards.NewTypeWizardPage.ImportsManager;
-import org.eclipse.swt.SWT;
-
-/**
- * Utility methods for code generation.
- * TODO: some methods are duplicated from org.eclipse.jdt.ui
- */
-public class JUnitStubUtility {
-
-	public static class GenStubSettings extends CodeGenerationSettings {
-	
-		public boolean fCallSuper;
-		public boolean fMethodOverwrites;
-		public boolean fNoBody;
-		
-		public GenStubSettings(CodeGenerationSettings settings) {
-			this.createComments= settings.createComments;
-		}
-	}
-
-	/**
-	 * Examines a string and returns the first line delimiter found.
-	 */
-	public static String getLineDelimiterUsed(IJavaElement elem) {
-		try {
-			ICompilationUnit cu= (ICompilationUnit) elem.getAncestor(IJavaElement.COMPILATION_UNIT);
-			if (cu != null && cu.exists()) {
-				IBuffer buf= cu.getBuffer();
-				int length= buf.getLength();
-				for (int i= 0; i < length; i++) {
-					char ch= buf.getChar(i);
-					if (ch == SWT.CR) {
-						if (i + 1 < length) {
-							if (buf.getChar(i + 1) == SWT.LF) {
-								return "\r\n"; //$NON-NLS-1$
-							}
-						}
-						return "\r"; //$NON-NLS-1$
-					} else if (ch == SWT.LF) {
-						return "\n"; //$NON-NLS-1$
-					}
-				}
-			}
-			return System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (JavaModelException e) {
-			return System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	public static String codeFormat(String sourceString, int initialIndentationLevel, String lineDelim) {
-		ICodeFormatter formatter= ToolFactory.createDefaultCodeFormatter(null);
-		return formatter.format(sourceString, initialIndentationLevel, null, lineDelim);
-	}
-
-	/**
-	 * Generates a stub. Given a template method, a stub with the same signature
-	 * will be constructed so it can be added to a type.
-	 * @param destTypeName The name of the type to which the method will be added to (Used for the constructor)
-	 * @param method A method template (method belongs to different type than the parent)
-	 * @param settings Options as defined above (GENSTUB_*)
-	 * @param imports Imports required by the sub are added to the imports structure
-	 * @throws JavaModelException
-	 */
-	public static String genStub(String destTypeName, IMethod method, GenStubSettings settings, ImportsManager imports) throws JavaModelException {
-		IType declaringtype= method.getDeclaringType();	
-		StringBuffer buf= new StringBuffer();
-		String[] paramTypes= method.getParameterTypes();
-		String[] paramNames= method.getParameterNames();
-		String[] excTypes= method.getExceptionTypes();
-		String retTypeSig= method.getReturnType();
-		
-		int lastParam= paramTypes.length -1;		
-		
-		if (settings.createComments) {
-			if (method.isConstructor()) {
-				String desc= "Constructor for " + destTypeName; //$NON-NLS-1$
-				genJavaDocStub(desc, paramNames, Signature.SIG_VOID, excTypes, buf);
-			} else {			
-				// java doc
-				if (settings.fMethodOverwrites) {
-					boolean isDeprecated= Flags.isDeprecated(method.getFlags());
-					genJavaDocSeeTag(declaringtype.getElementName(), method.getElementName(), paramTypes, settings.createNonJavadocComments, isDeprecated, buf);
-				} else {
-					// generate a default java doc comment
-					String desc= "Method " + method.getElementName(); //$NON-NLS-1$
-					genJavaDocStub(desc, paramNames, retTypeSig, excTypes, buf);
-				}
-			}
-		}
-		int flags= method.getFlags();
-		if (Flags.isPublic(flags) || (declaringtype.isInterface() && !settings.fNoBody)) {
-			buf.append("public "); //$NON-NLS-1$
-		} else if (Flags.isProtected(flags)) {
-			buf.append("protected "); //$NON-NLS-1$
-		} else if (Flags.isPrivate(flags)) {
-			buf.append("private "); //$NON-NLS-1$
-		}
-		if (Flags.isSynchronized(flags)) {
-			buf.append("synchronized "); //$NON-NLS-1$
-		}		
-		if (Flags.isVolatile(flags)) {
-			buf.append("volatile "); //$NON-NLS-1$
-		}
-		if (Flags.isStrictfp(flags)) {
-			buf.append("strictfp "); //$NON-NLS-1$
-		}
-		if (Flags.isStatic(flags)) {
-			buf.append("static "); //$NON-NLS-1$
-		}		
-			
-		if (method.isConstructor()) {
-			buf.append(destTypeName);
-		} else {
-			String retTypeFrm= Signature.toString(retTypeSig);
-			if (!isBuiltInType(retTypeSig)) {
-				resolveAndAdd(retTypeSig, declaringtype, imports);
-			}
-			buf.append(Signature.getSimpleName(retTypeFrm));
-			buf.append(' ');
-			buf.append(method.getElementName());
-		}
-		buf.append('(');
-		for (int i= 0; i <= lastParam; i++) {
-			String paramTypeSig= paramTypes[i];
-			String paramTypeFrm= Signature.toString(paramTypeSig);
-			if (!isBuiltInType(paramTypeSig)) {
-				resolveAndAdd(paramTypeSig, declaringtype, imports);
-			}
-			buf.append(Signature.getSimpleName(paramTypeFrm));
-			buf.append(' ');
-			buf.append(paramNames[i]);
-			if (i < lastParam) {
-				buf.append(", "); //$NON-NLS-1$
-			}
-		}
-		buf.append(')');
-		
-		int lastExc= excTypes.length - 1;
-		if (lastExc >= 0) {
-			buf.append(" throws "); //$NON-NLS-1$
-			for (int i= 0; i <= lastExc; i++) {
-				String excTypeSig= excTypes[i];
-				String excTypeFrm= Signature.toString(excTypeSig);
-				resolveAndAdd(excTypeSig, declaringtype, imports);
-				buf.append(Signature.getSimpleName(excTypeFrm));
-				if (i < lastExc) {
-					buf.append(", "); //$NON-NLS-1$
-				}
-			}
-		}
-		if (settings.fNoBody) {
-			buf.append(";\n\n"); //$NON-NLS-1$
-		} else {
-			buf.append(" {\n\t"); //$NON-NLS-1$
-			if (!settings.fCallSuper) {
-				if (retTypeSig != null && !retTypeSig.equals(Signature.SIG_VOID)) {
-					buf.append('\t');
-					if (!isBuiltInType(retTypeSig) || Signature.getArrayCount(retTypeSig) > 0) {
-						buf.append("return null;\n\t"); //$NON-NLS-1$
-					} else if (retTypeSig.equals(Signature.SIG_BOOLEAN)) {
-						buf.append("return false;\n\t"); //$NON-NLS-1$
-					} else {
-						buf.append("return 0;\n\t"); //$NON-NLS-1$
-					}
-				}
-			} else {
-				buf.append('\t');
-				if (!method.isConstructor()) {
-					if (!Signature.SIG_VOID.equals(retTypeSig)) {
-						buf.append("return "); //$NON-NLS-1$
-					}
-					buf.append("super."); //$NON-NLS-1$
-					buf.append(method.getElementName());
-				} else {
-					buf.append("super"); //$NON-NLS-1$
-				}
-				buf.append('(');			
-				for (int i= 0; i <= lastParam; i++) {
-					buf.append(paramNames[i]);
-					if (i < lastParam) {
-						buf.append(", "); //$NON-NLS-1$
-					}
-				}
-				buf.append(");\n\t"); //$NON-NLS-1$
-			}
-			buf.append("}\n\n");			 //$NON-NLS-1$
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * Generates a default JavaDoc comment stub for a method.
-	 */
-	private static void genJavaDocStub(String descr, String[] paramNames, String retTypeSig, String[] excTypeSigs, StringBuffer buf) {
-		buf.append("/**\n"); //$NON-NLS-1$
-		buf.append(" * "); buf.append(descr); buf.append(".\n"); //$NON-NLS-2$ //$NON-NLS-1$
-		for (int i= 0; i < paramNames.length; i++) {
-			buf.append(" * @param "); buf.append(paramNames[i]); buf.append('\n'); //$NON-NLS-1$
-		}
-		if (retTypeSig != null && !retTypeSig.equals(Signature.SIG_VOID)) {
-			String simpleName= Signature.getSimpleName(Signature.toString(retTypeSig));
-			buf.append(" * @return "); buf.append(simpleName); buf.append('\n'); //$NON-NLS-1$
-		}
-		for (int i= 0; i < excTypeSigs.length; i++) {
-			String simpleName= Signature.getSimpleName(Signature.toString(excTypeSigs[i]));
-			buf.append(" * @throws "); buf.append(simpleName); buf.append('\n'); //$NON-NLS-1$
-		}		
-		buf.append(" */\n"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Generates a '@see' tag to the defined method.
-	 */
-	public static void genJavaDocSeeTag(String declaringTypeName, String methodName, String[] paramTypes, boolean nonJavaDocComment, boolean isDeprecated, StringBuffer buf) {
-		// create a @see link
-		buf.append("/*"); //$NON-NLS-1$
-		if (!nonJavaDocComment) {
-			buf.append('*');
-		}
-		buf.append("\n * @see "); //$NON-NLS-1$
-		buf.append(declaringTypeName);
-		buf.append('#'); 
-		buf.append(methodName);
-		buf.append('(');
-		for (int i= 0; i < paramTypes.length; i++) {
-			if (i > 0) {
-				buf.append(", "); //$NON-NLS-1$
-			}
-			buf.append(Signature.getSimpleName(Signature.toString(paramTypes[i])));
-		}
-		buf.append(")\n"); //$NON-NLS-1$
-		if (isDeprecated) {
-			buf.append(" * @deprecated\n"); //$NON-NLS-1$
-		}
-		buf.append(" */\n"); //$NON-NLS-1$
-	}	
-
-	private static boolean isBuiltInType(String typeName) {
-		char first= Signature.getElementType(typeName).charAt(0);
-		return (first != Signature.C_RESOLVED && first != Signature.C_UNRESOLVED);
-	}
-
-	private static void resolveAndAdd(String refTypeSig, IType declaringType, ImportsManager imports) throws JavaModelException {
-		String resolvedTypeName= JavaModelUtil.getResolvedTypeName(refTypeSig, declaringType);
-		if (resolvedTypeName != null) {
-			imports.addImport(resolvedTypeName);		
-		}
-	}
-	
-	public static String getTodoTaskTag(IJavaProject project) {
-		String markers= null;
-		if (project == null) {
-			markers= JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS);
-		} else {
-			markers= project.getOption(JavaCore.COMPILER_TASK_TAGS, true);
-		}
-		
-		if (markers != null && markers.length() > 0) {
-			int idx= markers.indexOf(',');
-			if (idx == -1) {
-				return markers;
-			} else {
-				return markers.substring(0, idx);
-			}
-		}
-		return null;
-	}
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/LayoutUtil.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/LayoutUtil.java
deleted file mode 100644
index fb8004e..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/LayoutUtil.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-import org.eclipse.jdt.internal.junit.wizards.MethodStubsSelectionButtonGroup;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-
-public class LayoutUtil {
-	
-	/**
-	 * Calculates the number of columns needed by field editors
-	 */
-	public static int getNumberOfColumns(MethodStubsSelectionButtonGroup[] editors) {
-		int columnCount= 0;
-		for (int i= 0; i < editors.length; i++) {
-			columnCount= Math.max(editors[i].getNumberOfControls(), columnCount);
-		}
-		return columnCount;
-	}
-	
-	/**
-	 * Creates a composite and fills in the given editors.
-	 * @param labelOnTop Defines if the label of all fields should be on top of the fields
-	 */	
-	public static void doDefaultLayout(Composite parent, MethodStubsSelectionButtonGroup[] editors, boolean labelOnTop) {
-		doDefaultLayout(parent, editors, labelOnTop, 0, 0, 0, 0);
-	}
-
-	/**
-	 * Creates a composite and fills in the given editors.
-	 * @param labelOnTop Defines if the label of all fields should be on top of the fields
-	 * @param minWidth The minimal width of the composite
-	 * @param minHeight The minimal height of the composite 
-	 */
-	public static void doDefaultLayout(Composite parent, MethodStubsSelectionButtonGroup[] editors, boolean labelOnTop, int minWidth, int minHeight) {
-		doDefaultLayout(parent, editors, labelOnTop, minWidth, minHeight, 0, 0);
-	}
-
-	/**
-	 * Creates a composite and fills in the given editors.
-	 * @param labelOnTop Defines if the label of all fields should be on top of the fields
-	 * @param minWidth The minimal width of the composite
-	 * @param minHeight The minimal height of the composite
-	 * @param marginWidth The margin width to be used by the composite
-	 * @param marginHeight The margin height to be used by the composite
-	 */	
-	public static void doDefaultLayout(Composite parent, MethodStubsSelectionButtonGroup[] editors, boolean labelOnTop, int minWidth, int minHeight, int marginWidth, int marginHeight) {
-		int nCulumns= getNumberOfColumns(editors);
-		Control[][] controls= new Control[editors.length][];
-		for (int i= 0; i < editors.length; i++) {
-			controls[i]= editors[i].doFillIntoGrid(parent, nCulumns);
-		}
-		if (labelOnTop) {
-			nCulumns--;
-			modifyLabelSpans(controls, nCulumns);
-		}
-		GridLayout layout= new GridLayout();
-		if (marginWidth != SWT.DEFAULT) {
-			layout.marginWidth= marginWidth;
-		}
-		if (marginHeight != SWT.DEFAULT) {
-			layout.marginHeight= marginHeight;
-		}
-//		layout.minimumWidth= minWidth;
-//		layout.minimumHeight= minHeight;
-		layout.numColumns= nCulumns;		
-		parent.setLayout(layout);
-	}
-	
-	private static void modifyLabelSpans(Control[][] controls, int nCulumns) {
-		for (int i= 0; i < controls.length; i++) {
-			setHorizontalSpan(controls[i][0], nCulumns);
-		}
-	}
-	
-	/**
-	 * Sets the span of a control. Assumes that MGridData is used.
-	 */
-	public static void setHorizontalSpan(Control control, int span) {
-		Object ld= control.getLayoutData();
-		if (ld instanceof GridData) {
-			((GridData)ld).horizontalSpan= span;
-		} else if (span != 1) {
-			GridData gd= new GridData();
-			gd.horizontalSpan= span;
-			control.setLayoutData(gd);
-		}
-	}	
-
-	/**
-	 * Sets the width hint of a control. Assumes that MGridData is used.
-	 */
-	public static void setWidthHint(Control control, int widthHint) {
-		Object ld= control.getLayoutData();
-		if (ld instanceof GridData) {
-			((GridData)ld).widthHint= widthHint;
-		}
-	}
-	
-	/**
-	 * Sets the horizontal indent of a control. Assumes that MGridData is used.
-	 */
-	public static void setHorizontalIndent(Control control, int horizontalIndent) {
-		Object ld= control.getLayoutData();
-		if (ld instanceof GridData) {
-			((GridData)ld).horizontalIndent= horizontalIndent;
-		}
-	}
-
-	/**
-	 * Creates a spacer control with the given span.
-	 * The composite is assumed to have <code>MGridLayout</code> as
-	 * layout.
-	 * @param parent The parent composite
-	 */			
-	public static Control createEmptySpace(Composite parent, int span) {
-		Label label= new Label(parent, SWT.LEFT);
-		GridData gd= new GridData();
-		gd.horizontalAlignment= GridData.BEGINNING;
-		gd.grabExcessHorizontalSpace= false;
-		gd.horizontalSpan= span;
-		gd.horizontalIndent= 0;
-		gd.widthHint= 0;
-		gd.heightHint= 0;
-		label.setLayoutData(gd);
-		return label;
-	}
-	
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/PixelConverter.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/PixelConverter.java
deleted file mode 100644
index 3ca693f..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/PixelConverter.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.dialogs.Dialog;
-
-/*
- * class copied from jdt ui
- */
-public class PixelConverter {
-	
-	private FontMetrics fFontMetrics;
-	
-	public PixelConverter(Control control) {
-		GC gc = new GC(control);
-		gc.setFont(control.getFont());
-		fFontMetrics= gc.getFontMetrics();
-		gc.dispose();
-	}
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#convertHeightInCharsToPixels(int)
-	 */
-	public int convertHeightInCharsToPixels(int chars) {
-		return Dialog.convertHeightInCharsToPixels(fFontMetrics, chars);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#convertHorizontalDLUsToPixels(int)
-	 */
-	public int convertHorizontalDLUsToPixels(int dlus) {
-		return Dialog.convertHorizontalDLUsToPixels(fFontMetrics, dlus);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#convertVerticalDLUsToPixels(int)
-	 */
-	public int convertVerticalDLUsToPixels(int dlus) {
-		return Dialog.convertVerticalDLUsToPixels(fFontMetrics, dlus);
-	}
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#convertWidthInCharsToPixels(int)
-	 */
-	public int convertWidthInCharsToPixels(int chars) {
-		return Dialog.convertWidthInCharsToPixels(fFontMetrics, chars);
-	}	
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/Resources.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/Resources.java
deleted file mode 100644
index 2a8f999..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/Resources.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-
-
-public class Resources {
-
-	private Resources() {
-	}
-
-	/**
-	 * Checks if the given resource is in sync with the underlying file system.
-	 * 
-	 * @param resource the resource to be checked
-	 * @return IStatus status describing the check's result. If <code>status.
-	 * isOK()</code> returns <code>true</code> then the resource is in sync
-	 */
-	public static IStatus checkInSync(IResource resource) {
-		return checkInSync(new IResource[] {resource});
-	}
-	
-	/**
-	 * Checks if the given resources are in sync with the underlying file
-	 * system.
-	 * 
-	 * @param resources the resources to be checked
-	 * @return IStatus status describing the check's result. If <code>status.
-	 *  isOK() </code> returns <code>true</code> then the resources are in sync
-	 */
-	public static IStatus checkInSync(IResource[] resources) {
-		IStatus result= null;
-		for (int i= 0; i < resources.length; i++) {
-			IResource resource= resources[i];
-			if (!resource.isSynchronized(IResource.DEPTH_INFINITE)) {
-				result= addOutOfSync(result, resource);
-			}			
-		}
-		if (result != null)
-			return result;
-		return new Status(IStatus.OK, JUnitPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$		
-	}
-
-	/**
-	 * Makes the given resource committable. Committable means that it is
-	 * writeable and that its content hasn't changed by calling
-	 * <code>validateEdit</code> for the given resource on <tt>IWorkspace</tt>.
-	 * 
-	 * @param resource the resource to be checked
-	 * @param context the context passed to <code>validateEdit</code> 
-	 * @return IStatus status describing the method's result. If <code>status.
-	 * isOK()</code> returns <code>true</code> then the resource are committable
-	 * 
-	 * @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.
-	 * resources.IFile[], java.lang.Object)
-	 */
-	public static IStatus makeCommittable(IResource resource, Object context) {
-		return makeCommittable(new IResource[] { resource }, context);
-	}
-	
-	/**
-	 * Makes the given resources committable. Committable means that all
-	 * resources are writeable and that the content of the resources hasn't
-	 * changed by calling <code>validateEdit</code> for a given file on
-	 * <tt>IWorkspace</tt>.
-	 * 
-	 * @param resources the resources to be checked
-	 * @param context the context passed to <code>validateEdit</code> 
-	 * @return IStatus status describing the method's result. If <code>status.
-	 * isOK()</code> returns <code>true</code> then the add resources are
-	 * committable
-	 * 
-	 * @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)
-	 */
-	public static IStatus makeCommittable(IResource[] resources, Object context) {
-		List readOnlyFiles= new ArrayList();
-		for (int i= 0; i < resources.length; i++) {
-			IResource resource= resources[i];
-			if (resource.getType() == IResource.FILE && resource.isReadOnly())	
-				readOnlyFiles.add(resource);
-		}
-		if (readOnlyFiles.size() == 0)
-			return new Status(IStatus.OK, JUnitPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
-			
-		Map oldTimeStamps= createModificationStampMap(readOnlyFiles);
-		IStatus status= ResourcesPlugin.getWorkspace().validateEdit(
-			(IFile[]) readOnlyFiles.toArray(new IFile[readOnlyFiles.size()]), context);
-		if (!status.isOK())
-			return status;
-			
-		IStatus modified= null;
-		Map newTimeStamps= createModificationStampMap(readOnlyFiles);
-		for (Iterator iter= oldTimeStamps.keySet().iterator(); iter.hasNext();) {
-			IFile file= (IFile) iter.next();
-			if (!oldTimeStamps.get(file).equals(newTimeStamps.get(file)))
-				modified= addModified(modified, file);
-		}
-		if (modified != null)	
-			return modified;
-		return new Status(IStatus.OK, JUnitPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
-	}
-
-	private static Map createModificationStampMap(List files){
-		Map map= new HashMap();
-		for (Iterator iter= files.iterator(); iter.hasNext(); ) {
-			IFile file= (IFile)iter.next();
-			map.put(file, new Long(file.getModificationStamp()));
-		}
-		return map;
-	}
-	
-	private static IStatus addModified(IStatus status, IFile file) {
-		IStatus entry= JUnitStatus.createError(JUnitMessages.getFormattedString("Resources.fileModified", file.getFullPath().toString())); //$NON-NLS-1$ 
-		if (status == null) {
-			return entry;
-		} else if (status.isMultiStatus()) {
-			((MultiStatus)status).add(entry);
-			return status;
-		} else {
-			MultiStatus result= new MultiStatus(JUnitPlugin.getPluginId(),
-				IJUnitStatusConstants.VALIDATE_EDIT_CHANGED_CONTENT,
-			JUnitMessages.getString("Resources.modifiedResources"), null); //$NON-NLS-1$ 
-			result.add(status);
-			result.add(entry);
-			return result;
-		}
-	}	
-
-	private static IStatus addOutOfSync(IStatus status, IResource resource) {
-		IStatus entry= new Status(
-			IStatus.ERROR,
-			ResourcesPlugin.PI_RESOURCES,
-			IResourceStatus.OUT_OF_SYNC_LOCAL,
-		JUnitMessages.getFormattedString("Resources.outOfSync", resource.getFullPath().toString()), //$NON-NLS-1$ 
-			null);
-		if (status == null) {
-			return entry;
-		} else if (status.isMultiStatus()) {
-			((MultiStatus)status).add(entry);
-			return status;
-		} else {
-			MultiStatus result= new MultiStatus(
-				ResourcesPlugin.PI_RESOURCES,
-				IResourceStatus.OUT_OF_SYNC_LOCAL,
-			JUnitMessages.getString("Resources.outOfSyncResources"), null); //$NON-NLS-1$ 
-			result.add(status);
-			result.add(entry);
-			return result;
-		}
-	}
-
-	public static String[] getLocationOSStrings(IResource[] resources) {
-		List result= new ArrayList(resources.length);
-		for (int i= 0; i < resources.length; i++) {
-			IPath location= resources[i].getLocation();
-			if (location != null)
-				result.add(location.toOSString());
-		}
-		return (String[]) result.toArray(new String[result.size()]);
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/SWTUtil.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/SWTUtil.java
deleted file mode 100644
index 8d8125c..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/SWTUtil.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DragSource;
-import org.eclipse.swt.dnd.DropTarget;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Caret;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.Assert;
-
-/**
- * Utility class to simplify access to some SWT resources. 
- * (copied from jdt ui)
- */
-public class SWTUtil {
-	private SWTUtil(){}
-	/**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated disaply. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display= Display.getCurrent();
-		if (display == null)
-			display= Display.getDefault();
-		return display;		
-	}
-	
-	/**
-	 * Returns the shell for the given widget. If the widget doesn't represent
-	 * a SWT object that manage a shell, <code>null</code> is returned.
-	 * 
-	 * @return the shell for the given widget
-	 */
-	public static Shell getShell(Widget widget) {
-		if (widget instanceof Control)
-			return ((Control)widget).getShell();
-		if (widget instanceof Caret)
-			return ((Caret)widget).getParent().getShell();
-		if (widget instanceof DragSource)
-			return ((DragSource)widget).getControl().getShell();
-		if (widget instanceof DropTarget)
-			return ((DropTarget)widget).getControl().getShell();
-		if (widget instanceof Menu)
-			return ((Menu)widget).getParent().getShell();
-		if (widget instanceof ScrollBar)
-			return ((ScrollBar)widget).getParent().getShell();
-							
-		return null;	
-	}
-
-
-	/**
-	 * Returns a width hint for a button control.
-	 */
-	public static int getButtonWidthHint(Button button) {
-		button.setFont(JFaceResources.getDialogFont());
-		PixelConverter converter= new PixelConverter(button);
-		int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-	}
-
-	/**
-	 * Returns a height hint for a button control.
-	 */		
-	public static int getButtonHeigthHint(Button button) {
-		button.setFont(JFaceResources.getDialogFont());
-		PixelConverter converter= new PixelConverter(button);
-		return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-	}	
-
-	
-	/**
-	 * Sets width and height hint for the button control.
-	 * <b>Note:</b> This is a NOP if the button's layout data is not
-	 * an instance of <code>GridData</code>.
-	 * 
-	 * @param button the button for which to set the dimension hint
-	 */		
-	public static void setButtonDimensionHint(Button button) {
-		Assert.isNotNull(button);
-		Object gd= button.getLayoutData();
-		if (gd instanceof GridData) {
-			((GridData)gd).heightHint= getButtonHeigthHint(button);
-			((GridData)gd).widthHint= getButtonWidthHint(button);		 
-		}
-	}		
-	
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java
deleted file mode 100644
index 7446737..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ISourceReference;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.core.search.SearchParticipant;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.SearchRequestor;
-
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.internal.junit.ui.JUnitMessages;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-
-/**
- * Custom Search engine for suite() methods
- */
-public class TestSearchEngine {
-
-	private static class JUnitSearchResultCollector extends SearchRequestor {
-		List fList;
-		Set fFailed= new HashSet();
-		Set fMatches= new HashSet();
-		
-		public JUnitSearchResultCollector(List list) {
-			fList= list;
-		}
-		
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-			Object enclosingElement= match.getElement();
-			if (!(enclosingElement instanceof IMethod)) 
-				return;
-			
-			IMethod method= (IMethod)enclosingElement;		
-			
-			IType declaringType= method.getDeclaringType();
-			if (fMatches.contains(declaringType) || fFailed.contains(declaringType))
-				return;
-			if (!hasSuiteMethod(declaringType) && !isTestType(declaringType)) {
-				fFailed.add(declaringType);
-				return;
-			}
-			fMatches.add(declaringType);
-		}
-		
-		public void endReporting() {
-			fList.addAll(fMatches);
-		}
-	}
-	
-	private List searchMethod(IProgressMonitor pm, final IJavaSearchScope scope) throws CoreException {
-		final List typesFound= new ArrayList(200);	
-		searchMethod(typesFound, scope, pm);
-		return typesFound;	
-	}
-
-	private List searchMethod(final List v, IJavaSearchScope scope, final IProgressMonitor progressMonitor) throws CoreException {		
-		SearchRequestor requestor= new JUnitSearchResultCollector(v);
-		SearchPattern suitePattern= SearchPattern.createPattern("suite() Test", IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$
-		SearchPattern testPattern= SearchPattern.createPattern("test*() void", IJavaSearchConstants.METHOD , IJavaSearchConstants.DECLARATIONS, SearchPattern.R_PATTERN_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$
-		SearchPattern pattern= SearchPattern.createOrPattern(suitePattern, testPattern);
-		SearchParticipant[] participants= new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()};
-		new SearchEngine().search(pattern, participants, scope, requestor, progressMonitor); 
-		return v;
-	}
-	
-	public static IType[] findTests(IRunnableContext context, final Object[] elements) throws InvocationTargetException, InterruptedException {
-		final Set result= new HashSet();
-		
-			if (elements.length > 0) {
-				IRunnableWithProgress runnable= new IRunnableWithProgress() {
-					public void run(IProgressMonitor pm) throws InterruptedException {
-						doFindTests(elements, result, pm);
-					}
-				};
-				context.run(true, true, runnable);			
-			}
-			return (IType[]) result.toArray(new IType[result.size()]) ;
-	}
-
-	public static IType[] findTests(final Object[] elements) throws InvocationTargetException, InterruptedException{
-		final Set result= new HashSet();
-	
-		if (elements.length > 0) {
-			IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				public void run(IProgressMonitor pm) throws InterruptedException {
-					doFindTests(elements, result, pm);
-				}
-			};
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(runnable);			
-		}
-		return (IType[]) result.toArray(new IType[result.size()]) ;
-	}
-
-	public static void doFindTests(Object[] elements, Set result, IProgressMonitor pm) throws InterruptedException {
-		int nElements= elements.length;
-		pm.beginTask(JUnitMessages.getString("TestSearchEngine.message.searching"), nElements);  //$NON-NLS-1$
-		try {
-			for (int i= 0; i < nElements; i++) {
-				try {
-					collectTypes(elements[i], new SubProgressMonitor(pm, 1), result);
-				} catch (CoreException e) {
-					JUnitPlugin.log(e.getStatus());
-				}
-				if (pm.isCanceled()) {
-					throw new InterruptedException();
-				}
-			}
-		} finally {
-			pm.done();
-		}
-	}
-
-	private static void collectTypes(Object element, IProgressMonitor pm, Set result) throws CoreException/*, InvocationTargetException*/ {
-		element= computeScope(element);
-		while((element instanceof IJavaElement) && !(element instanceof ICompilationUnit) && (element instanceof ISourceReference)) {
-			if(element instanceof IType) {
-				if (hasSuiteMethod((IType)element) || isTestType((IType)element)) {
-					result.add(element);
-					return;
-				}
-			}
-			element= ((IJavaElement)element).getParent();
-		}
-		if (element instanceof ICompilationUnit) {
-			ICompilationUnit cu= (ICompilationUnit)element;
-			IType[] types= cu.getAllTypes();
-			for (int i= 0; i < types.length; i++) {
-				if (hasSuiteMethod(types[i])  || isTestType(types[i]))
-					result.add(types[i]);
-			}
-		} 
-		else if (element instanceof IJavaElement) {
-			List found= searchSuiteMethods(pm, (IJavaElement)element);
-			result.addAll(found);
-		}
-	}
-
-	private static Object computeScope(Object element) throws JavaModelException {
-		if (element instanceof IFileEditorInput)
-			element= ((IFileEditorInput)element).getFile();
-		if (element instanceof IResource)
-			element= JavaCore.create((IResource)element);
-		if (element instanceof IClassFile) {
-			IClassFile cf= (IClassFile)element;
-			element= cf.getType();
-		}
-		return element;
-	}
-	
-	private static List searchSuiteMethods(IProgressMonitor pm, IJavaElement element) throws CoreException {	
-		// fix for bug 36449  JUnit should constrain tests to selected project [JUnit] 
-		IJavaSearchScope scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { element },
-				IJavaSearchScope.SOURCES | IJavaSearchScope.APPLICATION_LIBRARIES);
-		TestSearchEngine searchEngine= new TestSearchEngine(); 
-		return searchEngine.searchMethod(pm, scope);
-	}
-		
-	public static boolean hasSuiteMethod(IType type) throws JavaModelException {
-		IMethod method= type.getMethod("suite", new String[0]); //$NON-NLS-1$
-		if (method == null || !method.exists()) 
-			return false;
-		
-		if (!Flags.isStatic(method.getFlags()) ||	
-			!Flags.isPublic(method.getFlags()) ||			
-			!Flags.isPublic(method.getDeclaringType().getFlags())) { 
-			return false;
-		}
-		if (!Signature.getSimpleName(Signature.toString(method.getReturnType())).equals(JUnitPlugin.SIMPLE_TEST_INTERFACE_NAME)) {
-			return false;
-		}
-		return true;
-	}
-	
-	private static boolean isTestType(IType type) throws JavaModelException {
-		if (Flags.isAbstract(type.getFlags())) 
-			return false;
-		if (!Flags.isPublic(type.getFlags())) 
-			return false;
-		
-		IType[] interfaces= type.newSupertypeHierarchy(null).getAllSuperInterfaces(type);
-		for (int i= 0; i < interfaces.length; i++)
-			if(interfaces[i].getFullyQualifiedName().equals(JUnitPlugin.TEST_INTERFACE_NAME))
-				return true;
-		return false;
-	}
-
-	public static boolean isTestImplementor(IType type) throws JavaModelException {
-		ITypeHierarchy typeHier= type.newSupertypeHierarchy(null);
-		IType[] superInterfaces= typeHier.getAllInterfaces();
-		for (int i= 0; i < superInterfaces.length; i++) {
-			if (superInterfaces[i].getFullyQualifiedName().equals(JUnitPlugin.TEST_INTERFACE_NAME))
-				return true;
-		}
-		return false;
-	}
-
-	public static boolean isTestOrTestSuite(IType type) throws JavaModelException {
-		return hasSuiteMethod(type) || isTestType(type);
-	}
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/IAboutToRunOperation.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/IAboutToRunOperation.java
deleted file mode 100644
index f6337bc..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/IAboutToRunOperation.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.junit.wizards;
-
-/**
- * Interface to notify an page that the operation
- * is about to run. This gives the page a chance
- * to copy widget data into fields so that the
- * data can be access from a ModalContextThread
- */
-public interface IAboutToRunOperation {
-
-	void aboutToRunOperation();
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/JUnitWizard.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/JUnitWizard.java
deleted file mode 100644
index afa9a72..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/JUnitWizard.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.util.ExceptionHandler;
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell; 
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
-/**
- * The wizard base class for JUnit creation wizards.
- */
-public abstract class JUnitWizard extends Wizard implements INewWizard {
-
-	private IWorkbench fWorkbench;
-	protected static final String DIALOG_SETTINGS_KEY= "JUnitWizards"; //$NON-NLS-1$
-	private IStructuredSelection fSelection;
-
-	public JUnitWizard() {
-		setNeedsProgressMonitor(true);
-		initializeDefaultPageImageDescriptor();
-	}
-	
-	/*
-	 * @see IWizard#performFinish()
-	 */
-	public abstract boolean performFinish();
-
-	/**
-	 * Run a runnable
-	 */	
-	protected boolean finishPage(IRunnableWithProgress runnable) {
-		IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(runnable);
-		try {
-			IWizardPage[] pages= getPages();
-			for (int i= 0; i < pages.length; i++) {
-				IWizardPage page= pages[i];
-				if (page instanceof IAboutToRunOperation) {
-					((IAboutToRunOperation)page).aboutToRunOperation();
-				}
-			}
-			PlatformUI.getWorkbench().getProgressService().runInUI(getContainer(), op, ResourcesPlugin.getWorkspace().getRoot()); 
-			
-		} catch (InvocationTargetException e) {
-			Shell shell= getShell();
-			String title= WizardMessages.getString("NewJUnitWizard.op_error.title"); //$NON-NLS-1$
-			String message= WizardMessages.getString("NewJUnitWizard.op_error.message"); //$NON-NLS-1$
-			ExceptionHandler.handle(e, shell, title, message);
-			return false;
-		} catch  (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-
-	protected void openResource(final IResource resource) {
-		if (resource.getType() == IResource.FILE) {
-			final IWorkbenchPage activePage= JUnitPlugin.getActivePage();
-			if (activePage != null) {
-				final Display display= Display.getDefault();
-				if (display != null) {
-					display.asyncExec(new Runnable() {
-						public void run() {
-							try {
-								IDE.openEditor(activePage, (IFile)resource, true);
-							} catch (PartInitException e) {
-								JUnitPlugin.log(e);
-							}
-						}
-					});
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		fWorkbench= workbench;
-		fSelection= currentSelection;
-	}
-	
-	public IStructuredSelection getSelection() {
-		return fSelection;
-	}
-
-	protected void selectAndReveal(IResource newResource) {
-		BasicNewResourceWizard.selectAndReveal(newResource, fWorkbench.getActiveWorkbenchWindow());
-	} 
-	
-	protected void initDialogSettings() {
-		IDialogSettings pluginSettings= JUnitPlugin.getDefault().getDialogSettings();
-		IDialogSettings wizardSettings= pluginSettings.getSection(DIALOG_SETTINGS_KEY);
-		if (wizardSettings == null) {
-			wizardSettings= new DialogSettings(DIALOG_SETTINGS_KEY);
-			pluginSettings.addSection(wizardSettings);
-		}
-		setDialogSettings(wizardSettings);
-	}
-
-	protected abstract void initializeDefaultPageImageDescriptor();
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/MethodStubsSelectionButtonGroup.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/MethodStubsSelectionButtonGroup.java
deleted file mode 100644
index e978a60..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/MethodStubsSelectionButtonGroup.java
+++ /dev/null

@@ -1,495 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import org.eclipse.jdt.internal.junit.util.*;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * A group of controls used in the JUnit TestCase and TestSuite wizards
- * for selecting method stubs to create.
- */
-public class MethodStubsSelectionButtonGroup {
-
-	private Label fLabel;
-	protected String fLabelText;
-	
-	private SelectionButtonGroupListener fGroupListener;
-	
-	private boolean fEnabled;
-
-	private Composite fButtonComposite;
-	
-	private Button[] fButtons;
-	private String[] fButtonNames;
-	private boolean[] fButtonsSelected;
-	private boolean[] fButtonsEnabled;
-	private Combo fMainCombo;
-	private boolean fMainComboEnabled;
-	
-	private int fGroupBorderStyle;
-	private int fGroupNumberOfColumns;
-	private int fButtonsStyle;	
-	private boolean fUseSuiteInMainForTextRunner= false;
-	
-
-	public interface SelectionButtonGroupListener {
-		/**
-		 * The dialog field has changed.
-		 */
-		void groupChanged(MethodStubsSelectionButtonGroup field);
-	}
-		
-	/**
-	 * Creates a group without border.
-	 */
-	public MethodStubsSelectionButtonGroup(int buttonsStyle, String[] buttonNames, int nColumns) {
-		this(buttonsStyle, buttonNames, nColumns, SWT.NONE);		
-	}	
-	
-	/**
-	 * Creates a group with border (label in border).
-	 * Accepted button styles are: SWT.RADIO, SWT.CHECK, SWT.TOGGLE
-	 * For border styles see <code>Group</code>
-	 */	
-	public MethodStubsSelectionButtonGroup(int buttonsStyle, String[] buttonNames, int nColumns, int borderStyle) {
-		fEnabled= true;
-		fLabel= null;
-		fLabelText= ""; //$NON-NLS-1$
-		
-		Assert.isTrue(buttonsStyle == SWT.RADIO || buttonsStyle == SWT.CHECK || buttonsStyle == SWT.TOGGLE);
-		fButtonNames= buttonNames;
-		
-		int nButtons= buttonNames.length;
-		fButtonsSelected= new boolean[nButtons];
-		fButtonsEnabled= new boolean[nButtons];
-		for (int i= 0; i < nButtons; i++) {
-			fButtonsSelected[i]= false;
-			fButtonsEnabled[i]= true;
-		}
-		fMainComboEnabled= true;
-		if (fButtonsStyle == SWT.RADIO) {
-			fButtonsSelected[0]= true;
-		}
-		
-		fGroupBorderStyle= borderStyle;
-		fGroupNumberOfColumns= (nColumns <= 0) ? nButtons : nColumns;
-		
-		fButtonsStyle= buttonsStyle;
-	}
-	
-	public void setUseSuiteInMainForTextRunner(boolean useSuiteInMain) {
-		fUseSuiteInMainForTextRunner= useSuiteInMain;
-	}
-	
-	/*
-	 * @see DialogField#doFillIntoGrid
-	 */
-	public Control[] doFillIntoGrid(Composite parent, int nColumns) {
-		assertEnoughColumns(nColumns);
-				
-		if (fGroupBorderStyle == SWT.NONE) {
-			Label label= getLabelControl(parent);
-			label.setLayoutData(gridDataForLabel(1));
-		
-			Composite buttonsgroup= getSelectionButtonsGroup(parent);
-			GridData gd= new GridData();
-			gd.horizontalSpan= nColumns - 1;
-			buttonsgroup.setLayoutData(gd);
-			return new Control[] { label, buttonsgroup };
-		} else {
-			Composite buttonsgroup= getSelectionButtonsGroup(parent);
-			GridData gd= new GridData();
-			gd.horizontalSpan= nColumns;
-			buttonsgroup.setLayoutData(gd);
-			return new Control[] { buttonsgroup };
-		}
-	}	
-
-	/*
-	 * @see DialogField#doFillIntoGrid
-	 */	
-	public int getNumberOfControls() {
-		return (fGroupBorderStyle == SWT.NONE) ? 2 : 1;
-	}
-	
-	private Button createSelectionButton(int index, Composite group, SelectionListener listener) {
-		Button button= new Button(group, fButtonsStyle | SWT.LEFT);
-		button.setFont(group.getFont());			
-		button.setText(fButtonNames[index]);
-		button.setEnabled(isEnabled() && fButtonsEnabled[index]);
-		button.setSelection(fButtonsSelected[index]);
-		button.addSelectionListener(listener);
-		button.setLayoutData(new GridData());
-		return button;
-	}
-	
-	private Button createMainCombo(int index, Composite group, SelectionListener listener) {
-		Composite buttonComboGroup= new Composite(group, 0);
-
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 20;
-		layout.numColumns= 2;
-		buttonComboGroup.setLayout(layout);
-		
-		Button button= new Button(buttonComboGroup, fButtonsStyle | SWT.LEFT);
-		button.setFont(group.getFont());			
-		button.setText(fButtonNames[index]);
-		button.setEnabled(isEnabled() && fButtonsEnabled[index]);
-		button.setSelection(fButtonsSelected[index]);
-		button.addSelectionListener(listener);
-		button.setLayoutData(new GridData());
-
-
-		fMainCombo= new Combo(buttonComboGroup, SWT.READ_ONLY);
-		fMainCombo.setItems(new String[] {
-				WizardMessages.getString("MethodStubsSelectionButtonGroup.text"), //$NON-NLS-1$
-				WizardMessages.getString("MethodStubsSelectionButtonGroup.swing"), //$NON-NLS-1$
-				WizardMessages.getString("MethodStubsSelectionButtonGroup.awt")}); //$NON-NLS-1$
-		fMainCombo.select(0);
-		fMainCombo.setEnabled(isEnabled() && fMainComboEnabled);
-		fMainCombo.setFont(group.getFont());
-		fMainCombo.setLayoutData(new GridData());
-		return button;
-	}
-
-	public String getMainMethod(String typeName) {
-		StringBuffer main= new StringBuffer("public static void main(String[] args) {"); //$NON-NLS-1$
-		if (isSelected(1)) {
-			main.append("junit."); //$NON-NLS-1$
-			switch (getComboSelection()) {
-				case 0:
-					main.append("textui"); //$NON-NLS-1$
-					break;
-				case 1:
-					main.append("swingui"); //$NON-NLS-1$
-					break;
-				case 2 :
-					main.append("awtui"); //$NON-NLS-1$
-					break;
-				default :
-					main.append("textui"); //$NON-NLS-1$
-					break;
-			}
-			// fix for 53352 Test case wizard generates wrong code 
-			if (fUseSuiteInMainForTextRunner && getComboSelection() == 0) {
-				main.append(".TestRunner.run(" + typeName + ".suite());"); //$NON-NLS-1$ //$NON-NLS-2$				
-			} else {
-				main.append(".TestRunner.run(" + typeName + ".class);"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		main.append("}\n\n"); //$NON-NLS-1$
-		return main.toString();
-	}
-
-	/**
-	 * Returns the group widget. When called the first time, the widget will be created.
-	 * @param parent composite when called the first time, or <code>null</code>
-	 * after.
-	 */
-	public Composite getSelectionButtonsGroup(Composite parent) {
-		if (fButtonComposite == null) {
-			assertCompositeNotNull(parent);
-			
-			GridLayout layout= new GridLayout();
-			layout.makeColumnsEqualWidth= true;
-			layout.numColumns= fGroupNumberOfColumns;			
-			
-			if (fGroupBorderStyle != SWT.NONE) {
-				Group group= new Group(parent, fGroupBorderStyle);
-				if (fLabelText != null && fLabelText.length() > 0) {
-					group.setText(fLabelText);
-				}
-				fButtonComposite= group;
-			} else {
-				fButtonComposite= new Composite(parent, SWT.NULL);
-				layout.marginHeight= 0;
-				layout.marginWidth= 0;
-			}
-			fButtonComposite.setLayout(layout);
-			
-			SelectionListener listener= new SelectionListener() {
-				public void widgetDefaultSelected(SelectionEvent e) {
-					doWidgetSelected(e);
-				}
-				public void widgetSelected(SelectionEvent e) {
-					doWidgetSelected(e);
-				}
-			};
-			int nButtons= fButtonNames.length;
-			fButtons= new Button[nButtons];
-
-			fButtons[0]= createSelectionButton(0, fButtonComposite, listener);
-			fButtons[1]= createMainCombo(1, fButtonComposite, listener);
-			for (int i= 2; i < nButtons; i++) {
-				fButtons[i]= createSelectionButton(i, fButtonComposite, listener);
-			}
-			int nRows= nButtons / fGroupNumberOfColumns;
-			int nFillElements= nRows * fGroupNumberOfColumns - nButtons;
-			for (int i= 0; i < nFillElements; i++) {
-				createEmptySpace(fButtonComposite);
-			}
-			setSelectionGroupListener(new SelectionButtonGroupListener() {
-				public void groupChanged(MethodStubsSelectionButtonGroup field) {
-					field.setEnabled(1, isEnabled() && field.isSelected(0));
-				}
-			});			
-		}
-		return fButtonComposite;
-	}
-
-	/**
-	 * Returns a button from the group or <code>null</code> if not yet created.
-	 */	
-	public Button getSelectionButton(int index) {
-		if (index >= 0 && index < fButtons.length) {
-			return fButtons[index];
-		}
-		return null;
-	}
-	
-	private void doWidgetSelected(SelectionEvent e) {
-		Button button= (Button)e.widget;
-		for (int i= 0; i < fButtons.length; i++) {
-			if (fButtons[i] == button) {
-				fButtonsSelected[i]= button.getSelection();
-				dialogFieldChanged();
-				return;
-			}
-		}
-	}	
-	
-	/**
-	 * Returns the selection state of a button contained in the group.
-	 * @param index of the button
-	 */
-	public boolean isSelected(int index) {
-		if (index >= 0 && index < fButtonsSelected.length) {
-			return fButtonsSelected[index];
-		}
-		return false;
-	}
-	
-	/**
-	 * Sets the selection state of a button contained in the group.
-	 */
-	public void setSelection(int index, boolean selected) {
-		if (index >= 0 && index < fButtonsSelected.length) {
-			if (fButtonsSelected[index] != selected) {
-				fButtonsSelected[index]= selected;
-				if (fButtons != null) {
-					Button button= fButtons[index];
-					if (isOkToUse(button)) {
-						button.setSelection(selected);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the enabled state of a button contained in the group.
-	 * @param index of the button
-	 */
-	public boolean isEnabled(int index) {
-		if (index >= 0 && index < fButtonsEnabled.length) {
-			return fButtonsEnabled[index];
-		}
-		return false;
-	}
-	
-	/**
-	 * Sets the selection state of a button contained in the group.
-	 */
-	public void setEnabled(int index, boolean enabled) {
-		if (index >= 0 && index < fButtonsEnabled.length) {
-			if (fButtonsEnabled[index] != enabled) {
-				fButtonsEnabled[index]= enabled;
-				if (index == 1)
-					fMainComboEnabled= enabled;
-				if (fButtons != null) {
-					Button button= fButtons[index];
-					if (isOkToUse(button)) {
-						button.setEnabled(enabled);
-						if (index == 1)
-							fMainCombo.setEnabled(isEnabled() && enabled);
-					}
-				}
-			}
-		}
-	}
-
-	protected void updateEnableState() {
-		if (fLabel != null) {
-			fLabel.setEnabled(fEnabled);
-		}
-		if (fButtons != null) {
-			boolean enabled= isEnabled();
-			for (int i= 0; i < fButtons.length; i++) {
-				Button button= fButtons[i];
-				if (isOkToUse(button)) {
-					button.setEnabled(enabled && fButtonsEnabled[i]);
-				}
-			}
-			fMainCombo.setEnabled(enabled && fMainComboEnabled);
-		}
-	}
-	
-	public int getComboSelection() {
-		return fMainCombo.getSelectionIndex();
-	}
-	
-	public void setComboSelection(int index) {
-		fMainCombo.select(index);
-	}
-
-
-	/**
-	 * Sets the label of the dialog field.
-	 */
-	public void setLabelText(String labeltext) {
-		fLabelText= labeltext;
-	}
-		
-	/**
-	 * Defines the listener for this dialog field.
-	 */	
-	public final void setSelectionGroupListener(SelectionButtonGroupListener listener) {
-		fGroupListener= listener;
-	}
-
-	/**
-	 * A dialog field has changed.
-	 */		
-	public void dialogFieldChanged() {
-		if (fGroupListener != null) {
-			fGroupListener.groupChanged(this);
-		}
-	}	
-	
-	/**
-	 * Tries to set the focus to the dialog field.
-	 * Returns <code>true</code> if the dialog field can take focus.
-	 * 	To be re-implemented by dialog field implementors.
-	 */
-	public boolean setFocus() {
-		return false;
-	}
-
-	/**
-	 * Posts <code>setFocus</code> to the display event queue.
-	 */	
-	public void postSetFocusOnDialogField(Display display) {
-		if (display != null) {
-			display.asyncExec(
-				new Runnable() {
-					public void run() {
-						setFocus();
-					}
-				}
-			);
-		}
-	}		
-	
-	protected static GridData gridDataForLabel(int span) {
-		GridData gd= new GridData();
-		gd.horizontalSpan= span;
-		return gd;
-	}
-	
-	/**
-	 * Creates or returns the created label widget.
-	 * @param parent The parent composite or <code>null</code> if the widget has
-	 * already been created.
-	 */			
-	public Label getLabelControl(Composite parent) {
-		if (fLabel == null) {
-			assertCompositeNotNull(parent);
-			
-			fLabel= new Label(parent, SWT.LEFT | SWT.WRAP);
-			fLabel.setFont(parent.getFont());
-			fLabel.setEnabled(fEnabled);		
-			if (fLabelText != null && !"".equals(fLabelText)) { //$NON-NLS-1$
-				fLabel.setText(fLabelText);
-			} else {
-				// XXX: to avoid a 16 pixel wide empty label - revisit
-				fLabel.setText("."); //$NON-NLS-1$
-				fLabel.setVisible(false);
-			}			
-		}
-		return fLabel;
-	}
-
-	/**
-	 * Creates a spacer control.
-	 * @param parent The parent composite
-	 */		
-	public static Control createEmptySpace(Composite parent) {
-		return createEmptySpace(parent, 1);
-	}
-
-	/**
-	 * Creates a spacer control with the given span.
-	 * The composite is assumed to have <code>MGridLayout</code> as
-	 * layout.
-	 * @param parent The parent composite
-	 */			
-	public static Control createEmptySpace(Composite parent, int span) {
-		return LayoutUtil.createEmptySpace(parent, span);
-	}
-	
-	/**
-	 * Tests is the control is not <code>null</code> and not disposed.
-	*/
-	protected final boolean isOkToUse(Control control) {
-		return (control != null) && !(control.isDisposed());
-	}
-	
-	// --------- enable / disable management
-	
-	/**
-	 * Sets the enable state of the dialog field.
-	 */
-	public final void setEnabled(boolean enabled) {
-		if (enabled != fEnabled) {
-			fEnabled= enabled;
-			updateEnableState();
-		}
-	}
-	
-	/**
-	 * Gets the enable state of the dialog field.
-	 */	
-	public final boolean isEnabled() {
-		return fEnabled;
-	}
-
-	protected final void assertCompositeNotNull(Composite comp) {
-		Assert.isNotNull(comp, "uncreated control requested with composite null"); //$NON-NLS-1$
-	}
-	
-	protected final void assertEnoughColumns(int nColumns) {
-		Assert.isTrue(nColumns >= getNumberOfControls(), "given number of columns is too small"); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizard.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizard.java
deleted file mode 100644
index 1326523..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizard.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * A wizard for creating test cases.
- */
-public class NewTestCaseCreationWizard extends JUnitWizard {
-
-	private NewTestCaseCreationWizardPage fPage;
-	private NewTestCaseCreationWizardPage2 fPage2;
-
-	public NewTestCaseCreationWizard() {
-		super();
-		setWindowTitle(WizardMessages.getString("Wizard.title.new.testcase")); //$NON-NLS-1$
-		initDialogSettings();
-	}
-
-	protected void initializeDefaultPageImageDescriptor() {
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(JUnitPlugin.makeIconFileURL("wizban/newtest_wiz.gif")); //$NON-NLS-1$
-			setDefaultPageImageDescriptor(id);
-	} catch (MalformedURLException e) {
-			// Should not happen.  Ignore.
-		}
-	}
-
-
-	/*
-	 * @see Wizard#createPages
-	 */	
-	public void addPages() {
-		super.addPages();
-		fPage= new NewTestCaseCreationWizardPage();
-		fPage2= new NewTestCaseCreationWizardPage2(fPage);
-		addPage(fPage);
-		fPage.init(getSelection(), fPage2);
-		addPage(fPage2);
-	}	
-	
-	/*
-	 * @see Wizard#performFinish
-	 */		
-	public boolean performFinish() {
-		if (finishPage(fPage.getRunnable())) {
-			IType newClass= fPage.getCreatedType();
-
-			ICompilationUnit cu= newClass.getCompilationUnit();				
-
-			if (cu.isWorkingCopy()) {
-				cu= (ICompilationUnit)cu.getOriginalElement();
-			}	
-			IResource resource= cu.getResource();
-			if (resource != null) {
-				selectAndReveal(resource);
-				openResource(resource);
-			}
-			fPage.saveWidgetValues();
-			fPage2.saveWidgetValues();
-			
-			return true;
-		}
-		return false;		
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage.java
deleted file mode 100644
index c500ab9..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage.java
+++ /dev/null

@@ -1,921 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids - bug 38507
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.jdt.internal.junit.ui.IJUnitHelpContextIds;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.util.JUnitStatus;
-import org.eclipse.jdt.internal.junit.util.JUnitStubUtility;
-import org.eclipse.jdt.internal.junit.util.LayoutUtil;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-import org.eclipse.jdt.internal.junit.util.JUnitStubUtility.GenStubSettings;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.internal.ui.refactoring.contentassist.ControlContentAssistHelper;
-import org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompletionProcessor;
-import org.eclipse.jdt.internal.ui.util.SWTUtil;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * The first page of the TestCase creation wizard. 
- */
-public class NewTestCaseCreationWizardPage extends NewTypeWizardPage implements IAboutToRunOperation {
-
-	private final static String PAGE_NAME= "NewTestCaseCreationWizardPage"; //$NON-NLS-1$
-	private final static String CLASS_TO_TEST= PAGE_NAME + ".classtotest"; //$NON-NLS-1$
-	private final static String TEST_SUFFIX= "Test"; //$NON-NLS-1$
-	private final static String SETUP= "setUp"; //$NON-NLS-1$
-	private final static String TEARDOWN= "tearDown"; //$NON-NLS-1$
-
-	private final static String STORE_GENERATE_MAIN= PAGE_NAME + ".GENERATE_MAIN"; //$NON-NLS-1$
-	private final static String STORE_USE_TESTRUNNER= PAGE_NAME + ".USE_TESTRUNNER";	//$NON-NLS-1$
-	private final static String STORE_TESTRUNNER_TYPE= PAGE_NAME + ".TESTRUNNER_TYPE"; //$NON-NLS-1$
-	
-	private String fDefaultClassToTest;
-	private NewTestCaseCreationWizardPage2 fPage2;
-	private MethodStubsSelectionButtonGroup fMethodStubsButtons;
-
-	private IType fClassToTest;
-	private IStatus fClassToTestStatus;
-	private IStatus fTestClassStatus;
-
-	private int fIndexOfFirstTestMethod;
-
-	private Label fClassToTestLabel;
-	private Text fClassToTestText;
-	private Button fClassToTestButton;
-	private JavaTypeCompletionProcessor fClassToTestCompletionProcessor;
-	
-	private boolean fFirstTime;
-	private String fMainMethod;  
-
-	public NewTestCaseCreationWizardPage() {
-		super(true, PAGE_NAME);
-		fFirstTime= true;
-		
-		setTitle(WizardMessages.getString("NewTestClassWizPage.title")); //$NON-NLS-1$
-		setDescription(WizardMessages.getString("NewTestClassWizPage.description")); //$NON-NLS-1$
-		
-		String[] buttonNames= new String[] {
-			"public static void main(Strin&g[] args)", //$NON-NLS-1$
-			/* Add testrunner statement to main Method */
-			WizardMessages.getString("NewTestClassWizPage.methodStub.testRunner"), //$NON-NLS-1$
-			WizardMessages.getString("NewTestClassWizPage.methodStub.setUp"), //$NON-NLS-1$
-			WizardMessages.getString("NewTestClassWizPage.methodStub.tearDown"), //$NON-NLS-1$
-			WizardMessages.getString("NewTestClassWizPage.methodStub.constructor") //$NON-NLS-1$
-		};
-		
-		fMethodStubsButtons= new MethodStubsSelectionButtonGroup(SWT.CHECK, buttonNames, 1);
-		fMethodStubsButtons.setLabelText(WizardMessages.getString("NewTestClassWizPage.method.Stub.label")); //$NON-NLS-1$
-		
-		fClassToTestCompletionProcessor= new JavaTypeCompletionProcessor(false, false); //$NON-NLS-1$
-
-		fClassToTestStatus= new JUnitStatus();
-		fTestClassStatus= new JUnitStatus();
-		
-		fDefaultClassToTest= ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Should be called from the wizard with the initial selection and the 2nd page of the wizard..
-	 */
-	public void init(IStructuredSelection selection, NewTestCaseCreationWizardPage2 page2) {
-		fPage2= page2;
-		IJavaElement element= getInitialJavaElement(selection);
-
-		initContainerPage(element);
-		initTypePage(element);
-		doStatusUpdate();		
-		// put default class to test		
-		if (element != null) {
-			IType classToTest= null;
-			// evaluate the enclosing type
-			IType typeInCompUnit= (IType) element.getAncestor(IJavaElement.TYPE);
-			if (typeInCompUnit != null) {
-				if (typeInCompUnit.getCompilationUnit() != null) {
-					classToTest= typeInCompUnit;
-				}
-			} else {
-				ICompilationUnit cu= (ICompilationUnit) element.getAncestor(IJavaElement.COMPILATION_UNIT);
-				if (cu != null) 
-					classToTest= cu.findPrimaryType();
-				else {
-					if (element instanceof IClassFile) {
-						try {
-							IClassFile cf= (IClassFile) element;
-							if (cf.isStructureKnown())
-								classToTest= cf.getType();
-						} catch(JavaModelException e) {
-							JUnitPlugin.log(e);
-						}
-					}					
-				}
-			}
-			if (classToTest != null) {
-				try {
-					if (!TestSearchEngine.isTestImplementor(classToTest)) {
-						fDefaultClassToTest= classToTest.getFullyQualifiedName();
-					}
-				} catch (JavaModelException e) {
-					JUnitPlugin.log(e);
-				}
-			}
-		}
-		fMethodStubsButtons.setSelection(0, false); //main
-		fMethodStubsButtons.setSelection(1, false); //add textrunner
-		fMethodStubsButtons.setEnabled(1, false); //add text
-		fMethodStubsButtons.setSelection(2, false); //setUp
-		fMethodStubsButtons.setSelection(3, false); //tearDown
-		fMethodStubsButtons.setSelection(4, false); //constructor
-	}
-	
-	/**
-	 * @see org.eclipse.jdt.ui.wizards.NewContainerWizardPage#handleFieldChanged(String)
-	 */
-	protected void handleFieldChanged(String fieldName) {
-		super.handleFieldChanged(fieldName);
-		if (fieldName.equals(CLASS_TO_TEST)) {
-			fClassToTestStatus= classToTestClassChanged();
-		} else if (fieldName.equals(SUPER)) {
-			validateSuperClass(); 
-			if (!fFirstTime)
-				fTestClassStatus= typeNameChanged();	
-		} else if (fieldName.equals(TYPENAME)) {
-			fTestClassStatus= typeNameChanged();
-		} else if (fieldName.equals(PACKAGE) || fieldName.equals(CONTAINER) || fieldName.equals(SUPER)) {
-			if (fieldName.equals(PACKAGE))
-				fPackageStatus= packageChanged();
-			if (!fFirstTime) {
-				validateSuperClass();
-				fClassToTestStatus= classToTestClassChanged();			
-				fTestClassStatus= typeNameChanged();
-			}
-			if (fieldName.equals(CONTAINER)) {
-				validateJUnitOnBuildPath(); 
-			}
-		}
-		doStatusUpdate();
-	}
-
-	// ------ validation --------
-	private void doStatusUpdate() {
-		// status of all used components
-		IStatus[] status= new IStatus[] {
-			fContainerStatus,
-			fPackageStatus,
-			fTestClassStatus,
-			fClassToTestStatus,
-			fModifierStatus,
-			fSuperClassStatus
-		};
-		
-		// the mode severe status will be displayed and the ok button enabled/disabled.
-		updateStatus(status);
-	}
-
-	/*
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-		
-		Composite composite= new Composite(parent, SWT.NONE);
-		
-		int nColumns= 4;
-		
-		GridLayout layout= new GridLayout();
-		layout.numColumns= nColumns;		
-		composite.setLayout(layout);
-
-		createContainerControls(composite, nColumns);	
-		createPackageControls(composite, nColumns);
-		createSeparator(composite, nColumns);
-		createTypeNameControls(composite, nColumns);		
-		createSuperClassControls(composite, nColumns);
-		createMethodStubSelectionControls(composite, nColumns);
-		setSuperClass(JUnitPlugin.TEST_SUPERCLASS_NAME, true);
-		createSeparator(composite, nColumns);
-		createClassToTestControls(composite, nColumns);
-		
-		setControl(composite);
-			
-		//set default and focus
-		if (fDefaultClassToTest.length() > 0) {
-			fClassToTestText.setText(fDefaultClassToTest);
-			setTypeName(Signature.getSimpleName(fDefaultClassToTest)+TEST_SUFFIX, true);
-		}
-		restoreWidgetValues();
-		Dialog.applyDialogFont(composite);
-		WorkbenchHelp.setHelp(composite, IJUnitHelpContextIds.NEW_TESTCASE_WIZARD_PAGE);	
-
-	}
-
-	private void createMethodStubSelectionControls(Composite composite, int nColumns) {
-		LayoutUtil.setHorizontalSpan(fMethodStubsButtons.getLabelControl(composite), nColumns);
-		LayoutUtil.createEmptySpace(composite,1);
-		LayoutUtil.setHorizontalSpan(fMethodStubsButtons.getSelectionButtonsGroup(composite), nColumns - 1);	
-	}	
-
-	private void createClassToTestControls(Composite composite, int nColumns) {
-		fClassToTestLabel= new Label(composite, SWT.LEFT | SWT.WRAP);
-		fClassToTestLabel.setFont(composite.getFont());
-
-		fClassToTestLabel.setText(WizardMessages.getString("NewTestClassWizPage.class_to_test.label")); //$NON-NLS-1$
-		GridData gd= new GridData();
-		gd.horizontalSpan= 1;
-		fClassToTestLabel.setLayoutData(gd);
-
-		fClassToTestText= new Text(composite, SWT.SINGLE | SWT.BORDER);
-		fClassToTestText.setEnabled(true);
-		fClassToTestText.setFont(composite.getFont());
-		fClassToTestText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				handleFieldChanged(CLASS_TO_TEST);
-			}
-		});
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.FILL;
-		gd.grabExcessHorizontalSpace= true;
-		gd.horizontalSpan= nColumns - 2;
-		fClassToTestText.setLayoutData(gd);
-		
-		fClassToTestButton= new Button(composite, SWT.PUSH);
-		fClassToTestButton.setText(WizardMessages.getString("NewTestClassWizPage.class_to_test.browse")); //$NON-NLS-1$
-		fClassToTestButton.setEnabled(true);
-		fClassToTestButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				classToTestButtonPressed();
-			}
-			public void widgetSelected(SelectionEvent e) {
-				classToTestButtonPressed();
-			}
-		});	
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.FILL;
-		gd.grabExcessHorizontalSpace= false;
-		gd.horizontalSpan= 1;
-		gd.heightHint = SWTUtil.getButtonHeightHint(fClassToTestButton);
-		gd.widthHint = SWTUtil.getButtonWidthHint(fClassToTestButton);		
-		fClassToTestButton.setLayoutData(gd);
-
-		ControlContentAssistHelper.createTextContentAssistant(fClassToTestText, fClassToTestCompletionProcessor);
-	}
-
-	private void classToTestButtonPressed() {
-		IType type= chooseClassToTestType();
-		if (type != null) {
-			fClassToTestText.setText(JavaModelUtil.getFullyQualifiedName(type));
-			handleFieldChanged(CLASS_TO_TEST);
-		}
-	}
-
-	private IType chooseClassToTestType() {	
-		IPackageFragmentRoot root= getPackageFragmentRoot();
-		if (root == null) 
-			return null;
-
-		IJavaElement[] elements= new IJavaElement[] { root.getJavaProject() };
-		IJavaSearchScope scope= SearchEngine.createJavaSearchScope(elements);
-		
-		IType type= null;
-		try {		
-			SelectionDialog dialog= JavaUI.createTypeDialog(getShell(), getWizard().getContainer(), scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false, getClassToTestText());
-			dialog.setTitle(WizardMessages.getString("NewTestClassWizPage.class_to_test.dialog.title")); //$NON-NLS-1$
-			dialog.setMessage(WizardMessages.getString("NewTestClassWizPage.class_to_test.dialog.message")); //$NON-NLS-1$
-			dialog.open();
-			if (dialog.getReturnCode() != Window.OK)
-				return type;
-			else {
-				Object[] resultArray= dialog.getResult();
-				if (resultArray != null && resultArray.length > 0)
-					type= (IType) resultArray[0];
-			}
-		} catch (JavaModelException e) {
-			JUnitPlugin.log(e);
-		}
-		return type;
-	}
-
-	/*
-	 * @see org.eclipse.jdt.ui.wizards.NewTypeWizardPage#packageChanged()
-	 */
-	protected IStatus packageChanged() {
-		IStatus status= super.packageChanged();
-		fClassToTestCompletionProcessor.setPackageFragment(getPackageFragment());
-		return status;
-	}
-	
-	private IStatus classToTestClassChanged() {
-		fClassToTestButton.setEnabled(getPackageFragmentRoot() != null);	// sets the test class field?
-		IStatus status= validateClassToTest();
-		return status;
-	}
-
-	/**
-	 * Returns the content of the class to test text field.
-	 */
-	public String getClassToTestText() {
-		return fClassToTestText.getText();
-	}
-	
-	/**
-	 * Returns the class to be tested.
-	 */
-	public IType getClassToTest() {
-		return fClassToTest;
-	}
-
-	/**
-	 * Sets the name of the class to test.
-	 */		
-	public void setClassToTest(String name) {
-		fClassToTestText.setText(name);
-	}	
-
-	/**
-	 * @see NewTypeWizardPage#createTypeMembers(IType, ImportsManager, IProgressMonitor)
-	 */
-	protected void createTypeMembers(IType type, ImportsManager imports, IProgressMonitor monitor) throws CoreException {
-		fIndexOfFirstTestMethod= 0;
-
-		if (fMethodStubsButtons.isSelected(0)) 
-			createMain(type);
-		
-		if (fMethodStubsButtons.isSelected(2)) {
-			createSetUp(type, imports);
-		}
-		
-		if (fMethodStubsButtons.isSelected(3)) {
-			createTearDown(type, imports);
-		}
-
-		if (fMethodStubsButtons.isSelected(4))
-			createConstructor(type, imports); 		
-
-		if (fClassToTest != null) {
-			createTestMethodStubs(type);
-		}
-	}
-
-	private void createConstructor(IType type, ImportsManager imports) throws JavaModelException {
-		ITypeHierarchy typeHierarchy= null;
-		IType[] superTypes= null;
-		String constr= ""; //$NON-NLS-1$
-		IMethod methodTemplate= null;
-		if (type.exists()) {
-			typeHierarchy= type.newSupertypeHierarchy(null);
-			superTypes= typeHierarchy.getAllSuperclasses(type);
-			for (int i= 0; i < superTypes.length; i++) {
-				if (superTypes[i].exists()) {
-					IMethod constrMethod= superTypes[i].getMethod(superTypes[i].getElementName(), new String[] {"Ljava.lang.String;"}); //$NON-NLS-1$
-					if (constrMethod.exists() && constrMethod.isConstructor()) {
-						methodTemplate= constrMethod;
-						break;
-					}
-				}
-			}
-		}
-		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
-		if (methodTemplate != null) {
-			GenStubSettings genStubSettings= new GenStubSettings(settings);
-			genStubSettings.fCallSuper= true;				
-			genStubSettings.fMethodOverwrites= true;
-			constr= JUnitStubUtility.genStub(getTypeName(), methodTemplate, genStubSettings, imports);
-		} else {
-			constr += "public "+getTypeName()+"(String name) {" + //$NON-NLS-1$  //$NON-NLS-2$ 
-					getLineDelimiter() +
-					"super(name);" + //$NON-NLS-1$ 
-					getLineDelimiter() +
-					"}" + //$NON-NLS-1$ 
-					getLineDelimiter() + getLineDelimiter();
-		}
-		type.createMethod(constr, null, true, null);	
-		fIndexOfFirstTestMethod++;
-	}
-
-	private void createMain(IType type) throws JavaModelException {
-		type.createMethod(fMainMethod, null, false, null);	
-		fIndexOfFirstTestMethod++;		
-	}
-
-	private void createSetUp(IType type, ImportsManager imports) throws JavaModelException {
-		ITypeHierarchy typeHierarchy= null;
-		IType[] superTypes= null;
-		String setUp= ""; //$NON-NLS-1$
-		IMethod methodTemplate= null;
-		if (type.exists()) {
-			typeHierarchy= type.newSupertypeHierarchy(null);
-			superTypes= typeHierarchy.getAllSuperclasses(type);
-			for (int i= 0; i < superTypes.length; i++) {
-				if (superTypes[i].exists()) {
-					IMethod testMethod= superTypes[i].getMethod(SETUP, new String[] {});
-					if (testMethod.exists()) {
-						methodTemplate= testMethod;
-						break;
-					}
-				}
-			}
-		}
-		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
-		if (methodTemplate != null) {
-			GenStubSettings genStubSettings= new GenStubSettings(settings);
-			genStubSettings.fCallSuper= true;				
-			genStubSettings.fMethodOverwrites= true;
-			setUp= JUnitStubUtility.genStub(getTypeName(), methodTemplate, genStubSettings, imports);
-		} else {
-			if (settings.createComments)
-				setUp= "/**" + //$NON-NLS-1$
-					getLineDelimiter() + 
-					" * Sets up the fixture, for example, open a network connection." + //$NON-NLS-1$
-					getLineDelimiter() +
-					" * This method is called before a test is executed." + //$NON-NLS-1$
-					getLineDelimiter() +
-					" * @throws Exception" + //$NON-NLS-1$
-					getLineDelimiter() +
-					" */" + //$NON-NLS-1$
-					getLineDelimiter(); 
-			setUp+= "protected void "+SETUP+"() throws Exception {}" + //$NON-NLS-1$ //$NON-NLS-2$
-				getLineDelimiter() + getLineDelimiter(); 
-		}
-		type.createMethod(setUp, null, false, null);	
-		fIndexOfFirstTestMethod++;
-	}
-	
-	private void createTearDown(IType type, ImportsManager imports) throws JavaModelException {
-		ITypeHierarchy typeHierarchy= null;
-		IType[] superTypes= null;
-		String tearDown= ""; //$NON-NLS-1$
-		IMethod methodTemplate= null;
-		if (type.exists()) {
-			typeHierarchy= type.newSupertypeHierarchy(null);
-			superTypes= typeHierarchy.getAllSuperclasses(type);
-			for (int i= 0; i < superTypes.length; i++) {
-				if (superTypes[i].exists()) {
-					IMethod testM= superTypes[i].getMethod(TEARDOWN, new String[] {});
-					if (testM.exists()) {
-						methodTemplate= testM;
-						break;
-					}
-				}
-			}
-		}
-		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
-		if (methodTemplate != null) {
-			GenStubSettings genStubSettings= new GenStubSettings(settings);				
-			genStubSettings.fCallSuper= true;
-			genStubSettings.fMethodOverwrites= true;
-			tearDown= JUnitStubUtility.genStub(getTypeName(), methodTemplate, genStubSettings, imports);
-			type.createMethod(tearDown, null, false, null);	
-			fIndexOfFirstTestMethod++;
-		}				
-	}
-
-	private void createTestMethodStubs(IType type) throws JavaModelException {
-		IMethod[] methods= fPage2.getCheckedMethods();
-		if (methods.length == 0)
-			return;
-		/* find overloaded methods */
-		IMethod[] allMethodsArray= fPage2.getAllMethods();
-		List allMethods= new ArrayList();
-		allMethods.addAll(Arrays.asList(allMethodsArray));
-		List overloadedMethods= getOveloadedMethods(allMethods);
-			
-		/* used when for example both sum and Sum methods are present. Then
-		 * sum -> testSum
-		 * Sum -> testSum1
-		 */
-		List newMethodsNames= new ArrayList();				
-			for (int i = 0; i < methods.length; i++) {
-			IMethod testedMethod= methods[i];
-			String elementName= testedMethod.getElementName();
-			StringBuffer methodName= new StringBuffer(NewTestCaseCreationWizardPage2.PREFIX+Character.toUpperCase(elementName.charAt(0))+elementName.substring(1));
-			StringBuffer newMethod= new StringBuffer();
-	
-			if (overloadedMethods.contains(testedMethod)) {
-				appendMethodComment(newMethod, testedMethod);
-				String[] params= testedMethod.getParameterTypes();
-				appendParameterNamesToMethodName(methodName, params);
-			}
-			/* Should I for examples have methods
-			 * 	void foo(java.lang.StringBuffer sb) {}
-			 *  void foo(mypackage1.StringBuffer sb) {}
-			 *  void foo(mypackage2.StringBuffer sb) {}
-			 * I will get in the test class:
-			 *  testFooStringBuffer()
-			 *  testFooStringBuffer1()
-			 *  testFooStringBuffer2()
-			 */
-			if (newMethodsNames.contains(methodName.toString())) {
-				int suffix= 1;
-				while (newMethodsNames.contains(methodName.toString() + Integer.toString(suffix)))
-					suffix++;
-				methodName.append(Integer.toString(suffix));
-			}
-			newMethodsNames.add(methodName.toString());
-			newMethod.append("public ");//$NON-NLS-1$ 
-			if (fPage2.getCreateFinalMethodStubsButtonSelection())
-				newMethod.append("final "); //$NON-NLS-1$
-			newMethod.append("void ");//$NON-NLS-1$ 
-			newMethod.append(methodName.toString());
-			newMethod.append("()");//$NON-NLS-1$ 
-			appendTestMethodBody(newMethod, testedMethod);
-			type.createMethod(newMethod.toString(), null, false, null);	
-		}
-	}
-	
-	private String getLineDelimiter(){
-		IType classToTest= getClassToTest();
-		
-		if (classToTest != null && classToTest.exists())
-			return JUnitStubUtility.getLineDelimiterUsed(classToTest);
-		else	
-			return JUnitStubUtility.getLineDelimiterUsed(getPackageFragment());
-	}
-	
-	private void appendTestMethodBody(StringBuffer newMethod, IMethod testedMethod) {
-		newMethod.append("{"); //$NON-NLS-1$
-		if (createTasks()){
-			newMethod.append(getLineDelimiter());
-			newMethod.append("//"); //$NON-NLS-1$
-			newMethod.append(JUnitStubUtility.getTodoTaskTag(getPackageFragment().getJavaProject()));
-			newMethod.append(WizardMessages.getFormattedString("NewTestClassWizPage.marker.message", testedMethod.getElementName())); //$NON-NLS-1$
-			newMethod.append(getLineDelimiter());		
-		}
-		newMethod.append("}").append(getLineDelimiter()).append(getLineDelimiter()); //$NON-NLS-1$
-	}
-
-	public void appendParameterNamesToMethodName(StringBuffer methodName, String[] params) {
-		for (int i= 0; i < params.length; i++) {
-			String param= params[i];
-			methodName.append(Signature.getSimpleName(Signature.toString(Signature.getElementType(param))));
-			for (int j= 0, arrayCount= Signature.getArrayCount(param); j < arrayCount; j++) {
-				methodName.append("Array"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	private void appendMethodComment(StringBuffer newMethod, IMethod method) throws JavaModelException {
-		String returnType= Signature.toString(method.getReturnType());
-		String body= WizardMessages.getFormattedString("NewTestClassWizPage.comment.class_to_test", new String[]{returnType, method.getElementName()}); //$NON-NLS-1$
-		newMethod.append("/*");//$NON-NLS-1$
-		newMethod.append(getLineDelimiter());
-		newMethod.append(" * ");//$NON-NLS-1$
-		newMethod.append(body);
-		newMethod.append("(");//$NON-NLS-1$
-		String[] paramTypes= method.getParameterTypes();
-		if (paramTypes.length > 0) {
-			if (paramTypes.length > 1) {
-				for (int j= 0; j < paramTypes.length-1; j++) {
-					newMethod.append(Signature.toString(paramTypes[j])+", "); //$NON-NLS-1$
-				}
-			}
-			newMethod.append(Signature.toString(paramTypes[paramTypes.length-1]));
-		}
-		newMethod.append(")");//$NON-NLS-1$
-		newMethod.append(getLineDelimiter());
-		newMethod.append(" */");//$NON-NLS-1$
-		newMethod.append(getLineDelimiter()); 
-	}
-
-	private List getOveloadedMethods(List allMethods) {
-		List overloadedMethods= new ArrayList();
-		for (int i= 0; i < allMethods.size(); i++) {
-			IMethod current= (IMethod) allMethods.get(i);
-			String currentName= current.getElementName();
-			boolean currentAdded= false;
-			for (ListIterator iter= allMethods.listIterator(i+1); iter.hasNext(); ) {
-				IMethod iterMethod= (IMethod) iter.next();
-				if (iterMethod.getElementName().equals(currentName)) {
-					//method is overloaded
-					if (!currentAdded) {
-						overloadedMethods.add(current);
-						currentAdded= true;
-					}
-					overloadedMethods.add(iterMethod);
-					iter.remove();
-				}
-			}
-		}
-		return overloadedMethods;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-
-		if (visible && fFirstTime) {
-			if (getClassToTestText().equals("")) //$NON-NLS-1$
-				setPageComplete(false);
-			else
-				handleFieldChanged(CLASS_TO_TEST); //creates error message when wizard is opened if TestCase already exists
-			fFirstTime= false;
-		}
-		
-		if (visible) setFocus();
-	}
-
-	private void validateJUnitOnBuildPath() {
-		IPackageFragmentRoot root= getPackageFragmentRoot();
-		if (root == null)
-			return;
-		IJavaProject jp= root.getJavaProject();
-		
-		try {
-			if (jp.findType(JUnitPlugin.TEST_SUPERCLASS_NAME) != null)
-				return;
-		} catch (JavaModelException e) {
-		}
-		if (MessageDialog.openQuestion(getShell(), WizardMessages.getString("NewTestClassWizPage.not_on_buildpath.title"), WizardMessages.getString("NewTestClassWizPage.not_on_buildpath.message"))) { //$NON-NLS-1$ //$NON-NLS-2$
-			try {
-				addJUnitToBuildPath(getShell(), jp);
-				return;
-			} catch(JavaModelException e) {
-				ErrorDialog.openError(getShell(), WizardMessages.getString("NewTestClassWizPage.cannot_add.title"), WizardMessages.getString("NewTestClassWizPage.cannot_add.message"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			}	
-		}
-		JUnitStatus status= new JUnitStatus();
-		status.setWarning(WizardMessages.getString("NewTestClassWizPage.error.junitNotOnbuildpath")); //$NON-NLS-1$		
-		fContainerStatus= status;
-	}
-	
-	public static void addJUnitToBuildPath(Shell shell, IJavaProject project) throws JavaModelException {
-		IProject junitProject= ResourcesPlugin.getWorkspace().getRoot().getProject("org.junit"); //$NON-NLS-1$
-		IClasspathEntry entry;
-		if (junitProject.exists()) {
-			entry= JavaCore.newProjectEntry(junitProject.getFullPath());
-		} else {
-			IPath junitHome= new Path(JUnitPlugin.JUNIT_HOME);
-			IPath sourceHome= new Path("ECLIPSE_HOME"); //$NON-NLS-1$
-			entry= JavaCore.newVariableEntry(
-				junitHome.append("junit.jar"),   //$NON-NLS-1$
-				//TODO: find a better solution than declaring a classpath variable
-				sourceHome.append("plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip"),  //$NON-NLS-1$
-				null
-			);
-		}
-		addToClasspath(shell, project, entry);
-	}	
-	
-	private static void addToClasspath(Shell shell, final IJavaProject project, IClasspathEntry entry) throws JavaModelException {
-		IClasspathEntry[] oldEntries= project.getRawClasspath();
-		for (int i= 0; i < oldEntries.length; i++) {
-			if (oldEntries[i].equals(entry)) {
-				return;
-			}
-		}
-		int nEntries= oldEntries.length;
-		final IClasspathEntry[] newEntries= new IClasspathEntry[nEntries + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, nEntries);
-		newEntries[nEntries]= entry;
-		// fix for 64974 OCE in New JUnit Test Case wizard while workspace is locked [JUnit] 
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						project.setRawClasspath(newEntries, monitor);
-					} catch (JavaModelException e) {
-						throw new InvocationTargetException(e);
-					}
-				}
-			});
-		} catch (InvocationTargetException e) {
-			Throwable t = e.getTargetException();
-			if (t instanceof CoreException) {	
-				ErrorDialog.openError(shell, WizardMessages.getString("NewTestClassWizPage.cannot_add.title"), WizardMessages.getString("NewTestClassWizPage.cannot_add.message"), ((CoreException)t).getStatus());  //$NON-NLS-1$//$NON-NLS-2$
-			}
-		} catch (InterruptedException e) {
-			return;
-		}
-	}
-
-
-	/**
-	 * Returns the index of the first method that is a test method, i.e. excluding main, setUp() and tearDown().
-	 * If none of the aforementioned method stubs is created, then 0 is returned. As such method stubs are created,
-	 * this counter is incremented.
-	 */
-	public int getIndexOfFirstMethod() {
-		return fIndexOfFirstTestMethod;
-	}
-
-	private boolean createTasks() {
-		return fPage2.getCreateTasksButtonSelection();
-	}	
-
-	private void validateSuperClass() {
-		fMethodStubsButtons.setEnabled(2, true);//enable setUp() checkbox
-		fMethodStubsButtons.setEnabled(3, true);//enable tearDown() checkbox
-		String superClassName= getSuperClass();
-		if (superClassName == null || superClassName.trim().equals("")) { //$NON-NLS-1$
-			fSuperClassStatus= new JUnitStatus();
-			((JUnitStatus)fSuperClassStatus).setError(WizardMessages.getString("NewTestClassWizPage.error.superclass.empty")); //$NON-NLS-1$
-			return;	
-		}
-		if (getPackageFragmentRoot() != null) { //$NON-NLS-1$
-			try {
-				IType type= resolveClassNameToType(getPackageFragmentRoot().getJavaProject(), getPackageFragment(), superClassName);
-				JUnitStatus status = new JUnitStatus();				
-				if (type == null) {
-					/* TODO: is this a warning or error? */
-					status.setWarning(WizardMessages.getString("NewTestClassWizPage.error.superclass.not_exist")); //$NON-NLS-1$
-					fSuperClassStatus= status;
-				} else {
-					if (type.isInterface()) {
-						status.setError(WizardMessages.getString("NewTestClassWizPage.error.superclass.is_interface")); //$NON-NLS-1$
-						fSuperClassStatus= status;
-					}
-					if (!TestSearchEngine.isTestImplementor(type)) {
-						status.setError(WizardMessages.getFormattedString("NewTestClassWizPage.error.superclass.not_implementing_test_interface", JUnitPlugin.TEST_INTERFACE_NAME)); //$NON-NLS-1$
-						fSuperClassStatus= status;
-					} else {
-						IMethod setupMethod= type.getMethod(SETUP, new String[] {});
-						IMethod teardownMethod= type.getMethod(TEARDOWN, new String[] {});
-						if (setupMethod.exists())
-							fMethodStubsButtons.setEnabled(2, !Flags.isFinal(setupMethod.getFlags()));
-						if (teardownMethod.exists())
-							fMethodStubsButtons.setEnabled(3, !Flags.isFinal(teardownMethod.getFlags()));
-					}
-				}
-			} catch (JavaModelException e) {
-				JUnitPlugin.log(e);
-			}
-		}
-	}
-		
-	/**
-	 * @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-		return isPageComplete() && getNextPage() != null && isNextPageValid();
-	}
-
-	protected boolean isNextPageValid() {
-		return !getClassToTestText().equals(""); //$NON-NLS-1$
-	}
-
-	private JUnitStatus validateClassToTest() {
-		IPackageFragmentRoot root= getPackageFragmentRoot();
-		IPackageFragment pack= getPackageFragment();
-		String classToTestName= getClassToTestText();
-		JUnitStatus status= new JUnitStatus();
-		
-		fClassToTest= null;
-		if (classToTestName.length() == 0) {
-			return status;
-		}
-		IStatus val= JavaConventions.validateJavaTypeName(classToTestName);
-//		if (!val.isOK()) {
-		if (val.getSeverity() == IStatus.ERROR) {
-			status.setError(WizardMessages.getString("NewTestClassWizPage.error.class_to_test.not_valid")); //$NON-NLS-1$
-			return status;
-		}
-		
-		if (root != null) {
-			try {		
-				IType type= resolveClassNameToType(root.getJavaProject(), pack, classToTestName);
-				if (type == null) {
-					//status.setWarning("Warning: "+typeLabel+" does not exist in current project.");
-					status.setError(WizardMessages.getString("NewTestClassWizPage.error.class_to_test.not_exist")); //$NON-NLS-1$
-					return status;
-				} else {
-					if (type.isInterface()) {
-						status.setWarning(WizardMessages.getFormattedString("NewTestClassWizPage.warning.class_to_test.is_interface",classToTestName)); //$NON-NLS-1$
-					}
-					if (pack != null && !JavaModelUtil.isVisible(type, pack)) {
-						status.setWarning(WizardMessages.getFormattedString("NewTestClassWizPage.warning.class_to_test.not_visible", new String[] {(type.isInterface())?WizardMessages.getString("Interface"):WizardMessages.getString("Class") , classToTestName})); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-				}
-				fClassToTest= type;
-			} catch (JavaModelException e) {
-				status.setError(WizardMessages.getString("NewTestClassWizPage.error.class_to_test.not_valid")); //$NON-NLS-1$
-			}							
-		} else {
-			status.setError(""); //$NON-NLS-1$
-		}
-		return status;
-	}
-
-	private IType resolveClassNameToType(IJavaProject jproject, IPackageFragment pack, String classToTestName) throws JavaModelException {
-		IType type= null;
-		if (type == null && pack != null) {
-			String packName= pack.getElementName();
-			// search in own package
-			if (!pack.isDefaultPackage()) {
-				type= jproject.findType(packName, classToTestName);
-			}
-			// search in java.lang
-			if (type == null && !"java.lang".equals(packName)) { //$NON-NLS-1$
-				type= jproject.findType("java.lang", classToTestName); //$NON-NLS-1$
-			}
-		}
-		// search fully qualified
-		if (type == null) {
-			type= jproject.findType(classToTestName);
-		}
-		return type;
-	}
-	
-	/**
-	 *	Use the dialog store to restore widget values to the values that they held
-	 *	last time this wizard was used to completion
-	 */
-	private void restoreWidgetValues() {
-		
-		IDialogSettings settings= getDialogSettings();
-		if (settings != null) {
-			boolean generateMain= settings.getBoolean(STORE_GENERATE_MAIN);
-			fMethodStubsButtons.setSelection(0, generateMain);
-			fMethodStubsButtons.setEnabled(1, generateMain);
-			fMethodStubsButtons.setSelection(1,settings.getBoolean(STORE_USE_TESTRUNNER));
-			try {
-				fMethodStubsButtons.setComboSelection(settings.getInt(STORE_TESTRUNNER_TYPE));
-			} catch(NumberFormatException e) {}
-		}		
-	}	
-
-	/**
-	 * 	Since Finish was pressed, write widget values to the dialog store so that they
-	 *	will persist into the next invocation of this wizard page
-	 */
-	void saveWidgetValues() {
-		IDialogSettings settings= getDialogSettings();
-		if (settings != null) {
-			settings.put(STORE_GENERATE_MAIN, fMethodStubsButtons.isSelected(0));
-			settings.put(STORE_USE_TESTRUNNER, fMethodStubsButtons.isSelected(1));
-			settings.put(STORE_TESTRUNNER_TYPE, fMethodStubsButtons.getComboSelection());
-		}
-	}
-
-	public void aboutToRunOperation() {
-		fMainMethod= fMethodStubsButtons.getMainMethod(getTypeName());	
-	}
-
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage2.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage2.java
deleted file mode 100644
index 0f11efc..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage2.java
+++ /dev/null

@@ -1,439 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Vector;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.ui.IJUnitHelpContextIds;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.internal.dialogs.ContainerCheckedTreeViewer;
-
-/**
- * Wizard page to select the methods from a class under test.
- */
-public class NewTestCaseCreationWizardPage2 extends WizardPage implements IAboutToRunOperation {
-
-	private final static String PAGE_NAME= "NewTestCaseCreationWizardPage2"; //$NON-NLS-1$
-	private final static String STORE_USE_TASKMARKER= PAGE_NAME + ".USE_TASKMARKER"; //$NON-NLS-1$
-	private final static String STORE_CREATE_FINAL_METHOD_STUBS= PAGE_NAME + ".CREATE_FINAL_METHOD_STUBS"; //$NON-NLS-1$
-	public final static String PREFIX= "test"; //$NON-NLS-1$
-
-	private NewTestCaseCreationWizardPage fFirstPage;	
-	private IType fClassToTest;
-
-	private Button fCreateFinalMethodStubsButton;
-	private Button fCreateTasksButton;
-	private ContainerCheckedTreeViewer fMethodsTree;
-	private Button fSelectAllButton;
-	private Button fDeselectAllButton;
-	private Label fSelectedMethodsLabel;
-	private Object[] fCheckedObjects;
-	private boolean fCreateFinalStubs;
-	private boolean fCreateTasks;
-	
-	/**
-	 * Constructor for NewTestCaseCreationWizardPage2.
-	 */
-	protected NewTestCaseCreationWizardPage2(NewTestCaseCreationWizardPage firstPage) {
-		super(PAGE_NAME);
-		fFirstPage= firstPage;
-		setTitle(WizardMessages.getString("NewTestClassWizPage2.title")); //$NON-NLS-1$
-		setDescription(WizardMessages.getString("NewTestClassWizPage2.description")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		container.setLayout(layout);
-
-		createMethodsTreeControls(container);
-		createSpacer(container);
-		createButtonChoices(container);	
-		setControl(container);
-		restoreWidgetValues();
-		Dialog.applyDialogFont(container);
-		WorkbenchHelp.setHelp(container, IJUnitHelpContextIds.NEW_TESTCASE_WIZARD_PAGE2);	
-	}
-
-	protected void createButtonChoices(Composite container) {
-		GridLayout layout;
-		GridData gd;
-		Composite prefixContainer= new Composite(container, SWT.NONE);
-		gd= new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.horizontalSpan = 1;
-		prefixContainer.setLayoutData(gd);
-		
-		layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		prefixContainer.setLayout(layout);
-		
-		Button buttons[] = {null, null};
-
-		String buttonNames[] = {
-			WizardMessages.getString("NewTestClassWizPage2.create_final_method_stubs.text"), //$NON-NLS-1$
-			WizardMessages.getString("NewTestClassWizPage2.create_tasks.text") //$NON-NLS-1$
-		}; 
-		
-		for (int i=0; i < buttons.length; i++) {
-			buttons[i]= new Button(prefixContainer, SWT.CHECK | SWT.LEFT);
-			buttons[i].setText(buttonNames[i]); //$NON-NLS-1$
-			buttons[i].setEnabled(true);
-			buttons[i].setSelection(true);
-			gd= new GridData();
-			gd.horizontalAlignment= GridData.FILL;
-			gd.horizontalSpan= 1;
-			buttons[i].setLayoutData(gd);							
-		}
-		fCreateFinalMethodStubsButton= buttons[0];
-		fCreateTasksButton= buttons[1];	
-	}
-	
-	protected void createMethodsTreeControls(Composite container) {
-		Label label= new Label(container, SWT.LEFT | SWT.WRAP);
-		label.setFont(container.getFont());
-		label.setText(WizardMessages.getString("NewTestClassWizPage2.methods_tree.label")); //$NON-NLS-1$
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-
-		fMethodsTree= new ContainerCheckedTreeViewer(container, SWT.BORDER);
-		gd= new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gd.heightHint= 180;
-		fMethodsTree.getTree().setLayoutData(gd);
-
-		fMethodsTree.setLabelProvider(new AppearanceAwareLabelProvider());
-		fMethodsTree.setAutoExpandLevel(2);			
-		fMethodsTree.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				updateSelectedMethodsLabel();
-			}	
-		});
-		fMethodsTree.addFilter(new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parentElement, Object element) {
-				if (element instanceof IMethod) {
-					IMethod method = (IMethod) element;
-					return !method.getElementName().equals("<clinit>"); //$NON-NLS-1$
-				}
-				return true;
-			}
-		});
-
-		Composite buttonContainer= new Composite(container, SWT.NONE);
-		gd= new GridData(GridData.FILL_VERTICAL);
-		buttonContainer.setLayoutData(gd);
-		GridLayout buttonLayout= new GridLayout();
-		buttonLayout.marginWidth= 0;
-		buttonLayout.marginHeight= 0;
-		buttonContainer.setLayout(buttonLayout);
-
-		fSelectAllButton= new Button(buttonContainer, SWT.PUSH);
-		fSelectAllButton.setText(WizardMessages.getString("NewTestClassWizPage2.selectAll")); //$NON-NLS-1$
-		gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		fSelectAllButton.setLayoutData(gd);
-		fSelectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fMethodsTree.setCheckedElements((Object[]) fMethodsTree.getInput());
-				updateSelectedMethodsLabel();
-			}
-		});
-
-		fDeselectAllButton= new Button(buttonContainer, SWT.PUSH);
-		fDeselectAllButton.setText(WizardMessages.getString("NewTestClassWizPage2.deselectAll")); //$NON-NLS-1$
-		gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		fDeselectAllButton.setLayoutData(gd);
-		fDeselectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fMethodsTree.setCheckedElements(new Object[0]);
-				updateSelectedMethodsLabel();
-			}
-		});
-
-		/* No of selected methods label */
-		fSelectedMethodsLabel= new Label(container, SWT.LEFT);
-		fSelectedMethodsLabel.setFont(container.getFont());
-		updateSelectedMethodsLabel();
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan= 1;
-		fSelectedMethodsLabel.setLayoutData(gd);
-		
-		Label emptyLabel= new Label(container, SWT.LEFT);
-		gd= new GridData();
-		gd.horizontalSpan= 1;
-		emptyLabel.setLayoutData(gd);
-	}
-
-	protected void createSpacer(Composite container) {
-		Label spacer= new Label(container, SWT.NONE);
-		GridData data= new GridData();
-		data.horizontalSpan= 2;
-		data.horizontalAlignment= GridData.FILL;
-		data.verticalAlignment= GridData.BEGINNING;
-		data.heightHint= 4;
-		spacer.setLayoutData(data);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			fClassToTest= fFirstPage.getClassToTest();
-			IType currType= fClassToTest;
-			ArrayList types= null;
-			try {
-				ITypeHierarchy hierarchy= currType.newSupertypeHierarchy(null);
-				IType[] superTypes;
-				if (currType.isClass())
-					superTypes= hierarchy.getAllSuperclasses(currType);
-				else if (currType.isInterface())
-					superTypes= hierarchy.getAllSuperInterfaces(currType);
-				else
-					superTypes= new IType[0];
-				types= new ArrayList(superTypes.length+1);
-				types.add(currType);
-				types.addAll(Arrays.asList(superTypes));
-			} catch(JavaModelException e) {
-				JUnitPlugin.log(e);
-			}
-			fMethodsTree.setContentProvider(new MethodsTreeContentProvider(types.toArray()));
-			if (types == null)
-				types= new ArrayList();
-			fMethodsTree.setInput(types.toArray());
-			fMethodsTree.setSelection(new StructuredSelection(currType), true);
-			updateSelectedMethodsLabel();
-			setFocus();
-		}
-	}
-
-	/**
-	 * Returns all checked methods in the Methods tree.
-	 */
-	public IMethod[] getCheckedMethods() {
-		int methodCount= 0;
-		for (int i = 0; i < fCheckedObjects.length; i++) {
-			if (fCheckedObjects[i] instanceof IMethod)
-				methodCount++;
-		}
-		IMethod[] checkedMethods= new IMethod[methodCount];
-		int j= 0;
-		for (int i = 0; i < fCheckedObjects.length; i++) {
-			if (fCheckedObjects[i] instanceof IMethod) {
-				checkedMethods[j]= (IMethod)fCheckedObjects[i];
-				j++;
-			}
-		}
-		return checkedMethods;
-	}
-	
-	private static class MethodsTreeContentProvider implements ITreeContentProvider {
-		private Object[] fTypes;
-		private IMethod[] fMethods;
-		private final Object[] fEmpty= new Object[0];
-
-		public MethodsTreeContentProvider(Object[] types) {
-			fTypes= types;
-			Vector methods= new Vector();
-			for (int i = types.length-1; i > -1; i--) {
-				Object object = types[i];
-				if (object instanceof IType) {
-					IType type = (IType) object;
-					try {
-						IMethod[] currMethods= type.getMethods();
-						for_currMethods:
-						for (int j = 0; j < currMethods.length; j++) {
-							IMethod currMethod = currMethods[j];
-							int flags= currMethod.getFlags();
-							if (!Flags.isPrivate(flags)) {
-								for (int k = 0; k < methods.size(); k++) {
-									IMethod m= ((IMethod)methods.get(k));
-									if (m.getElementName().equals(currMethod.getElementName())
-										&& m.getSignature().equals(currMethod.getSignature())) {
-										methods.set(k,currMethod);
-										continue for_currMethods;
-									}
-								}
-								methods.add(currMethod);
-							}
-						}
-					} catch (JavaModelException e) {
-						JUnitPlugin.log(e);
-					}
-				}
-			}
-			fMethods= new IMethod[methods.size()];
-			methods.copyInto(fMethods);
-		}
-		
-		/*
-		 * @see ITreeContentProvider#getChildren(Object)
-		 */
-		public Object[] getChildren(Object parentElement) {
-			if (parentElement instanceof IType) {
-				IType parentType= (IType)parentElement;
-				ArrayList result= new ArrayList(fMethods.length);
-				for (int i= 0; i < fMethods.length; i++) {
-					if (fMethods[i].getDeclaringType().equals(parentType)) {
-						result.add(fMethods[i]);
-					}
-				}
-				return result.toArray();
-			}
-			return fEmpty;
-		}
-
-		/*
-		 * @see ITreeContentProvider#getParent(Object)
-		 */
-		public Object getParent(Object element) {
-			if (element instanceof IMethod) 
-				return ((IMethod)element).getDeclaringType();
-			return null;
-		}
-
-		/*
-		 * @see ITreeContentProvider#hasChildren(Object)
-		 */
-		public boolean hasChildren(Object element) {
-			return getChildren(element).length > 0;
-		}
-
-		/*
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return fTypes;
-		}
-
-		/*
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/*
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-		
-		public IMethod[] getAllMethods() {
-			return fMethods;
-		}
-	}
-
-	/**
-	 * Returns true if the checkbox for creating tasks is checked.
-	 */
-	public boolean getCreateTasksButtonSelection() {
-		return fCreateTasks;
-	}
-
-	/**
-	 * Returns true if the checkbox for final method stubs is checked.
-	 */
-	public boolean getCreateFinalMethodStubsButtonSelection() {
-		return fCreateFinalStubs;
-	}
-		
-	private void updateSelectedMethodsLabel() {
-		Object[] checked= fMethodsTree.getCheckedElements();
-		int checkedMethodCount= 0;
-		for (int i= 0; i < checked.length; i++) {
-			if (checked[i] instanceof IMethod)
-				checkedMethodCount++;
-		}
-		String label= ""; //$NON-NLS-1$
-		if (checkedMethodCount == 1)
-			label= WizardMessages.getFormattedString("NewTestClassWizPage2.selected_methods.label_one", new Integer(checkedMethodCount)); //$NON-NLS-1$
-		else
-			label= WizardMessages.getFormattedString("NewTestClassWizPage2.selected_methods.label_many", new Integer(checkedMethodCount)); //$NON-NLS-1$
-		fSelectedMethodsLabel.setText(label);
-	}
-	
-	/**
-	 * Returns all the methods in the Methods tree.
-	 */
-	public IMethod[] getAllMethods() {
-		return ((MethodsTreeContentProvider)fMethodsTree.getContentProvider()).getAllMethods();
-	}
-
-	/**
-	 * Sets the focus on the type name.
-	 */		
-	protected void setFocus() {
-		fMethodsTree.getControl().setFocus();
-	}
-		
-	/**
-	 *	Use the dialog store to restore widget values to the values that they held
-	 *	last time this wizard was used to completion
-	 */
-	private void restoreWidgetValues() {
-		IDialogSettings settings= getDialogSettings();
-		if (settings != null) {
-			fCreateTasksButton.setSelection(settings.getBoolean(STORE_USE_TASKMARKER));
-			fCreateFinalMethodStubsButton.setSelection(settings.getBoolean(STORE_CREATE_FINAL_METHOD_STUBS));
-		}		
-	}	
-
-	/**
-	 * 	Since Finish was pressed, write widget values to the dialog store so that they
-	 *	will persist into the next invocation of this wizard page
-	 */
-	void saveWidgetValues() {
-		IDialogSettings settings= getDialogSettings();
-		if (settings != null) {
-			settings.put(STORE_USE_TASKMARKER, fCreateTasksButton.getSelection());
-			settings.put(STORE_CREATE_FINAL_METHOD_STUBS, fCreateFinalMethodStubsButton.getSelection());
-		}
-	}
-
-	public void aboutToRunOperation() {
-		fCheckedObjects= fMethodsTree.getCheckedElements();
-		fCreateFinalStubs= fCreateFinalMethodStubsButton.getSelection();
-		fCreateTasks= fCreateTasksButton.getSelection();
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java
deleted file mode 100644
index d85abcf..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A wizard for creating test suites.
- */
-public class NewTestSuiteCreationWizard extends JUnitWizard {
-
-	private NewTestSuiteCreationWizardPage fPage;
-	
-	public NewTestSuiteCreationWizard() {
-		super();
-		setWindowTitle(WizardMessages.getString("Wizard.title.new.testsuite")); //$NON-NLS-1$
-		initDialogSettings();
-	}
-
-	/*
-	 * @see Wizard#createPages
-	 */	
-	public void addPages() {
-		super.addPages();
-		fPage= new NewTestSuiteCreationWizardPage();
-		addPage(fPage);
-		fPage.init(getSelection());
-	}	
-
-	/*
-	 * @see Wizard#performFinish
-	 */		
-	public boolean performFinish() {
-		IPackageFragment pack= fPage.getPackageFragment();
-		String filename= fPage.getTypeName() + ".java"; //$NON-NLS-1$
-		ICompilationUnit cu= pack.getCompilationUnit(filename);
-		if (cu.exists()) {
-			IEditorPart cu_ep= EditorUtility.isOpenInEditor(cu);
-			if (cu_ep != null && cu_ep.isDirty()) {
-				boolean saveUnsavedChanges= 
-					MessageDialog.openQuestion(fPage.getShell(), 
-						WizardMessages.getString("NewTestSuiteWiz.unsavedchangesDialog.title"), //$NON-NLS-1$
-						WizardMessages.getFormattedString("NewTestSuiteWiz.unsavedchangesDialog.message", //$NON-NLS-1$
-						filename));  
-				if (saveUnsavedChanges) {
-					try {
-						PlatformUI.getWorkbench().getProgressService().busyCursorWhile(getRunnableSave(cu_ep));
-					} catch (Exception e) {
-						JUnitPlugin.log(e);
-					}
-				}
-			}
-			IType suiteType= cu.getType(fPage.getTypeName());
-			IMethod suiteMethod= suiteType.getMethod("suite", new String[] {}); //$NON-NLS-1$
-			if (suiteMethod.exists()) {
-				try {
-				ISourceRange range= suiteMethod.getSourceRange();
-				IBuffer buf= cu.getBuffer();
-				String originalContent= buf.getText(range.getOffset(), range.getLength());
-				int start= originalContent.indexOf(NewTestSuiteCreationWizardPage.START_MARKER);
-				if (start > -1) {
-					int end= originalContent.indexOf(NewTestSuiteCreationWizardPage.END_MARKER, start);
-					if (end < 0) {
-						fPage.cannotUpdateSuiteError();
-						return false;
-					}
-				} else {
-					fPage.cannotUpdateSuiteError();
-					return false;
-				}
-				} catch (JavaModelException e) {
-					JUnitPlugin.log(e);
-					return false;
-				}
-			}
-		}
-		
-		if (finishPage(fPage.getRunnable())) {
-			if (!fPage.hasUpdatedExistingClass())
-				postCreatingType();
-			fPage.saveWidgetValues();				
-			return true;
-		}
-
-		return false;		
-	}
-
-	protected void postCreatingType() {
-		IType newClass= fPage.getCreatedType();
-		if (newClass == null)
-			return;
-		ICompilationUnit cu= newClass.getCompilationUnit();
-		if (cu.isWorkingCopy()) {
-			cu= (ICompilationUnit) cu.getOriginalElement();
-			//added here
-		}
-		IResource resource= cu.getResource();
-		if (resource != null) {
-			selectAndReveal(resource);
-			openResource(resource);
-		}
-	}
-
-	public NewTestSuiteCreationWizardPage getPage() {
-		return fPage;
-	}
-	
-	protected void initializeDefaultPageImageDescriptor() {
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(JUnitPlugin.makeIconFileURL("wizban/newtest_wiz.gif")); //$NON-NLS-1$
-			setDefaultPageImageDescriptor(id);
-	} catch (MalformedURLException e) {
-			// Should not happen.  Ignore.
-		}
-	}
-
-	public IRunnableWithProgress getRunnableSave(final IEditorPart cu_ep) {
-		return new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					if (monitor == null) {
-						monitor= new NullProgressMonitor();
-					}
-					cu_ep.doSave(monitor);
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java
deleted file mode 100644
index 3d19465..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java
+++ /dev/null

@@ -1,662 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.ui.IJUnitHelpContextIds;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.util.JUnitStatus;
-import org.eclipse.jdt.internal.junit.util.JUnitStubUtility;
-import org.eclipse.jdt.internal.junit.util.LayoutUtil;
-import org.eclipse.jdt.internal.junit.util.SWTUtil;
-import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Wizard page to select the test classes to include
- * in the test suite.
- */
-public class NewTestSuiteCreationWizardPage extends NewTypeWizardPage {
-
-	private final static String PAGE_NAME= "NewTestSuiteCreationWizardPage"; //$NON-NLS-1$
-	private final static String CLASSES_IN_SUITE= PAGE_NAME + ".classesinsuite"; //$NON-NLS-1$
-	private final static String SUITE_NAME= PAGE_NAME + ".suitename"; //$NON-NLS-1$
-
-	protected final static String STORE_GENERATE_MAIN= PAGE_NAME + ".GENERATE_MAIN"; //$NON-NLS-1$
-	protected final static String STORE_USE_TESTRUNNER= PAGE_NAME + ".USE_TESTRUNNER";	//$NON-NLS-1$
-	protected final static String STORE_TESTRUNNER_TYPE= PAGE_NAME + ".TESTRUNNER_TYPE"; //$NON-NLS-1$
-
-
-	public static final String START_MARKER= "//$JUnit-BEGIN$"; //$NON-NLS-1$
-	public static final String END_MARKER= "//$JUnit-END$"; //$NON-NLS-1$
-	
-	private CheckboxTableViewer fClassesInSuiteTable;	
-	private Button fSelectAllButton;
-	private Button fDeselectAllButton;
-	private Label fSelectedClassesLabel;
-
-	private Label fSuiteNameLabel;
-	private Text fSuiteNameText;
-	private String fSuiteNameTextInitialValue;
-	private MethodStubsSelectionButtonGroup fMethodStubsButtons;
-	
-	private boolean fUpdatedExistingClassButton;
-
-	protected IStatus fClassesInSuiteStatus;
-	protected IStatus fSuiteNameStatus;
-	
-	public NewTestSuiteCreationWizardPage() {
-		super(true, PAGE_NAME);
-
-		fSuiteNameStatus= new JUnitStatus();
-		fSuiteNameTextInitialValue= ""; //$NON-NLS-1$
-		setTitle(WizardMessages.getString("NewTestSuiteWizPage.title")); //$NON-NLS-1$
-		setDescription(WizardMessages.getString("NewTestSuiteWizPage.description")); //$NON-NLS-1$
-		
-		String[] buttonNames= new String[] {
-			"public static void main(Strin&g[] args)", //$NON-NLS-1$
-			/* Add testrunner statement to main Method */
-			WizardMessages.getString("NewTestClassWizPage.methodStub.testRunner"), //$NON-NLS-1$
-		};
-		
-		fMethodStubsButtons= new MethodStubsSelectionButtonGroup(SWT.CHECK, buttonNames, 1);
-		fMethodStubsButtons.setLabelText(WizardMessages.getString("NewTestClassWizPage2.method.Stub.label")); //$NON-NLS-1$
-		fMethodStubsButtons.setUseSuiteInMainForTextRunner(true);
-		fClassesInSuiteStatus= new JUnitStatus();
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-		
-		Composite composite= new Composite(parent, SWT.NONE);
-		int nColumns= 4;
-		
-		GridLayout layout= new GridLayout();
-		layout.numColumns= nColumns;		
-		composite.setLayout(layout);
-	
-		createContainerControls(composite, nColumns);	
-		createPackageControls(composite, nColumns);	
-		createSeparator(composite, nColumns);
-		createSuiteNameControl(composite, nColumns);
-		setTypeName("AllTests", true); //$NON-NLS-1$
-		createSeparator(composite, nColumns);
-		createClassesInSuiteControl(composite, nColumns);
-		createMethodStubSelectionControls(composite, nColumns);
-		setControl(composite);
-		restoreWidgetValues();
-		Dialog.applyDialogFont(composite);	
-		WorkbenchHelp.setHelp(composite, IJUnitHelpContextIds.NEW_TESTSUITE_WIZARD_PAGE);			
-	}
-
-	protected void createMethodStubSelectionControls(Composite composite, int nColumns) {
-		LayoutUtil.setHorizontalSpan(fMethodStubsButtons.getLabelControl(composite), nColumns);
-		LayoutUtil.createEmptySpace(composite,1);
-		LayoutUtil.setHorizontalSpan(fMethodStubsButtons.getSelectionButtonsGroup(composite), nColumns - 1);	
-	}	
-
-	/**
-	 * Should be called from the wizard with the initial selection.
-	 */
-	public void init(IStructuredSelection selection) {
-		IJavaElement jelem= getInitialJavaElement(selection);
-		initContainerPage(jelem);
-		initTypePage(jelem);
-		doStatusUpdate();
-
-		fMethodStubsButtons.setSelection(0, false); //main
-		fMethodStubsButtons.setSelection(1, false); //add textrunner
-		fMethodStubsButtons.setEnabled(1, false); //add text
-	}
-	
-	/**
-	 * @see org.eclipse.jdt.ui.wizards.NewContainerWizardPage#handleFieldChanged(String)
-	 */
-	protected void handleFieldChanged(String fieldName) {
-		super.handleFieldChanged(fieldName);
-		if (fieldName.equals(PACKAGE) || fieldName.equals(CONTAINER)) {
-			if (fieldName.equals(PACKAGE))
-				fPackageStatus= packageChanged();
-			updateClassesInSuiteTable();
-		} else if (fieldName.equals(CLASSES_IN_SUITE)) {
-			fClassesInSuiteStatus= classesInSuiteChanged();
-			fSuiteNameStatus= testSuiteChanged(); //must check this one too
-			updateSelectedClassesLabel();
-		} else if (fieldName.equals(SUITE_NAME)) {
-			fSuiteNameStatus= testSuiteChanged();
-		}
-
-		doStatusUpdate();
-	}
-
-	// ------ validation --------
-	private void doStatusUpdate() {
-		// status of all used components
-		IStatus[] status= new IStatus[] {
-			fContainerStatus,
-			fPackageStatus,
-			fSuiteNameStatus,
-			fClassesInSuiteStatus			
-		};
-		
-		// the most severe status will be displayed and the ok button enabled/disabled.
-		updateStatus(status);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			setFocus();		
-			updateClassesInSuiteTable();
-			handleAllFieldsChanged();
-		}
-	}
-
-	private void handleAllFieldsChanged() {
-		handleFieldChanged(PACKAGE);
-		handleFieldChanged(CONTAINER);
-		handleFieldChanged(CLASSES_IN_SUITE);
-		handleFieldChanged(SUITE_NAME);
-	}
-
-	protected void updateClassesInSuiteTable() {
-		if (fClassesInSuiteTable != null) {
-			IPackageFragment pack= getPackageFragment();
-			if (pack == null) {
-				IPackageFragmentRoot root= getPackageFragmentRoot();
-				if (root != null)
-					pack= root.getPackageFragment(""); //$NON-NLS-1$
-				else
-					return;
-			}
-			fClassesInSuiteTable.setInput(pack);
-			fClassesInSuiteTable.setAllChecked(true);
-			updateSelectedClassesLabel();	
-		}
-	}
-	
-	protected void createClassesInSuiteControl(Composite parent, int nColumns) {
-		if (fClassesInSuiteTable == null) {
-
-			Label label = new Label(parent, SWT.LEFT);
-			label.setText(WizardMessages.getString("NewTestSuiteWizPage.classes_in_suite.label")); //$NON-NLS-1$
-			GridData gd= new GridData();
-			gd.horizontalAlignment = GridData.FILL;
-			gd.horizontalSpan= nColumns;
-			label.setLayoutData(gd);
-
-			fClassesInSuiteTable= CheckboxTableViewer.newCheckList(parent, SWT.BORDER);
-			gd= new GridData(GridData.FILL_BOTH);
-			gd.heightHint= 80;
-			gd.horizontalSpan= nColumns-1;
-
-			fClassesInSuiteTable.getTable().setLayoutData(gd);
-			fClassesInSuiteTable.setContentProvider(new ClassesInSuitContentProvider());
-			fClassesInSuiteTable.setLabelProvider(new JavaElementLabelProvider());
-			fClassesInSuiteTable.addCheckStateListener(new ICheckStateListener() {
-				public void checkStateChanged(CheckStateChangedEvent event) {
-					handleFieldChanged(CLASSES_IN_SUITE);
-				}
-			});
-
-			Composite buttonContainer= new Composite(parent, SWT.NONE);
-			gd= new GridData(GridData.FILL_VERTICAL);
-			buttonContainer.setLayoutData(gd);
-			GridLayout buttonLayout= new GridLayout();
-			buttonLayout.marginWidth= 0;
-			buttonLayout.marginHeight= 0;
-			buttonContainer.setLayout(buttonLayout);
-	
-			fSelectAllButton= new Button(buttonContainer, SWT.PUSH);
-			fSelectAllButton.setText(WizardMessages.getString("NewTestSuiteWizPage.selectAll")); //$NON-NLS-1$
-			GridData bgd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-			bgd.heightHint = SWTUtil.getButtonHeigthHint(fSelectAllButton);
-			bgd.widthHint = SWTUtil.getButtonWidthHint(fSelectAllButton);
-			fSelectAllButton.setLayoutData(bgd);
-			fSelectAllButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					fClassesInSuiteTable.setAllChecked(true);
-					handleFieldChanged(CLASSES_IN_SUITE);
-				}
-			});
-	
-			fDeselectAllButton= new Button(buttonContainer, SWT.PUSH);
-			fDeselectAllButton.setText(WizardMessages.getString("NewTestSuiteWizPage.deselectAll")); //$NON-NLS-1$
-			bgd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-			bgd.heightHint = SWTUtil.getButtonHeigthHint(fDeselectAllButton);
-			bgd.widthHint = SWTUtil.getButtonWidthHint(fDeselectAllButton);
-			fDeselectAllButton.setLayoutData(bgd);
-			fDeselectAllButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					fClassesInSuiteTable.setAllChecked(false);
-					handleFieldChanged(CLASSES_IN_SUITE);
-				}
-			});
-
-			// No of selected classes label
-			fSelectedClassesLabel= new Label(parent, SWT.LEFT | SWT.WRAP);
-			fSelectedClassesLabel.setFont(parent.getFont());
-			updateSelectedClassesLabel();
-			gd = new GridData();
-			gd.horizontalSpan = 2;
-			fSelectedClassesLabel.setLayoutData(gd);
-		}
-	}
-
-	static class ClassesInSuitContentProvider implements IStructuredContentProvider {
-			
-		public Object[] getElements(Object parent) {
-			if (! (parent instanceof IPackageFragment))
-				return new Object[0];
-			IPackageFragment pack= (IPackageFragment) parent;
-			if (! pack.exists())
-				return new Object[0];
-			try {
-				ICompilationUnit[] cuArray= pack.getCompilationUnits();
-				List typesArrayList= new ArrayList();
-				for (int i= 0; i < cuArray.length; i++) {
-					ICompilationUnit cu= cuArray[i];
-					IType[] types= cu.getTypes();
-					for (int j= 0; j < types.length; j++) {
-						IType type= types[j];
-						if (type.isClass() && ! Flags.isAbstract(type.getFlags()) && TestSearchEngine.isTestImplementor(type))	
-							typesArrayList.add(types[j]);
-					}
-				}
-				return typesArrayList.toArray();
-			} catch (JavaModelException e) {
-				JUnitPlugin.log(e);
-				return new Object[0];
-			}
-		}
-		
-		public void dispose() {
-		}
-		
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-	}
-
-	/*
-	 * @see TypePage#evalMethods
-	 */
-	protected void createTypeMembers(IType type, ImportsManager imports, IProgressMonitor monitor) throws CoreException {
-		writeImports(imports);
-		if (fMethodStubsButtons.isEnabled() && fMethodStubsButtons.isSelected(0)) 
-			createMain(type);
-		type.createMethod(getSuiteMethodString(), null, false, null);	
-	}
-
-	protected void createMain(IType type) throws JavaModelException {
-		type.createMethod(fMethodStubsButtons.getMainMethod(getTypeName()), null, false, null);	
-	}
-
-	/**
-	 * Returns the string content for creating a new suite() method.
-	 */
-	public String getSuiteMethodString() {
-		IPackageFragment pack= getPackageFragment();
-		String packName= pack.getElementName();
-		StringBuffer suite= new StringBuffer("public static Test suite () {TestSuite suite= new TestSuite(\"Test for "+((packName.equals(""))?"default package":packName)+"\");\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		suite.append(getUpdatableString());
-		suite.append("\nreturn suite;}"); //$NON-NLS-1$
-		return suite.toString();
-	}
-	
-	/**
-	 * Returns the new code to be included in a new suite() or which replaces old code in an existing suite().
-	 */
-	public static String getUpdatableString(Object[] selectedClasses) {
-		StringBuffer suite= new StringBuffer();
-		suite.append(START_MARKER+"\n"); //$NON-NLS-1$
-		for (int i= 0; i < selectedClasses.length; i++) {
-			if (selectedClasses[i] instanceof IType) {
-				IType testType= (IType) selectedClasses[i];
-				IMethod suiteMethod= testType.getMethod("suite", new String[] {}); //$NON-NLS-1$
-				if (!suiteMethod.exists()) {
-					suite.append("suite.addTestSuite("+testType.getElementName()+".class);"); //$NON-NLS-1$ //$NON-NLS-2$
-				} else {
-					suite.append("suite.addTest("+testType.getElementName()+".suite());"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-		suite.append("\n"+END_MARKER); //$NON-NLS-1$
-		return suite.toString();
-	}
-	
-	private String getUpdatableString() {
-		return getUpdatableString(fClassesInSuiteTable.getCheckedElements());
-	}
-
-	/**
-	 * Runnable for replacing an existing suite() method.
-	 */
-	public IRunnableWithProgress getRunnable() {
-		return new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				try {
-					if (monitor == null) {
-						monitor= new NullProgressMonitor();
-					}
-					updateExistingClass(monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} 				
-			}
-		};
-	}
-	
-	protected void updateExistingClass(IProgressMonitor monitor) throws CoreException, InterruptedException {
-		IPackageFragment pack= getPackageFragment();
-		ICompilationUnit cu= pack.getCompilationUnit(getTypeName() + ".java"); //$NON-NLS-1$
-		
-		if (!cu.exists()) {
-			createType(monitor);
-			fUpdatedExistingClassButton= false;
-			return;
-		}
-		
-		if (! UpdateTestSuite.checkValidateEditStatus(cu, getShell()))
-			return;
-
-		IType suiteType= cu.getType(getTypeName());
-		monitor.beginTask(WizardMessages.getString("NewTestSuiteWizPage.createType.beginTask"), 10); //$NON-NLS-1$
-		IMethod suiteMethod= suiteType.getMethod("suite", new String[] {}); //$NON-NLS-1$
-		monitor.worked(1);
-		
-		String lineDelimiter= JUnitStubUtility.getLineDelimiterUsed(cu);
-		if (suiteMethod.exists()) {
-			ISourceRange range= suiteMethod.getSourceRange();
-			if (range != null) {
-				IBuffer buf= cu.getBuffer();
-				String originalContent= buf.getText(range.getOffset(), range.getLength());
-				StringBuffer source= new StringBuffer(originalContent);
-				//using JDK 1.4
-				//int start= source.toString().indexOf(START_MARKER) --> int start= source.indexOf(START_MARKER);
-				int start= source.toString().indexOf(START_MARKER);
-				if (start > -1) {
-					//using JDK 1.4
-					//int end= source.toString().indexOf(END_MARKER, start) --> int end= source.indexOf(END_MARKER, start)
-					int end= source.toString().indexOf(END_MARKER, start);
-					if (end > -1) {
-						monitor.subTask(WizardMessages.getString("NewTestSuiteWizPage.createType.updating.suite_method")); //$NON-NLS-1$
-						monitor.worked(1);
-						end += END_MARKER.length();
-						source.replace(start, end, getUpdatableString());
-						buf.replace(range.getOffset(), range.getLength(), source.toString());
-						cu.reconcile();  
-						originalContent= buf.getText(0, buf.getLength());
-						monitor.worked(1);
-						String formattedContent=
-							JUnitStubUtility.codeFormat(originalContent, 0, lineDelimiter);
-						buf.replace(0, buf.getLength(), formattedContent);
-						monitor.worked(1);
-						cu.save(new SubProgressMonitor(monitor, 1), false);
-					} else {
-						cannotUpdateSuiteError();
-					}
-				} else {
-					cannotUpdateSuiteError();
-				}
-			} else {
-				MessageDialog.openError(getShell(), WizardMessages.getString("NewTestSuiteWizPage.createType.updateErrorDialog.title"), WizardMessages.getString("NewTestSuiteWizPage.createType.updateErrorDialog.message")); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		} else {
-			suiteType.createMethod(getSuiteMethodString(), null, true, monitor);
-			ISourceRange range= cu.getSourceRange();
-			IBuffer buf= cu.getBuffer();
-			String originalContent= buf.getText(range.getOffset(), range.getLength());
-			monitor.worked(2);
-			String formattedContent=
-				JUnitStubUtility.codeFormat(originalContent, 0, lineDelimiter);
-			buf.replace(range.getOffset(), range.getLength(), formattedContent);
-			monitor.worked(1);
-			cu.save(new SubProgressMonitor(monitor, 1), false);
-		}
-		monitor.done();
-		fUpdatedExistingClassButton= true;
-	}
-
-	/**
-	 * Returns true iff an existing suite() method has been replaced.
-	 */
-	public boolean hasUpdatedExistingClass() {
-		return fUpdatedExistingClassButton;
-	}
-	
-	private IStatus classesInSuiteChanged() {
-		JUnitStatus status= new JUnitStatus();
-		if (fClassesInSuiteTable.getCheckedElements().length <= 0)
-			status.setWarning(WizardMessages.getString("NewTestSuiteWizPage.classes_in_suite.error.no_testclasses_selected")); //$NON-NLS-1$
-		return status;
-	}
-	
-	private void updateSelectedClassesLabel() {
-		int noOfClassesChecked= fClassesInSuiteTable.getCheckedElements().length;
-		String key= (noOfClassesChecked==1) ? "NewTestClassWizPage.treeCaption.classSelected" : "NewTestClassWizPage.treeCaption.classesSelected"; //$NON-NLS-1$ //$NON-NLS-2$
-		fSelectedClassesLabel.setText(WizardMessages.getFormattedString(key, new Integer(noOfClassesChecked)));
-	}
-
-	protected void createSuiteNameControl(Composite composite, int nColumns) {
-		fSuiteNameLabel= new Label(composite, SWT.LEFT | SWT.WRAP);
-		fSuiteNameLabel.setFont(composite.getFont());
-		fSuiteNameLabel.setText(WizardMessages.getString("NewTestSuiteWizPage.suiteName.text")); //$NON-NLS-1$
-		GridData gd= new GridData();
-		gd.horizontalSpan= 1;
-		fSuiteNameLabel.setLayoutData(gd);
-
-		fSuiteNameText= new Text(composite, SWT.SINGLE | SWT.BORDER);
-		// moved up due to 1GEUNW2
-		fSuiteNameText.setEnabled(true);
-		fSuiteNameText.setFont(composite.getFont());
-		fSuiteNameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				handleFieldChanged(SUITE_NAME);
-			}
-		});
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.FILL;
-		gd.grabExcessHorizontalSpace= true;
-		gd.horizontalSpan= nColumns - 2;
-		fSuiteNameText.setLayoutData(gd);
-		
-		Label space= new Label(composite, SWT.LEFT);
-		space.setText(" "); //$NON-NLS-1$
-		gd= new GridData();
-		gd.horizontalSpan= 1;
-		space.setLayoutData(gd);		
-	}
-	
-	/**
-	 * Gets the type name.
-	 */
-	public String getTypeName() {
-		return (fSuiteNameText==null)?fSuiteNameTextInitialValue:fSuiteNameText.getText();
-	}
-	
-	/**
-	 * Sets the type name.
-	 * @param canBeModified Selects if the type name can be changed by the user
-	 */	
-	public void setTypeName(String name, boolean canBeModified) {
-		if (fSuiteNameText == null) {
-			fSuiteNameTextInitialValue= name;
-		} else {
-			fSuiteNameText.setText(name);
-			fSuiteNameText.setEnabled(canBeModified);
-		}
-	}	
-
-	/**
-	 * Called when the type name has changed.
-	 * The method validates the type name and returns the status of the validation.
-	 * Can be extended to add more validation
-	 */
-	protected IStatus testSuiteChanged() {
-		JUnitStatus status= new JUnitStatus();
-		String typeName= getTypeName();
-		// must not be empty
-		if (typeName.length() == 0) {
-			status.setError(WizardMessages.getString("NewTestSuiteWizPage.typeName.error.name_empty")); //$NON-NLS-1$
-			return status;
-		}
-		if (typeName.indexOf('.') != -1) {
-			status.setError(WizardMessages.getString("NewTestSuiteWizPage.typeName.error.name_qualified")); //$NON-NLS-1$
-			return status;
-		}
-		IStatus val= JavaConventions.validateJavaTypeName(typeName);
-		if (val.getSeverity() == IStatus.ERROR) {
-			status.setError(WizardMessages.getString("NewTestSuiteWizPage.typeName.error.name_not_valid")+val.getMessage()); //$NON-NLS-1$
-			return status;
-		} else if (val.getSeverity() == IStatus.WARNING) {
-			status.setWarning(WizardMessages.getString("NewTestSuiteWizPage.typeName.error.name.name_discouraged")+val.getMessage()); //$NON-NLS-1$
-			// continue checking
-		}		
-
-		JUnitStatus recursiveSuiteInclusionStatus= checkRecursiveTestSuiteInclusion();
-		if (! recursiveSuiteInclusionStatus.isOK())
-			return recursiveSuiteInclusionStatus;
-			
-		IPackageFragment pack= getPackageFragment();
-		if (pack != null) {
-			ICompilationUnit cu= pack.getCompilationUnit(typeName + ".java"); //$NON-NLS-1$
-			if (cu.exists()) {
-				status.setWarning(WizardMessages.getString("NewTestSuiteWizPage.typeName.warning.already_exists")); //$NON-NLS-1$
-				fMethodStubsButtons.setEnabled(false);
-				return status;
-			}
-		}
-		fMethodStubsButtons.setEnabled(true);
-		return status;
-	}
-
-	private JUnitStatus checkRecursiveTestSuiteInclusion(){
-		if (fClassesInSuiteTable == null)
-			return new JUnitStatus();
-		String typeName= getTypeName();
-		JUnitStatus status= new JUnitStatus();
-		Object[] checkedClasses= fClassesInSuiteTable.getCheckedElements();
-		for (int i= 0; i < checkedClasses.length; i++) {
-			IType checkedClass= (IType)checkedClasses[i];
-			if (checkedClass.getElementName().equals(typeName)){
-				status.setWarning(WizardMessages.getString("NewTestSuiteCreationWizardPage.infinite_recursion")); //$NON-NLS-1$
-				return status;
-			}
-		}
-		return new JUnitStatus();
-	}
-
-	/**
-	 * Sets the focus.
-	 */		
-	protected void setFocus() {
-		fSuiteNameText.setFocus();
-	}
-
-	/**
-	 * Sets the classes in <code>elements</code> as checked.
-	 */	
-	public void setCheckedElements(Object[] elements) {
-		fClassesInSuiteTable.setCheckedElements(elements);
-	}
-	
-	protected void cannotUpdateSuiteError() {
-		MessageDialog.openError(getShell(), WizardMessages.getString("NewTestSuiteWizPage.cannotUpdateDialog.title"), //$NON-NLS-1$
-			WizardMessages.getFormattedString("NewTestSuiteWizPage.cannotUpdateDialog.message", new String[] {START_MARKER, END_MARKER})); //$NON-NLS-1$
-
-	}
-
-	private void writeImports(ImportsManager imports) {
-		imports.addImport("junit.framework.Test"); //$NON-NLS-1$
-		imports.addImport("junit.framework.TestSuite");		 //$NON-NLS-1$
-	}
-
-	/**
-	 *	Use the dialog store to restore widget values to the values that they held
-	 *	last time this wizard was used to completion
-	 */
-	private void restoreWidgetValues() {
-		IDialogSettings settings= getDialogSettings();
-		if (settings != null) {
-			boolean generateMain= settings.getBoolean(STORE_GENERATE_MAIN);
-			fMethodStubsButtons.setSelection(0, generateMain);
-			fMethodStubsButtons.setEnabled(1, generateMain);
-			fMethodStubsButtons.setSelection(1,settings.getBoolean(STORE_USE_TESTRUNNER));
-			//The next 2 lines are necessary. Otherwise, if fMethodsStubsButtons is disabled, and USE_TESTRUNNER gets enabled,
-			//then the checkbox for USE_TESTRUNNER will be the only enabled component of fMethodsStubsButton
-			fMethodStubsButtons.setEnabled(!fMethodStubsButtons.isEnabled());
-			fMethodStubsButtons.setEnabled(!fMethodStubsButtons.isEnabled());
-			try {
-				fMethodStubsButtons.setComboSelection(settings.getInt(STORE_TESTRUNNER_TYPE));
-			} catch(NumberFormatException e) {}
-		}		
-	}	
-
-	/**
-	 * 	Since Finish was pressed, write widget values to the dialog store so that they
-	 *	will persist into the next invocation of this wizard page
-	 */
-	void saveWidgetValues() {
-		IDialogSettings settings= getDialogSettings();
-		if (settings != null) {
-			settings.put(STORE_GENERATE_MAIN, fMethodStubsButtons.isSelected(0));
-			settings.put(STORE_USE_TESTRUNNER, fMethodStubsButtons.isSelected(1));
-			settings.put(STORE_TESTRUNNER_TYPE, fMethodStubsButtons.getComboSelection());
-		}
-	}	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java
deleted file mode 100644
index f453dc1..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java
+++ /dev/null

@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-import org.eclipse.jdt.internal.junit.util.CheckedTableSelectionDialog;
-import org.eclipse.jdt.internal.junit.util.ExceptionHandler;
-import org.eclipse.jdt.internal.junit.util.JUnitStatus;
-import org.eclipse.jdt.internal.junit.util.JUnitStubUtility;
-import org.eclipse.jdt.internal.junit.util.Resources;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * An object contribution action that updates existing AllTests classes.
- */
-public class UpdateTestSuite implements IObjectActionDelegate {
-	private Shell fShell;
-	private IPackageFragment fPack;
-	private ICompilationUnit fTestSuite;
-	private IMethod fSuiteMethod;
-	private static boolean fEmptySelectionAllowed= false;
-	private Object[] fSelectedTestCases;
-
-	private class UpdateAllTestsValidator implements ISelectionStatusValidator {	
-		/*
-		 * @see ISelectionValidator#validate(Object[])
-		 */
-		public IStatus validate(Object[] selection) {
-			int count= 0;
-			for (int i= 0; i < selection.length; i++) {
-				if (selection[i] instanceof IType) {
-					count++;
-				}
-			}
-			if (count == 0 && !fEmptySelectionAllowed) {
-				return new JUnitStatus(IStatus.ERROR, ""); //$NON-NLS-1$
-			}
-			
-			IStatus recursiveInclusionStatus= checkRecursiveSuiteInclusion(selection);
-			if (recursiveInclusionStatus != null && ! recursiveInclusionStatus.isOK())
-				return recursiveInclusionStatus;
-				
-			String message;
-			if (count == 1) {
-				message= WizardMessages.getFormattedString("UpdateAllTests.selected_methods.label_one", new Integer(count)); //$NON-NLS-1$
-			} else {
-				message= WizardMessages.getFormattedString("UpdateAllTests.selected_methods.label_many", new Integer(count)); //$NON-NLS-1$
-			}
-			return new JUnitStatus(IStatus.INFO, message);
-		}
-		
-		private IStatus checkRecursiveSuiteInclusion(Object[] selection){
-			IType suiteClass= fSuiteMethod.getDeclaringType();
-			for (int i= 0; i < selection.length; i++) {
-				if (selection[i] instanceof IType){
-					if (((IType)selection[i]).equals(suiteClass)){
-						return new JUnitStatus(IStatus.WARNING, WizardMessages.getString("UpdateTestSuite.infinite_recursion")); //$NON-NLS-1$
-					}
-				}
-			}
-			return null;
-		}
-	}
-
-	public UpdateTestSuite() {
-		super();
-	}
-
-	/*
-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/*
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {		
-		ILabelProvider lprovider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-		IStructuredContentProvider cprovider= new NewTestSuiteCreationWizardPage.ClassesInSuitContentProvider();
-	
-		/* find TestClasses already in Test Suite */
-		IType testSuiteType= fTestSuite.findPrimaryType();
-		fSuiteMethod= testSuiteType.getMethod("suite", new String[] {}); //$NON-NLS-1$
-		if (fSuiteMethod.exists()) {
-			try {
-			ISourceRange range= fSuiteMethod.getSourceRange();
-			IBuffer buf= fTestSuite.getBuffer();
-			String originalContent= buf.getText(range.getOffset(), range.getLength());
-			buf.close();
-			int start= originalContent.indexOf(NewTestSuiteCreationWizardPage.START_MARKER);
-			if (start > -1) {
-				if (originalContent.indexOf(NewTestSuiteCreationWizardPage.END_MARKER, start) > -1) {
-					CheckedTableSelectionDialog dialog= new CheckedTableSelectionDialog(fShell, lprovider, cprovider);
-					dialog.setValidator(new UpdateAllTestsValidator());
-					dialog.setTitle(WizardMessages.getString("UpdateAllTests.title")); //$NON-NLS-1$
-					dialog.setMessage(WizardMessages.getString("UpdateAllTests.message")); //$NON-NLS-1$
-					dialog.setInitialSelections(cprovider.getElements(fPack));
-					dialog.setSize(60, 25);
-					dialog.setInput(fPack);
-					if (dialog.open() == Window.OK) {
-						fSelectedTestCases= dialog.getResult();
-						try {
-							PlatformUI.getWorkbench().getProgressService().busyCursorWhile(getRunnable());
-						} catch (Exception e) {
-							JUnitPlugin.log(e);
-						}
-					}
-				} else {
-					cannotUpdateSuiteError();
-				}
-			} else {
-				cannotUpdateSuiteError();
-			}
-			} catch (JavaModelException e) {
-				JUnitPlugin.log(e);
-			}
-		} else {
-			noSuiteError();
-		}
-	}
-
-	/*
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fShell= JUnitPlugin.getActiveWorkbenchShell();		
-		if (selection instanceof IStructuredSelection) {
-			Object testSuiteObj= ((IStructuredSelection) selection).getFirstElement();
-			if (testSuiteObj != null && testSuiteObj instanceof ICompilationUnit) {
-				fTestSuite= (ICompilationUnit) testSuiteObj;
-				IJavaElement packIJE= fTestSuite.getParent();
-				if (packIJE instanceof IPackageFragment) {
-					fPack= (IPackageFragment) packIJE;
-				}
-			}
-		}
-	}
-	
-	private void updateTestCasesInSuite(IProgressMonitor monitor) {
-
-		try {
-			monitor.beginTask(WizardMessages.getString("UpdateAllTests.beginTask"), 5); //$NON-NLS-1$
-			if (! checkValidateEditStatus(fTestSuite, fShell))
-				return;
-				
-			ISourceRange range= fSuiteMethod.getSourceRange();
-			IBuffer buf= fTestSuite.getBuffer();
-			String originalContent= buf.getText(range.getOffset(), range.getLength());
-			StringBuffer source= new StringBuffer(originalContent);
-			//using JDK 1.4
-			//int start= source.toString().indexOf(NewTestSuiteCreationWizardPage.startMarker) --> int start= source.indexOf(NewTestSuiteCreationWizardPage.startMarker)
-			int start= source.toString().indexOf(NewTestSuiteCreationWizardPage.START_MARKER);
-			if (start > -1) {
-				//using JDK 1.4
-				//int end= source.toString().indexOf(NewTestSuiteCreationWizardPage.endMarker, start) --> int end= source.indexOf(NewTestSuiteCreationWizardPage.endMarker, start)
-				int end= source.toString().indexOf(NewTestSuiteCreationWizardPage.END_MARKER, start);
-				if (end > -1) {
-					monitor.worked(1);
-					end += NewTestSuiteCreationWizardPage.END_MARKER.length();
-					//					String updatableCode= source.substring(start,end+NewTestSuiteCreationWizardPage.endMarker.length());
-					source.replace(start, end, NewTestSuiteCreationWizardPage.getUpdatableString(fSelectedTestCases));
-					buf.replace(range.getOffset(), range.getLength(), source.toString());
-					monitor.worked(1);
-					fTestSuite.reconcile();
-					originalContent= buf.getText(0, buf.getLength());
-					monitor.worked(1);
-					String formattedContent=
-						JUnitStubUtility.codeFormat(
-							originalContent,
-							0,
-							JUnitStubUtility.getLineDelimiterUsed(fTestSuite));
-					//buf.replace(range.getOffset(), range.getLength(), formattedContent);
-					buf.replace(0, buf.getLength(), formattedContent);
-					monitor.worked(1);
-					fTestSuite.save(new SubProgressMonitor(monitor, 1), true);
-				}
-			}
-		} catch (JavaModelException e) {
-			ExceptionHandler.handle(e, fShell, WizardMessages.getString("UpdateTestSuite.update"), WizardMessages.getString("UpdateTestSuite.error")); //$NON-NLS-1$ //$NON-NLS-2$
-		} finally{
-			monitor.done();
-		}
-	}
-	
-	static boolean checkValidateEditStatus(ICompilationUnit testSuiteCu, Shell shell){
-		IStatus status= validateModifiesFiles(getTestSuiteFile(testSuiteCu));
-		if (status.isOK())	
-			return true;
-		ErrorDialog.openError(shell, WizardMessages.getString("UpdateTestSuite.update"), WizardMessages.getString("UpdateTestSuite.could_not_update"), status); //$NON-NLS-1$ //$NON-NLS-2$
-		return false;
-	}
-	
-	private static IFile getTestSuiteFile(ICompilationUnit testSuiteCu){
-		if (testSuiteCu.isWorkingCopy())
-			return (IFile)testSuiteCu.getOriginalElement().getResource();
-		else
-			return (IFile)testSuiteCu.getResource();
-	}
-	
-	private static IStatus validateModifiesFiles(IFile fileToModify) {
-		IFile[] filesToModify= {fileToModify};
-		IStatus status= Resources.checkInSync(filesToModify);
-		if (! status.isOK())
-			return status;
-		status= Resources.makeCommittable(filesToModify, null);
-		if (! status.isOK())
-			return status;
-		return new JUnitStatus();
-	}
-
-	public IRunnableWithProgress getRunnable() {
-		return new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				if (monitor == null) {
-					monitor= new NullProgressMonitor();
-				}
-				updateTestCasesInSuite(monitor);
-			}
-		};
-	}
-
-	private void cannotUpdateSuiteError() {
-		MessageDialog.openError(fShell, WizardMessages.getString("UpdateAllTests.cannotUpdate.errorDialog.title"), //$NON-NLS-1$
-			WizardMessages.getFormattedString("UpdateAllTests.cannotUpdate.errorDialog.message", new String[] {NewTestSuiteCreationWizardPage.START_MARKER, NewTestSuiteCreationWizardPage.END_MARKER})); //$NON-NLS-1$
-
-	}
-
-	private void noSuiteError() {
-		MessageDialog.openError(fShell, WizardMessages.getString("UpdateAllTests.cannotFind.errorDialog.title"), WizardMessages.getString("UpdateAllTests.cannotFind.errorDialog.message")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.java
deleted file mode 100644
index ae2f81e..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.junit.wizards;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class WizardMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jdt.internal.junit.wizards.WizardMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private WizardMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-	
-	/**
-	 * Gets a string from the resource bundle and formats it with the argument
-	 * 
-	 * @param key	the string used to get the bundle value, must not be null
-	 */
-	public static String getFormattedString(String key, Object arg) {
-		return MessageFormat.format(getString(key), new Object[] { arg });
-	}
-
-	/**
-	 * Gets a string from the resource bundle and formats it with arguments
-	 */	
-	public static String getFormattedString(String key, Object[] args) {
-		return MessageFormat.format(getString(key), args);
-	}
-	
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.properties b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.properties
deleted file mode 100644
index d2679d1..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.properties
+++ /dev/null

@@ -1,136 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# Miscellaneous
-#
-Wizard.title.new.testcase=New JUnit Test Case
-Wizard.title.new.testsuite=New JUnit Test Suite
-#
-# CheckedTableSelectionDialog
-#
-CheckedTableSelectionDialog.emptyListMessage=No entries available.
-CheckedTableSelectionDialog.selectAll=&Select All
-CheckedTableSelectionDialog.deselectAll=&Deselect All
-
-#
-# NewTestCaseCreationWizard Page 1
-#
-NewTestClassWizPage.title=JUnit Test Case
-NewTestClassWizPage.description=Select the name of the new JUnit test case. You have the options to specify\nthe class under test and on the next page, to select methods to be tested.
-NewTestClassWizPage.methodStub.testRunner=&Add TestRunner statement for:
-NewTestClassWizPage.methodStub.setUp=set&Up()
-NewTestClassWizPage.methodStub.tearDown=tearDow&n()
-NewTestClassWizPage.methodStub.constructor=&constructor()
-NewTestClassWizPage.method.Stub.label=Which method stubs would you like to create?
-NewTestClassWizPage.class_to_test.label=Class Under &Test:
-NewTestClassWizPage.class_to_test.browse=B&rowse...
-NewTestClassWizPage.class_to_test.dialog.title=Class Under Test
-NewTestClassWizPage.class_to_test.dialog.message=Test stubs will be generated for class:
-NewTestClassWizPage.marker.message=\ Implement {0}().
-NewTestClassWizPage.error.superclass.not_exist=Superclass does not exist.
-NewTestClassWizPage.error.superclass.is_interface=Superclass is an interface.
-NewTestClassWizPage.error.superclass.not_implementing_test_interface=Superclass does not implement the ''{0}'' interface.
-NewTestClassWizPage.error.superclass.empty=Super class name is empty
-NewTestClassWizPage.testcase.label=&Name:
-NewTestClassWizPage.error.class_to_test.not_valid=Class under test is not valid.
-NewTestClassWizPage.error.class_to_test.not_exist=Class under test does not exist in current project.
-NewTestClassWizPage.warning.class_to_test.is_interface=Warning: Class under test ''{0}'' is an interface.
-NewTestClassWizPage.warning.class_to_test.not_visible=Warning: {0} ''{1}'' is not visible.
-NewTestClassWizPage.comment.class_to_test=Class under test for {0} {1}
-NewTestClassWizPage.error.junitNotOnbuildpath=junit.jar is not on the project\'s build path.
-NewTestClassWizPage.info.add_to_classpath=Warning: {0} ''{1}'' is not visible.
-
-Interface=Interface
-Class=Class
-
-#
-# NewTestCaseCreationWizard Page 2
-#
-NewTestClassWizPage2.selected_methods.label_one={0} method selected.
-NewTestClassWizPage2.selected_methods.label_many={0} methods selected.
-NewTestClassWizPage2.title=Test Methods
-NewTestClassWizPage2.description=Select methods for which test method stubs should be created.
-NewTestClassWizPage2.create_tasks.text=Create &tasks for generated test methods
-NewTestClassWizPage2.create_final_method_stubs.text=Create &final method stubs
-NewTestClassWizPage2.create_constructor.text=&Create test case constructor
-NewTestClassWizPage2.methods_tree.label=Available &methods:
-NewTestClassWizPage2.selectAll=&Select All
-NewTestClassWizPage2.deselectAll=&Deselect All
-NewTestClassWizPage2.method.Stub.label=Would you like to create a method stub for main?
-
-#
-# NewTestSuiteCreationWizard
-#
-NewTestSuiteWiz.unsavedchangesDialog.title=Unsaved changes
-NewTestSuiteWiz.unsavedchangesDialog.message={0} contains unsaved changes. Save before updating?
-
-#
-# NewTestSuiteCreationWizard Page
-#
-NewTestSuiteWizPage.title=JUnit Test Suite
-NewTestSuiteWizPage.description=Create a new JUnit Test Suite class for a package
-NewTestSuiteWizPage.classes_in_suite.label=Test &Classes to include in Suite:
-NewTestSuiteWizPage.selectAll=&Select All
-NewTestSuiteWizPage.deselectAll=D&eselect All
-NewTestSuiteWizPage.createType.beginTask=Creating test suite....
-NewTestSuiteWizPage.createType.updating.suite_method=Updating existing suite() method
-NewTestSuiteWizPage.createType.updateErrorDialog.title=Error updating class
-NewTestSuiteWizPage.createType.updateErrorDialog.message=There is no source associated with this class file
-NewTestSuiteWizPage.classes_in_suite.error.no_testclasses_selected=Warning: No Test Classes selected
-NewTestSuiteWizPage.suiteName.text=&Test suite:
-NewTestSuiteWizPage.typeName.error.name_empty=Test suite name is empty
-NewTestSuiteWizPage.typeName.error.name_qualified=Test suite name must not be qualified
-NewTestSuiteWizPage.typeName.error.name_not_valid=Test suite name is not valid. 
-NewTestSuiteWizPage.typeName.error.name.name_discouraged=Warning: Test suite name is discouraged. 
-NewTestSuiteWizPage.typeName.warning.already_exists=Warning: Test suite already exists. suite() method will be replaced.
-NewTestSuiteWizPage.cannotUpdateDialog.title=Cannot update suite() method
-NewTestSuiteWizPage.cannotUpdateDialog.message=The code in suite() that the wizard replaces must start with {0} and end with {1}
-NewTestSuiteWizPage.error_tile=New Test Suite
-NewTestSuiteWizPage.error_message=Creation of new test suite failed:
-NewTestClassWizPage.treeCaption.classSelected={0} class selected
-NewTestClassWizPage.treeCaption.classesSelected={0} classes selected
-NewTestSuiteCreationWizardPage.infinite_recursion=Warning: Adding a test suite as a test case in itself will result in infinite recursion and StackOverflowError
-
-#
-# UpdateTestSuite
-#
-UpdateAllTests.selected_methods.label_one={0} type selected.
-UpdateAllTests.selected_methods.label_many={0} types selected.
-UpdateAllTests.title=Recreate Test Suite
-UpdateAllTests.message=&Test Classes to be included
-UpdateAllTests.beginTask=Recreating suite() method....
-UpdateAllTests.cannotUpdate.errorDialog.title=Cannot recreate suite() method.
-UpdateAllTests.cannotUpdate.errorDialog.message=The code in suite() that the wizard replaces must start with {0} and end with {1}
-UpdateAllTests.cannotFind.errorDialog.title=Cannot find suite() method.
-UpdateAllTests.cannotFind.errorDialog.message=The suite() method cannot be found.
-
-#
-# JUnitWizard
-#
-NewJUnitWizard.op_error.title=New
-NewJUnitWizard.op_error.message=Creation of element failed.
-
-#
-# ExceptionHandler
-#
-ExceptionDialog.seeErrorLogMessage= See error log for details.
-UpdateTestSuite.infinite_recursion=Adding suite to itself may result in StackOverflowError
-UpdateTestSuite.error=Error occurred
-UpdateTestSuite.update=Update JUnit Test Suite
-UpdateTestSuite.could_not_update=The test suite could not be updated
-NewTestClassWizPage.not_on_buildpath.title=New Test Case
-NewTestClassWizPage.not_on_buildpath.message=The JUnit library \'junit.jar\' is not on the build path. Do you want to add it?
-NewTestClassWizPage.cannot_add.title=Error
-NewTestClassWizPage.cannot_add.message=Cannot add the junit.jar to the build path
-
-MethodStubsSelectionButtonGroup.text=text ui
-MethodStubsSelectionButtonGroup.swing=swing ui
-MethodStubsSelectionButtonGroup.awt=awt ui

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/ITestRunListener.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/ITestRunListener.java
deleted file mode 100644
index 0e90b46..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/ITestRunListener.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.junit;
-  
-/**
- * A listener interface for observing the execution of a test run.
- * <p>
- * Clients contributing to the 
- * <code>org.eclipse.jdt.junit.testRunListener</code>
- * extension point implement this interface.
- * </p>
- * 
- * @since 2.1
- */
- public interface ITestRunListener {
-	/**
-   	 * Status constant indicating that a test passed (constant value 0).
- 	 * 
-     * @see #testFailed(int, String, String, String)
- 	 */
- 	public static final int STATUS_OK= 0;
- 	/**
-	 * Status constant indicating that a test had an error an unanticipated
-	 * exception (constant value 1).
- 	 * 
-	 * @see #testFailed(int, String, String, String)
- 	 */
- 	public static final int STATUS_ERROR= 1;
- 	/**
-	 * Status constant indicating that a test failed an assertion
-	 * (constant value 2).
- 	 * 
- 	 * @see #testFailed(int, String, String, String)
-	 */
- 	public static final int STATUS_FAILURE= 2;
- 	/**
- 	 * A test run has started.
- 	 * 
- 	 * @param testCount the number of individual tests that will be run
- 	 */
-	public void testRunStarted(int testCount);
-	/**
- 	 * A test run has ended.
-	 *
-	 * @param elapsedTime the total elapsed time of the test run
-	 */
-	public void testRunEnded(long elapsedTime);
-	/**
-	 * A test run has been stopped prematurely.
-	 *
- 	 * @param elapsedTime the time elapsed before the test run was stopped
-	 */
-	public void testRunStopped(long elapsedTime);
-	/**
-	 * An individual test has started.
-	 * 
-	 * @param testId a unique Id identifying the test
-	 * @param testName the name of the test that started
-	 */
-	public void testStarted(String testId, String testName);
-	/**
-	 * An individual test has ended.
-	 * 
-	 * @param testId a unique Id identifying the test
-	 * @param testName the name of the test that ended
-	 */
-	public void testEnded(String testId, String testName);
-	/**
-	 * An individual test has failed with a stack trace.
-	 * 
-	 * @param testId a unique Id identifying the test
- 	 * @param testName the name of the test that failed
-	 * @param status the outcome of the test; one of 
-	 * {@link #STATUS_ERROR STATUS_ERROR} or
-	 * {@link #STATUS_FAILURE STATUS_FAILURE}
-	 * @param trace the stack trace
-	 */
-	public void testFailed(int status, String testId, String testName, String trace);	
-			
-	/**
-	 * The VM instance performing the tests has terminated.
-	 */
-	public void testRunTerminated();
-	
-	/**
- 	 * An individual test has been rerun.
-	 * 
-	 * @param testId a unique Id identifying the test
-	 * @param testClass the name of the test class that was rerun
-	 * @param testName the name of the test that was rerun
-	 * @param status the outcome of the test that was rerun; one of 
-	 * {@link #STATUS_OK STATUS_OK}, {@link #STATUS_ERROR STATUS_ERROR},
-	 * or {@link #STATUS_FAILURE STATUS_FAILURE}
-	 * @param trace the stack trace in the case of abnormal termination,
-	 * or the empty string if none
-	 */
-	public void testReran(String testId, String testClass, String testName, int status, String trace);
-}
-
-

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/JUnitCore.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/JUnitCore.java
deleted file mode 100644
index 6d595aa..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/JUnitCore.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.junit;
-
-import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
-
-/**
- * Class for accessing JUnit support; all functionality is provided by 
- * static methods. 
- * </p>
- * 
- * @since 2.1
- */
-public class JUnitCore {
-
-	/**
-	 * Adds a listener for test runs.
-	 * 
-	 * @param listener listener to be added
-	 */
-	public static void addTestRunListener(ITestRunListener listener) {
-		JUnitPlugin.getDefault().addTestRunListener(listener);
-	}
-
-	/**
-	 * Removes a listener for test runs.
-	 * 
-	 * @param listener listener to be removed 
-	 */
-	public static void removeTestRunListener(ITestRunListener listener) {
-		JUnitPlugin.getDefault().removeTestRunListener(listener);
-	}
-}

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/package.html b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/package.html
deleted file mode 100644
index 63db8cf..0000000
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/package.html
+++ /dev/null

@@ -1,16 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Application programming interfaces for interaction
-with the Eclipse Java Development Tools JUnit support.
-<h2>
-Package Specification</h2>
-An API to track the execution of a JUnit test run.
-</body>
-</html>

diff --git a/org.eclipse.jdt.text.tests/.classpath b/org.eclipse.jdt.text.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.jdt.text.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.text.tests/.cvsignore b/org.eclipse.jdt.text.tests/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.jdt.text.tests/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin
\ No newline at end of file

diff --git a/org.eclipse.jdt.text.tests/.options b/org.eclipse.jdt.text.tests/.options
deleted file mode 100644
index b1640da..0000000
--- a/org.eclipse.jdt.text.tests/.options
+++ /dev/null

@@ -1,4 +0,0 @@
-# Options for the org.eclipse.jdt.text.tests plug-in
-
-# PerformanceMeterFactory to use (fully qualified class name)
-org.eclipse.jdt.text.tests/option/performanceMeterFactory=

diff --git a/org.eclipse.jdt.text.tests/.project b/org.eclipse.jdt.text.tests/.project
deleted file mode 100644
index 5afcc9a..0000000
--- a/org.eclipse.jdt.text.tests/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.text.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.text.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.text.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8901c09..0000000
--- a/org.eclipse.jdt.text.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Fri Aug 27 09:16:12 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.jdt.text.tests/OpenEditorTestSetup.launch b/org.eclipse.jdt.text.tests/OpenEditorTestSetup.launch
deleted file mode 100644
index e89eeed..0000000
--- a/org.eclipse.jdt.text.tests/OpenEditorTestSetup.launch
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.text.tests.performance.PerformanceTestSetup"/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="vmargs" value="-Xms250M -Xmx250M"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_US"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.text.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location0" value="c:\local\eclipse\workspace\performance-workspace"/>
-</launchConfiguration>

diff --git "a/org.eclipse.jdt.text.tests/OpenJavaEditorTest \050upload\051.launch" "b/org.eclipse.jdt.text.tests/OpenJavaEditorTest \050upload\051.launch"
deleted file mode 100644
index 8734d02..0000000
--- "a/org.eclipse.jdt.text.tests/OpenJavaEditorTest \050upload\051.launch"
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.text.tests.performance.OpenJavaEditorTest"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="vmargs" value="-Xms250M -Xmx250M -Detools_perf_ctrl=testname=OpenEditorTest;log=C:\local\eclipse\perfmsr;driver=3.0-runtime2;driverdate=200407220001;driverstream=3.0.0;driverlabel=I200407220001;uploadhost=eclipseperf.torolab.ibm.com;uploadport=9080;uploaduserid=chm"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_US"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.text.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location0" value="c:\local\eclipse\workspace\performance-workspace"/>
-</launchConfiguration>

diff --git "a/org.eclipse.jdt.text.tests/OpenTextEditorTest \050upload\051.launch" "b/org.eclipse.jdt.text.tests/OpenTextEditorTest \050upload\051.launch"
deleted file mode 100644
index 40b2e66..0000000
--- "a/org.eclipse.jdt.text.tests/OpenTextEditorTest \050upload\051.launch"
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.text.tests.performance.OpenTextEditorTest"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="vmargs" value="-Xms250M -Xmx250M -Detools_perf_ctrl=testname=OpenEditorTest;log=C:\local\eclipse\perfmsr;driver=3.0-runtime2;driverdate=200407220001;driverstream=3.0.0;driverlabel=I200407220001;uploadhost=eclipseperf.torolab.ibm.com;uploadport=9080;uploaduserid=chm"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_US"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.text.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location0" value="c:\local\eclipse\workspace\performance-workspace"/>
-</launchConfiguration>

diff --git "a/org.eclipse.jdt.text.tests/RevertJavaEditorTest \050upload\051.launch" "b/org.eclipse.jdt.text.tests/RevertJavaEditorTest \050upload\051.launch"
deleted file mode 100644
index 1f088b1..0000000
--- "a/org.eclipse.jdt.text.tests/RevertJavaEditorTest \050upload\051.launch"
+++ /dev/null

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.text.tests.performance.RevertJavaEditorTest"/>
-<stringAttribute key="vminstall" value="Sun JDK 1.4.2_04"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="location1" value="/home/tei/eclipse/workspaces/runtime/open-editor"/>
-<stringAttribute key="location2" value="c:\local\eclipse\workspace\performance-workspace"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="vmargs" value="-Xms250M -Xmx250M -Detools_perf_ctrl=testname=RevertJavaEditorTest;log=/home/tei/tmp/perfmsr;driver=3.0-runtime2;driverdate=200407220001;driverstream=3.0.0;driverlabel=I200407220001 -Declipse.performance.reference.driver=3.0-runtime2 -Declipse.performance.reference.timestamp=1091544587460"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="progargs" value="-os linux -ws gtk -arch x86 -nl en_US"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.text.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location0" value="/home/tei/eclipse/workspaces/runtime/open-editor"/>
-</launchConfiguration>

diff --git "a/org.eclipse.jdt.text.tests/RevertTextEditorTest \050upload\051.launch" "b/org.eclipse.jdt.text.tests/RevertTextEditorTest \050upload\051.launch"
deleted file mode 100644
index 831abc6..0000000
--- "a/org.eclipse.jdt.text.tests/RevertTextEditorTest \050upload\051.launch"
+++ /dev/null

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="clearws" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.text.tests.performance.RevertTextEditorTest"/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="vminstall" value="Sun JDK 1.4.2_04"/>
-<stringAttribute key="location1" value="/home/tei/eclipse/workspaces/runtime/open-editor"/>
-<stringAttribute key="location2" value="c:\local\eclipse\workspace\performance-workspace"/>
-<stringAttribute key="vmargs" value="-Xms250M -Xmx250M -Detools_perf_ctrl=testname=RevertTextEditorTest;log=/home/tei/tmp/perfmsr;driver=3.0-runtime2;driverdate=200407220001;driverstream=3.0.0;driverlabel=I200407220001;uploadhost=eclipseperf.torolab.ibm.com;uploadport=9080;uploaduserid=tkilla"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="progargs" value="-os linux -ws gtk -arch x86 -nl en_US"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.text.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location0" value="/home/tei/eclipse/workspaces/runtime/open-editor"/>
-</launchConfiguration>

diff --git a/org.eclipse.jdt.text.tests/about.html b/org.eclipse.jdt.text.tests/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.text.tests/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.text.tests/build.properties b/org.eclipse.jdt.text.tests/build.properties
deleted file mode 100644
index 93606dd..0000000
--- a/org.eclipse.jdt.text.tests/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               test.xml,\
-               about.html,\
-               testResources/,\
-               *.jar
-
-src.includes = about.html
-               
-source.jdttexttests.jar = src/

diff --git a/org.eclipse.jdt.text.tests/plugin.properties b/org.eclipse.jdt.text.tests/plugin.properties
deleted file mode 100644
index acfc1bd..0000000
--- a/org.eclipse.jdt.text.tests/plugin.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-Plugin.name= JDT Text Test Plug-in
-Plugin.providerName= Eclipse.org

diff --git a/org.eclipse.jdt.text.tests/plugin.xml b/org.eclipse.jdt.text.tests/plugin.xml
deleted file mode 100644
index 5b22268..0000000
--- a/org.eclipse.jdt.text.tests/plugin.xml
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.text.tests"
-   name="%Plugin.name"
-   version="3.1.0"
-   provider-name="%Plugin.providerName"
-   class="org.eclipse.jdt.text.tests.JdtTextTestPlugin">
-
-   <runtime>
-      <library name="jdttexttests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface.text.tests"/>
-      <import plugin="org.eclipse.jdt.ui.tests"/>
-      <import plugin="org.eclipse.core.filebuffers.tests"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.test.performance"/>
-      <import plugin="org.eclipse.text.tests"/>
-   </requires>
-
-
-</plugin>

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakIteratorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakIteratorTest.java
deleted file mode 100644
index 209f4bc..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakIteratorTest.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import java.text.BreakIterator;
-
-import junit.framework.TestCase;
-
-
-/**
- * @since 3.0
- */
-public class BreakIteratorTest extends TestCase {
-
-	protected BreakIterator fBreakIterator;
-
-	public void assertNextPositions(CharSequence ci, int position) {
-		assertNextPositions(ci, new int[] {position});
-	}
-
-	public void assertNextPositions(CharSequence ci, int[] positions) {
-		fBreakIterator.setText(ci.toString());
-		
-		// test next()
-		for (int i = 0; i < positions.length; i++) {
-			int pos= fBreakIterator.next(); 
-			assertEquals(positions[i], pos);
-		}
-		
-		// test following()
-		int idx= 0;
-		for (int i = 0; i < positions.length; i++) {
-			int position= positions[i];
-			while (idx < position) {
-				if (!illegalPos(ci, idx))
-					assertEquals(position, fBreakIterator.following(idx));
-				idx++;
-			}
-		}
-		
-	}
-
-	/**
-	 * Check if we are in a multibyte delimiter
-	 * @param idx
-	 * @return
-	 */
-	private boolean illegalPos(CharSequence seq, int idx) {
-		String DELIMS= "\n\r";
-		if (idx == 0 || idx == seq.length())
-			return false;
-		char one= seq.charAt(idx - 1);
-		char two= seq.charAt(idx);
-		return one != two && DELIMS.indexOf(one) != -1 && DELIMS.indexOf(two) != -1;
-	}
-
-	public void assertPreviousPositions(CharSequence ci, int position) {
-		assertPreviousPositions(ci, new int[] {position});
-	}
-
-	public void assertPreviousPositions(CharSequence ci, int[] positions) {
-		fBreakIterator.setText(ci.toString());
-		fBreakIterator.last();
-		
-		for (int i = positions.length - 1; i >= 0; i--) {
-			int pos= fBreakIterator.previous(); 
-			assertEquals(positions[i], pos);
-		}
-	
-		// test preceding()
-		int idx= ci.length();
-		for (int i = positions.length - 1; i >= 0; i--) {
-			int position= positions[i];
-			while (idx > position) {
-				if (!illegalPos(ci, idx))
-					assertEquals(position, fBreakIterator.preceding(idx));
-				idx--;
-			}
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/CompilationUnitDocumentProviderTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/CompilationUnitDocumentProviderTest.java
deleted file mode 100644
index 10f75a4..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/CompilationUnitDocumentProviderTest.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.filebuffers.tests.ResourceHelper;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.ICompilationUnitDocumentProvider;
-
-
-public class CompilationUnitDocumentProviderTest extends TestCase {
-	
-	private IJavaProject fJavaProject;
-	private IProject fLinkedProject;
-
-	public CompilationUnitDocumentProviderTest(String name) {
-		super(name);
-	}
-			
-	/**
-	 * Creates a new test Java project.
-	 */	
-	protected void setUp() throws Exception {
-		fJavaProject= JavaProjectHelper.createJavaProject("P", "bin");
-	}
-
-	private void setupProject() throws CoreException, JavaModelException {
-		fJavaProject= JavaProjectHelper.createJavaProject("P", "bin");
-
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		IPackageFragment pack= root.createPackageFragment("testA.testB", true, null);
-		
-		ICompilationUnit cu= pack.getCompilationUnit("A.java");
-		IType type= cu.createType("public class A {\n}\n", null, true, null);
-		type.createMethod("public void a() {}\n", null, true, null);
-		type.createMethod("public void b(java.util.Vector v) {}\n", null, true, null);
-	}
-
-	/**
-	 * Removes the test java project.
-	 */	
-	protected void tearDown () throws Exception {
-		if (fJavaProject != null)
-			JavaProjectHelper.delete(fJavaProject);
-		
-		if (fLinkedProject != null)
-			ResourceHelper.delete(fLinkedProject, false);
-	}
-				
-	public void test1() throws Exception {
-		setupProject();
-		IFile file= ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/P/src/testA/testB/A.java"));
-		checkFile(file);
-	}
-
-	public void test2() throws Exception {
-		setupProject();
-		IProject project= (IProject) fJavaProject.getUnderlyingResource();
-		IFolder folder= ResourceHelper.createLinkedFolder(project, new Path("src2"), JdtTextTestPlugin.getDefault(), new Path("testResources/folderLinkTarget1"));
-		assertNotNull(folder);
-		assertTrue(folder.exists());
-
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IFile file= root.getFile(new Path("/P/src2/test1/test2/C.java"));
-		checkFile(file);
-	}
-	
-	public void test3() throws Exception {
-		fLinkedProject= ResourceHelper.createLinkedProject("P2", JdtTextTestPlugin.getDefault(), new Path("testResources/folderLinkTarget1"));
-		assertNotNull(fLinkedProject);
-		assertTrue(fLinkedProject.exists());
-		
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IFile file= root.getFile(new Path("/P2/test1/test2/C.java"));
-		checkFile(file);
-	}
-	
-	private void checkFile(IFile file) throws CoreException {
-		assertNotNull(file);
-		IEditorInput input= new FileEditorInput(file);
-		
-		ICompilationUnitDocumentProvider provider= JavaPlugin.getDefault().getCompilationUnitDocumentProvider();
-		assertNotNull(provider);
-		
-		provider.connect(input);		
-		assertNotNull(provider.getDocument(input));
-		assertNotNull(provider.getAnnotationModel(input));
-		provider.disconnect(input);
-		assertNull(provider.getDocument(input));
-		assertNull(provider.getAnnotationModel(input));
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/HTML2TextReaderTester.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/HTML2TextReaderTester.java
deleted file mode 100644
index 3f90eb2..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/HTML2TextReaderTester.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.ui.text.HTML2TextReader;
-
-public class HTML2TextReaderTester extends TestCase {
-
-	private boolean isVerbose= false;
-	private static final String LD= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	public HTML2TextReaderTester(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new TestSuite(HTML2TextReaderTester.class);
-	}
-
-	private void verify(String input, String expectedOutput) throws IOException{
-		Reader reader= new StringReader(input);
-		HTML2TextReader htmlReader= new HTML2TextReader(reader, null);
-		String result= htmlReader.getString();
-		if (isVerbose)
-			System.out.println("<"+ result +"/>");
-		assertEquals(expectedOutput, result);		
-	}
-	
-	public void test0() throws IOException{
-		String string= "<code>3<5<code>";
-		String expected= "3<5";
-		verify(string, expected);
-	}
-	
-	public void test1() throws IOException{
-		String string= "<dl><dt>@author</dt><dd>Foo Bar</dd></dl>";
-		String expected= LD+ "@author"+LD+"\tFoo Bar"+LD;
-		verify(string, expected);
-	}
-
-	public void test2() throws IOException{
-		String string= "<code>3>5<code>";
-		String expected= "3>5";
-		verify(string, expected);
-	}
-
-	public void test3() throws IOException{
-		String string= "<a href= \"<p>this is only a string - not a tag<p>\">text</a>";
-		String expected= "text";
-		verify(string, expected);
-	}
-	
-	public void test4() throws IOException{
-		String string= 	"<html><body text=\"#000000\" bgcolor=\"#FFFF88\"><font size=-1><h5>void p.Bb.fes()</h5><p><dl><dt>Parameters:</dt><dd><b>i</b> fred or <code>null</code></dd></dl></font></body></html>";
-		String expected= "void p.Bb.fes()"+ LD + LD + LD+ "Parameters:"+ LD + "\ti fred or null"+LD;
-		verify(string, expected);
-	}
-
-	public void test5() throws IOException{
-		String string= "<code>1<2<3<4</code>";
-		String expected= "1<2<3<4";
-		verify(string, expected);
-	}
-
-	public void test6() throws IOException{
-		//test for bug 19070
-		String string= "<p>Something.<p>Something more.";
-		String expected= LD + "Something." + LD + "Something more.";
-		verify(string, expected);
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JUnitProjectTestSetup.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JUnitProjectTestSetup.java
deleted file mode 100644
index 9bca99b..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JUnitProjectTestSetup.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.jdt.core.IJavaProject;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-
-/**
- * Test setup which creates a Java project with JUnit source.
- * <p>
- * - the project name is "JUnit_" + current time
- * - the source folder is called "src"
- * - the output folder is called "bin"
- * </p>
- * 
- * @since 3.1
- */
-public class JUnitProjectTestSetup extends TestSetup {
-	
-	private static IJavaProject fgProject;
-	
-	public static IJavaProject getProject() {
-		assertNotNull(fgProject);
-		return fgProject;
-	}
-	
-	public JUnitProjectTestSetup(Test test) {
-		super(test);
-	}
-	
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 * @since 3.1
-	 */
-	protected void setUp() throws Exception {
-		String projectName= "JUnit_" + System.currentTimeMillis();
-		fgProject= JavaProjectHelper.createJavaProjectWithJUnitSource(projectName, "src", "bin");
-	}
-	
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 * @since 3.1
-	 */
-	protected void tearDown() throws Exception {
-		if (fgProject != null) {
-			JavaProjectHelper.delete(fgProject);
-			fgProject= null;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaBreakIteratorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaBreakIteratorTest.java
deleted file mode 100644
index c10ae2a..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaBreakIteratorTest.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import org.eclipse.jdt.internal.ui.text.JavaBreakIterator;
-
-/**
- * @since 3.0
- */
-public class JavaBreakIteratorTest extends BreakIteratorTest {
-
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		fBreakIterator= new JavaBreakIterator();
-	}
-	
-	public void testNext1() {
-		assertNextPositions("word word", new int[] { 4, 5, 9 });
-	}
-	
-	public void testNext2() {
-		assertNextPositions("wordWord word", new int[] { 4, 8, 9, 13 });
-	}
-	
-	public void testNextSpace() {
-		assertNextPositions(" word ", new int[] { 1, 5, 6 });
-	}
-	
-	public void testNextParen() {
-		assertNextPositions("word(params)", new int[] { 4, 5, 11, 12 });
-	}
-	
-	public void testNextLn() {
-		String s= new String("word \n" +
-				"  word2");
-		assertNextPositions(s, new int[] { 4, 5, 6, 8, 13 });
-	}
-
-	public void testMultiNextLn() {
-		String s= new String("word \n" +
-				"\n" +
-				"\n" +
-				"  word2");
-		assertNextPositions(s, new int[] { 4, 5, 6, 7, 8, 10, 15 });
-	}
-
-	public void testMultiNextLn2() {
-		String s= new String("word \r\n" +
-				"\r\n" +
-				"\r\n" +
-				"  word2");
-		assertNextPositions(s, new int[] { 4, 5, 7, 9, 11, 13, 18 });
-	}
-
-	public void testNextCamelCaseWord() {
-		String s= new String("   _isURLConnection_   ");
-		assertNextPositions(s, new int[] { 3, 6, 9, 20, 23 });
-	}
-	
-	public void testPrevious1() {
-		String s= new String("word word");
-		assertPreviousPositions(s, new int[] { 0, 4, 5 });
-	}
-	
-	public void testPrevious2() {
-		String s= new String("wordWord word");
-		assertPreviousPositions(s, new int[] { 0, 4, 8, 9 });
-	}
-	
-	public void testPreviousSpace() {
-		String s= new String(" word ");
-		assertPreviousPositions(s, new int[] { 1, 5 });
-	}
-	
-	public void testPreviousParen() {
-		String s= new String("word(params)");
-		assertPreviousPositions(s, new int[] { 0, 4, 5, 11 });
-	}
-	
-	public void testPreviousLn() {
-		String s= new String("word \n" +
-				"  word2");
-		assertPreviousPositions(s, new int[] { 0, 4, 5, 6, 8 });
-	}
-	
-	public void testMultiPreviousLn() {
-		String s= new String("word \n" +
-				"\n" +
-				"\n" +
-				"  word2");
-		assertPreviousPositions(s, new int[] { 0, 4, 5, 6, 7, 8, 10 });
-	}
-
-	public void testMultiPreviousLn2() {
-		String s= new String("word \r\n" +
-				"\r\n" +
-				"\r\n" +
-				"  word2");
-		assertPreviousPositions(s, new int[] { 0, 4, 5, 7, 9, 11, 13 });
-	}
-
-	public void testPreviousCamelCaseWord() {
-		String s= new String("   _isURLConnection_   ");
-		assertPreviousPositions(s, new int[] { 0, 3, 6, 9, 20 });
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaColoringTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaColoringTest.java
deleted file mode 100644
index ec1e8d7..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaColoringTest.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.custom.StyleRange;
-
-import org.eclipse.jface.preference.PreferenceStore;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.tests.TestTextViewer;
-
-import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
-import org.eclipse.jdt.ui.text.JavaTextTools;
-
-
-
-public class JavaColoringTest extends TestCase {
-	
-	protected TestTextViewer fTextViewer;
-	protected IDocument fDocument;
-	protected JavaTextTools fTextTools;
-	
-	public JavaColoringTest(String name) {
-		super(name);
-	}
-	
-	protected void setUp() {
-		
-		fTextTools= new JavaTextTools(new PreferenceStore());
-		
-		fTextViewer= new TestTextViewer();
-		
-		fDocument= new Document();
-		IDocumentPartitioner partitioner= fTextTools.createDocumentPartitioner();
-		partitioner.connect(fDocument);
-		fDocument.setDocumentPartitioner(partitioner);
-		
-		SourceViewerConfiguration conf= new JavaSourceViewerConfiguration(fTextTools, null);
-		IPresentationReconciler reconciler= conf.getPresentationReconciler(fTextViewer);
-		reconciler.install(fTextViewer);
-		
-		System.out.print("------ next ---------\n");
-		
-	}
-	
-	public static Test suite() {
-		return new TestSuite(JavaColoringTest.class); 
-	}
-	
-	protected void tearDown () {
-		
-		fTextTools.dispose();
-		fTextTools= null;
-
-		fTextViewer= null;
-		fDocument= null;
-	}
-		
-	String print(TextPresentation presentation) {
-		
-		StringBuffer buf= new StringBuffer();
-		
-		if (presentation != null) {
-			
-			buf.append("Default style range: ");
-			StyleRange range= presentation.getDefaultStyleRange();
-			if (range != null)
-				buf.append(range.toString());
-			buf.append('\n');
-			
-			Iterator e= presentation.getAllStyleRangeIterator();
-			while (e.hasNext()) {
-				buf.append(e.next().toString());
-				buf.append('\n');
-			}
-		}
-		
-		return buf.toString();	
-	}
-	
-	public void testSimple() {
-		fDocument.set("xx //");
-		fTextViewer.setDocument(fDocument);
-		System.out.print(print(fTextViewer.getTextPresentation()));
-	}
-	
-	public void testTypingWithPartitionChange() {
-		try {
-			fTextViewer.setDocument(fDocument);
-			fDocument.replace(0, 0, "x/");
-			System.out.print(print(fTextViewer.getTextPresentation()));
-			fDocument.replace(2,0, "/");
-			System.out.print(print(fTextViewer.getTextPresentation()));
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testTogglingPartitions() {
-		try {
-			fTextViewer.setDocument(fDocument);
-			fDocument.replace(0, 0, "\t/*\n\tx\n\t/*/\n\ty\n//\t*/");
-			System.out.print(print(fTextViewer.getTextPresentation()));
-			fDocument.replace(0,0, "//");
-			System.out.print(print(fTextViewer.getTextPresentation()));
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}		
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaDoc2HTMLTextReaderTester.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaDoc2HTMLTextReaderTester.java
deleted file mode 100644
index 85c9d92..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaDoc2HTMLTextReaderTester.java
+++ /dev/null

@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import java.io.Reader;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.IBufferChangedListener;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.javadoc.JavaDocCommentReader;
-
-import org.eclipse.jdt.internal.ui.text.HTMLPrinter;
-import org.eclipse.jdt.internal.ui.text.javadoc.JavaDoc2HTMLTextReader;
-
-public class JavaDoc2HTMLTextReaderTester extends TestCase {
-
-	private boolean isVerbose= false;
-	
-	public JavaDoc2HTMLTextReaderTester(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new TestSuite(JavaDoc2HTMLTextReaderTester.class);
-	}
-
-	private String getTransformedJavaDoc(String string) {
-		Reader reader= new JavaDocCommentReader(new MockBuffer(string), 0, string.length());
-		return HTMLPrinter.read(new JavaDoc2HTMLTextReader(reader));
-	}
-	
-	private void verify(String string, String expected){
-		String result = getTransformedJavaDoc(string);
-		if (isVerbose)
-			System.out.println("result:" + result); //$NON-NLS-1$
-		assertEquals(expected, result);
-	}
-
-	public void test0(){
-		String string= "/**@deprecated*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@deprecated</dt><dd></dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test1(){
-		String string= "/**@author Foo Bar*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@author</dt><dd>Foo Bar</dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test2(){
-		//test for bug 14658
-		String string= "/**@author Foo Bar<a href=\"mailto:foobar@eclipse.org\">foobar@eclipse.org</a>*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@author</dt><dd>Foo Bar<a href=\"mailto:foobar@eclipse.org\">foobar@eclipse.org</a></dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-	
-	public void test3(){
-		//test for bug 14658
-		String string= "/**@author Foo Bar<a href=\"mailto:foobar@eclipse.org\">foobar@eclipse.org</a>\n *@deprecated*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@author</dt><dd>Foo Bar<a href=\"mailto:foobar@eclipse.org\">foobar@eclipse.org</a></dd><dt>@deprecated</dt><dd></dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test4(){
-		String string= "/**@author Foo Bar\n * @deprecated*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@author</dt><dd>Foo Bar</dd><dt>@deprecated</dt><dd></dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-	
-	public void test5(){
-		String string= "/**@author Foo Bar\n * @author Baz Fred*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@author</dt><dd>Foo Bar</dd><dt>@author</dt><dd>Baz Fred</dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test6(){
-		String string= "/**@author Foo Bar\n * @since 2.0*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@author</dt><dd>Foo Bar</dd><dt>@since</dt><dd>2.0</dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	
-	public void test7(){
-		if (true){
-			System.out.println(getClass().getName()+"::" + getName() +" disabled(corner case - @see tag inside <a> tag)"); //$NON-NLS-1$ //$NON-NLS-2$
-			return;
-		}
-		String string= "/**@author Foo Bar<a href=\"mailto:foobar@see.org\">foobar@see.org</a>*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@author</dt><dd>Foo Bar<a href=\"mailto:foobar@see.org\">foobar@see.org</a></dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test8(){
-		if (true){
-			System.out.println(getClass().getName()+"::" + getName() +" disabled(corner case - @see tag inside <a> tag)"); //$NON-NLS-1$ //$NON-NLS-2$
-			return;
-		}
-		String string= "/**@author Foo Bar<a href=\"mailto:foobar@see.org\">foobar@eclipse.org</a>*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>@author</dt><dd>Foo Bar<a href=\"mailto:foobar@see.org\">foobar@eclipse.org</a></dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test9(){
-		String string= "/**@throws NullPointerException*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>Throws:</dt><dd>NullPointerException</dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test10(){
-		//test for bug 8131
-		String string= "/**@exception NullPointerException*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>Throws:</dt><dd>NullPointerException</dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test11(){
-		//test for bug 8132
-		String string= "/**@exception NullPointerException \n * @throws java.lang.Exception*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>Throws:</dt><dd>NullPointerException</dd><dd>java.lang.Exception</dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-	public void test12(){
-		String string= "/** \n *@param i fred or <code>null</code> \n*/"; //$NON-NLS-1$
-		String expected= "<dl><dt>Parameters:</dt><dd><b>i</b> fred or <code>null</code></dd></dl>"; //$NON-NLS-1$
-		verify(string, expected);
-	}
-
-}
-
-class MockBuffer implements IBuffer{
-	
-	private StringBuffer fStringBuffer;
-	MockBuffer(String string){
-		fStringBuffer= new StringBuffer(string);
-	}
-	
-	public void addBufferChangedListener(IBufferChangedListener listener) {
-	}
-
-
-	public void append(char[] text) {
-		fStringBuffer.append(text);
-	}
-
-
-	public void append(String text) {
-		fStringBuffer.append(text);
-	}
-
-
-	public void close() {
-	}
-
-
-	public char getChar(int position) {
-		return fStringBuffer.charAt(position);
-	}
-
-
-	public char[] getCharacters() {
-		return fStringBuffer.toString().toCharArray();
-	}
-
-
-	public String getContents() {
-		return fStringBuffer.toString();
-	}
-
-
-	public int getLength() {
-		return fStringBuffer.length();
-	}
-
-
-	public IOpenable getOwner() {
-		return null;
-	}
-
-
-	public String getText(int offset, int length) {
-		return fStringBuffer.toString().substring(offset, offset + length);
-	}
-
-
-	public IResource getUnderlyingResource() {
-		return null;
-	}
-
-
-	public boolean hasUnsavedChanges() {
-		return false;
-	}
-
-
-	public boolean isClosed() {
-		return false;
-	}
-
-
-	public boolean isReadOnly() {
-		return false;
-	}
-
-
-	public void removeBufferChangedListener(IBufferChangedListener listener) {
-	}
-
-
-	public void replace(int position, int length, char[] text) {
-	}
-
-
-	public void replace(int position, int length, String text) {
-	}
-
-
-	public void save(IProgressMonitor progress, boolean force)
-		throws JavaModelException {
-	}
-
-
-	public void setContents(char[] contents) {
-	}
-
-
-	public void setContents(String contents) {
-		fStringBuffer= new StringBuffer(contents);
-	}
-}
-

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaHeuristicScannerTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaHeuristicScannerTest.java
deleted file mode 100644
index e012c1e..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaHeuristicScannerTest.java
+++ /dev/null

@@ -1,795 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import java.util.Hashtable;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
-import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
-import org.eclipse.jdt.internal.ui.text.JavaHeuristicScanner;
-import org.eclipse.jdt.internal.ui.text.JavaIndenter;
-
-/**
- * SmartSemicolonAutoEditStrategyTest
- * @since 3.0
- */
-public class JavaHeuristicScannerTest extends TestCase {
-
-	private DefaultPartitioner fPartitioner;
-	private Document fDocument;
-	private JavaIndenter fScanner;
-
-	public static Test suite() {
-		return new TestSuite(JavaHeuristicScannerTest.class);
-	}
-
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() {
-		if (JavaCore.getPlugin() != null) {
-			Hashtable options= JavaCore.getDefaultOptions();
-			options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
-			options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-
-			final String indentOnColumn= DefaultCodeFormatterConstants.createAlignmentValue(false, DefaultCodeFormatterConstants.WRAP_NO_SPLIT, DefaultCodeFormatterConstants.INDENT_ON_COLUMN);
-			options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION, indentOnColumn);
-			options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER, indentOnColumn);
-			options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION, "1");
-			JavaCore.setOptions(options);
-		}
-
-		fDocument= new Document();
-		String[] types= new String[] {
-			IJavaPartitions.JAVA_DOC,
-			IJavaPartitions.JAVA_MULTI_LINE_COMMENT,
-			IJavaPartitions.JAVA_SINGLE_LINE_COMMENT,
-			IJavaPartitions.JAVA_STRING,
-			IJavaPartitions.JAVA_CHARACTER,
-			IDocument.DEFAULT_CONTENT_TYPE
-		};
-		fPartitioner= new DefaultPartitioner(new FastJavaPartitionScanner(), types);
-		fPartitioner.connect(fDocument); 
-		fDocument.setDocumentPartitioner(IJavaPartitions.JAVA_PARTITIONING, fPartitioner);
-		
-		JavaHeuristicScanner hScanner= new JavaHeuristicScanner(fDocument);
-		fScanner= new JavaIndenter(fDocument, hScanner);
-	}
-	
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		fDocument.setDocumentPartitioner(IJavaPartitions.JAVA_PARTITIONING, null);
-		fPartitioner.disconnect();
-		fPartitioner= null;
-		fDocument= null;
-	}
-
-	public void testPrevIndentationUnit1() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"");
-		
-		int pos= fScanner.findReferencePosition(18);
-		Assert.assertEquals(9, pos);
-	}
-	
-	public void testPrevIndentationUnit2() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a");
-		
-		int pos= fScanner.findReferencePosition(28);
-		Assert.assertEquals(21, pos);
-	}
-	
-	public void testPrevIndentationUnit4() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a\n" +
-			"");
-		
-		int pos= fScanner.findReferencePosition(29);
-		Assert.assertEquals(28, pos);
-	}
-	
-	public void testPrevIndentationUnit5() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a;\n" +
-			"");
-		
-		int pos= fScanner.findReferencePosition(30);
-		Assert.assertEquals(9, pos);
-	}
-	
-	public void testPrevIndentationUnit6() {
-		// method definition
-		fDocument.set("\tvoid proc (int par1, int par2\n");
-		
-		int pos= fScanner.findReferencePosition(30);
-		Assert.assertEquals(12, pos);
-	}
-	
-	public void testPrevIndentationUnit7() {
-		// for with semis 
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tfor (int i= 4; i < 33; i++) \n" +
-			"");
-		
-		int pos= fScanner.findReferencePosition(fDocument.getLength());
-		Assert.assertEquals(39, pos);
-	}
-	
-	public void testPrevIndentationUnit8() {
-		// TODO this is mean - comment at indentation spot
-		fDocument.set("\t/* package */ void proc (int par1, int par2) {\n");
-		
-		int pos= fScanner.findReferencePosition(fDocument.getLength());
-//		Assert.assertEquals(1, pos);
-		Assert.assertEquals(15, pos);
-	}
-	
-	public void testPrevIndentationUnit9() {
-		// block
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tfor (int i= 4; i < 33; i++) {\n" +
-			"\t\t}\n" +
-			"\t\t\n" +
-			"\t\tint i;\n");
-		
-		int pos= fScanner.findReferencePosition(fDocument.getLength());
-		Assert.assertEquals(fDocument.getLength() - 7, pos);
-	}
-
-	public void testPrevIndentationUnit10() {
-		// if else 
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tif (condition()) {\n" +
-			"\t\t\tcode();\n" +
-			"\t\t} else {\n" +
-			"\t\t\totherCode();\n" +
-			"\t\t}\n" +
-			"");
-		
-		int pos= fScanner.findReferencePosition(fDocument.getLength());
-		Assert.assertEquals(39, pos);
-	}
-
-	public void testPrevIndentationUnit11() {
-		// inside else block
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tif (condition()) {\n" +
-			"\t\t\tcode();\n" +
-			"\t\t} else {\n" +
-			"\t\t\totherCode();\n" +
-			"\t\t" +
-			"");
-		
-		int pos= fScanner.findReferencePosition(fDocument.getLength());
-		Assert.assertEquals(83, pos);
-	}
-
-	public void testPrevIndentation1() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"");
-		
-		String indent= fScanner.getReferenceIndentation(18).toString();
-		Assert.assertEquals("\t", indent);
-	}
-	
-	public void testPrevIndentation2() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a");
-		
-		String indent= fScanner.getReferenceIndentation(28).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testPrevIndentation3() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a;");
-		
-		String indent= fScanner.getReferenceIndentation(29).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testPrevIndentation4() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a\n" +
-			"");
-		
-		String indent= fScanner.getReferenceIndentation(29).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testPrevIndentation5() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a;\n" +
-			"");
-		
-		String indent= fScanner.getReferenceIndentation(30).toString();
-		Assert.assertEquals("\t", indent);
-	}
-	
-	public void testPrevIndentation6() {
-		fDocument.set("\tvoid proc (int par1, int par2\n");
-		
-		String indent= fScanner.getReferenceIndentation(30).toString();
-		Assert.assertEquals("\t", indent);
-	}
-	
-	public void testPrevIndentation7() {
-		// for with semis 
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tfor (int i= 4; i < 33; i++) \n" +
-			"");
-		
-		String indent= fScanner.getReferenceIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testPrevIndentation8() {
-		fDocument.set("\t/* package */ void proc (int par1, int par2) {\n");
-		
-		String indent= fScanner.getReferenceIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t", indent);
-	}
-	
-	public void testPrevIndentation9() {
-		// block
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tfor (int i= 4; i < 33; i++) {\n" +
-			"\t\t}\n" +
-			"\t\t\n" +
-			"\t\tint i;\n");
-		
-		String indent= fScanner.getReferenceIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testPrevIndentation10() {
-		// else
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tif (condition()) {\n" +
-			"\t\t\tcode();\n" +
-			"\t\t} else {\n" +
-			"\t\t\totherCode();\n" +
-			"\t\t}\n" +
-			"");
-		
-		String indent= fScanner.getReferenceIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testPrevIndentation11() {
-		// else
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tif (condition()) {\n" +
-			"\t\t\tcode();\n" +
-			"\t\t} else {\n" +
-			"\t\t\totherCode();\n" +
-			"\t\t" +
-			"");
-		
-		String indent= fScanner.getReferenceIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t\t", indent);
-	}
-
-	public void testIndentation1() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(18).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testIndentation2() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a");
-		
-		String indent= fScanner.computeIndentation(28).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testIndentation3() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a;");
-		
-		String indent= fScanner.computeIndentation(29).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testIndentation4() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(29).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testIndentation5() {
-		fDocument.set("\tint a;\n" +
-			"\tif (true)\n" +
-			"\t\treturn a;\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(30).toString();
-		Assert.assertEquals("\t", indent);
-	}
-	
-	public void testIndentation6() {
-		// parameter declaration - alignment with parenthesis 
-		fDocument.set("\tvoid proc (int par1, int par2\n");
-		
-		String indent= fScanner.computeIndentation(30).toString();
-		Assert.assertEquals("\t\t\t   ", indent);
-	}
-	
-	public void testIndentation6a() {
-		// parameter declaration - alignment with parenthesis 
-		fDocument.set("\tvoid proc (  int par1, int par2\n");
-		
-		String indent= fScanner.computeIndentation(30).toString();
-		Assert.assertEquals("\t\t\t\t ", indent);
-	}
-	
-	public void testIndentation7() {
-		// for with semis 
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tfor (int i= 4; i < 33; i++) \n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t\t", indent);
-	}
-	
-	public void testIndentation8() {
-		// method definition
-		fDocument.set("\t/* package */ void proc (int par1, int par2) {\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-	
-	public void testIndentation9() {
-		// block
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tfor (int i= 4; i < 33; i++) {\n" +
-			"\t\t}\n" +
-			"\t\t\n" +
-			"\t\tint i;\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation10() {
-		// else
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tif (condition()) {\n" +
-			"\t\t\tcode();\n" +
-			"\t\t} else {\n" +
-			"\t\t\totherCode();\n" +
-			"\t\t}\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation11() {
-		// else
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tif (condition()) {\n" +
-			"\t\t\tcode();\n" +
-			"\t\t} else {\n" +
-			"\t\t\totherCode();\n" +
-			"\t\t" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t\t", indent);
-	}
-
-	public void testIndentation12() {
-		// multi-line condition
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tif (condition1()\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t\t", indent);
-	}
-
-	public void testIndentation13() {
-		// multi-line call
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tthis.doStuff(param1, param2,\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t\t", indent);
-	}
-
-	public void testIndentation14() {
-		// multi-line array initializer
-		fDocument.set("\tvoid proc (int par1, int par2) {\n" +
-			"\t\t\n" +
-			"\t\tString[] arr= new String[] { a1, a2,\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("									 ", indent);
-	}
-
-	public void testIndentation15() {
-		// for
-		fDocument.set("\tfor (int i= 0; i < 10; i++) {\n" +
-			"\t\tbar(); bar(); // foo\n" +
-			"\t}\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t", indent);
-	}
-
-	public void testIndentation16() {
-		// if
-		fDocument.set("\tif (true)\n" +
-			"\t\t;");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength() - 1).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation17() {
-		// if
-		fDocument.set("\tif (true)\n" +
-			";");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength() - 1).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation18() {
-		// if
-		fDocument.set("\tif (true)\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation19() {
-		// if w/ brace right after }
-		fDocument.set("\tif (true) {\n" +
-			"\t\t}");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t", indent);
-	}
-
-	public void testIndentation20() {
-		// if w/ brace right before }
-		fDocument.set("\tif (true) {\n" +
-			"\t\t}");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength() - 1).toString();
-		Assert.assertEquals("\t", indent);
-	}
-
-	public void testIndentation21() {
-		// double if w/ brace
-		fDocument.set("\tif (true)\n" +
-			"\t\tif (true) {\n" +
-			"");	
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t\t", indent);
-	}
-
-	public void testIndentation22() {
-		// after double if w/ brace 
-		fDocument.set("\tif (true)\n" +
-			"\t\tif (true) {\n" +
-			"\t\t\tstuff();" +
-			"\t\t}\n" +
-			"");	
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent); // because of possible dangling else
-	}
-
-	public void testIndentation22a() {
-		// after double if w/ brace 
-		fDocument.set("\tif (true)\n" +
-			"\t\tif (true) {\n" +
-			"\t\t\tstuff();\n" +
-			"\t\t}\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength() - 2).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation22b() {
-		// after double if w/ brace 
-		fDocument.set("\tif (true)\n" +
-			"\t\tif (true) {\n" +
-			"\t\t\tstuff();" +
-			"\t\t}\n" +
-			"a");	
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength() - 1).toString();
-		Assert.assertEquals("\t", indent); // no dangling else possible
-	}
-
-	public void testIndentation23() {
-		// do
-		fDocument.set("\tdo\n" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation24() {
-		// braceless else 
-		fDocument.set("\tif (true) {\n" +
-			"\t\tstuff();\n" +
-			"\t} else\n" +
-			"\t\tnoStuff");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation25() {
-		// braceless else 
-		fDocument.set("\tif (true) {\r\n" +
-			"\t\tstuff();\r\n" +
-			"\t} else\r\n" +
-			"\t\tnoStuff;\r\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t", indent);
-	}
-
-	public void testIndentation26() {
-		// do while
-		fDocument.set("\tdo\n" +
-			"\t\t\n" +
-			"\twhile (true);" +
-			"");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t", indent);
-	}
-
-	public void testIndentation27() {
-		// do while
-		fDocument.set("\tdo\n" +
-			"\t\t;\n" +
-			"\twhile (true);" +
-			"");
-		
-		int i= fScanner.findReferencePosition(8);
-		Assert.assertEquals(1, i);
-		String indent= fScanner.computeIndentation(8).toString();
-		Assert.assertEquals("\t", indent);
-	}
-
-	public void testIndentation28() {
-		// TODO do while - how to we distinguish from while {} loop?
-		fDocument.set("\tdo\n" +
-			"\t\t;\n" +
-			"\twhile (true);" +
-			"");
-		
-		int i= fScanner.findReferencePosition(fDocument.getLength());
-		Assert.assertEquals(1, i);
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t", indent);
-	}
-
-	public void testIndentation29() {
-		fDocument.set("\t\twhile (condition)\n" +
-				"\t\t\twhile (condition)\n" + 
-				"\t\t\t\tfoo();\n");
-		
-		int i= fScanner.findReferencePosition(fDocument.getLength());
-		Assert.assertEquals(2, i);
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation30() {
-		// braceless else 
-		fDocument.set("\tif (true)\n" +
-			"\t{");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength() - 1).toString();
-		Assert.assertEquals("\t", indent);
-	}
-
-	public void testIndentation31() {
-		// braceless else 
-		fDocument.set("\tif (true)\n" +
-			"{\t\n" +
-			"\t\tstuff();\n" +
-			"\t} else\n" +
-			"\t\tnoStuff");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t", indent);
-	}
-
-	public void testIndentation32() {
-		// braceless else 
-		fDocument.set("\tswitch(ch) {\n" +
-			"\t\tcase one:\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("			", indent);
-	}
-
-	public void testAnonymousIndentation1() {
-		fDocument.set(	"		MenuItem mi= new MenuItem(\"About...\");\n" + 
-						"		mi.addActionListener(\n" + 
-						"			new ActionListener() {\n" 
-						);
-				
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("				", indent);
-	}
-	
-	public void testAnonymousIndentation2() {
-		fDocument.set(	"		MenuItem mi= new MenuItem(\"About...\");\n" + 
-						"		mi.addActionListener(\n" + 
-						"			new ActionListener() {\n" + 
-						"				public void actionPerformed(ActionEvent event) {\n" + 
-						"					about();\n" + 
-						"				}\n" + 
-						"			}\n" +
-						");"
-						);
-				
-		// this is bogus, since this is really just an unfinished call argument list - how could we know 
-		String indent= fScanner.computeIndentation(fDocument.getLength() - 2).toString();
-		Assert.assertEquals("		", indent);
-	}
-	
-	public void testExceptionIndentation1() {
-		fDocument.set("public void processChildren(CompositeExpression result, IConfigurationElement element) throws CoreException {\n" + 
-				"			IConfigurationElement[] children= element.getChildren();\n" + 
-				"			if (children != null) {\n" + 
-				"				for (int i= 0; i < children.length; i++) {\n" + 
-				"					Expression child= parse(children[i]);\n" + 
-				"					if (child == null)\n" + 
-				"						new Bla(new CoreExeption(new Status(IStatus.ERROR, JavaPlugin.getPluginId()");
-	
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("							", indent);
-	}
-	
-	public void testExceptionIndentation2() {
-		fDocument.set("public void processChildren(CompositeExpression result, IConfigurationElement element) throws CoreException {\n" + 
-				"			IConfigurationElement[] children= element.getChildren();\n" + 
-				"			if (children != null) {\n" + 
-				"				for (int i= 0; i < children.length; i++) {\n" + 
-				"					Expression child= parse(children[i]);\n" + 
-				"					if (child == null)\n" + 
-				"						new Bla(new CoreExeption(new Status(IStatus.ERROR, JavaPlugin.getPluginId(),");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("							", indent);
-	}
-	
-	public void testExceptionIndentation3() {
-		fDocument.set("public void processChildren(CompositeExpression result, IConfigurationElement element) throws CoreException {\n" + 
-				"			IConfigurationElement[] children= element.getChildren();\n" + 
-				"			if (children != null) {\n" + 
-				"				for (int i= 0; i < children.length; i++) {\n" + 
-				"					Expression child= parse(children[i]);\n" + 
-				"					if (child == null)\n" + 
-				"						new char[] { new CoreExeption(new Status(IStatus.ERROR, JavaPlugin.getPluginId(),");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("							", indent);
-	}
-	
-	public void testListAlignmentMethodDeclaration() {
-		// parameter declaration - alignment with parenthesis 
-		fDocument.set(	"\tvoid proc (  int par1, int par2,\n" +
-				"	   int par3, int par4,\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("	   ", indent);
-	}
-	
-	public void testListAlignmentMethodCall() {
-		// parameter declaration - alignment with parenthesis 
-		fDocument.set(	"\this.proc (par1, par2,\n" +
-				"	   par3, par4,\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("	   ", indent);
-	}
-	
-	public void testListAlignmentArray() {
-		// parameter declaration - alignment with parenthesis 
-		fDocument.set(	"\tint[]= new int[] { 1, two,\n" +
-				"	   three, four,\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("	   ", indent);
-	}
-	
-	public void testListAlignmentArray2() {
-		// no prior art - probe system settings. 
-		fDocument.set(	"\tint[]= new int[] { 1, two,\n");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength()).toString();
-		Assert.assertEquals("\t\t\t\t\t   ", indent);
-		
-	}
-	
-	public void testBraceAlignmentOfMultilineDeclaration() {
-		fDocument.set(	"	protected int foobar(int one, int two,\n" + 
-						"						 int three, int four,\n" + 
-						"						 int five) {\n" + 
-						"		\n" + 
-						"		return 0;\n" + 
-						"	}");
-		
-		String indent= fScanner.computeIndentation(fDocument.getLength() - 1).toString();
-		Assert.assertEquals("	", indent);
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaLineSegmentationTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaLineSegmentationTest.java
deleted file mode 100644
index 9f636f8..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaLineSegmentationTest.java
+++ /dev/null

@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.preference.PreferenceStore;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.tests.TestTextViewer;
-
-import org.eclipse.jdt.ui.text.JavaTextTools;
-
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
-
-
-
-public class JavaLineSegmentationTest extends TestCase {
-	
-	protected TestTextViewer fTextViewer;
-	protected IDocument fDocument;
-	protected JavaTextTools fTextTools;
-	
-	public JavaLineSegmentationTest(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new TestSuite(JavaLineSegmentationTest.class); 
-	}
-	
-	protected void setUp() {
-		fTextViewer= new TestTextViewer();
-		fTextTools= new JavaTextTools(new PreferenceStore());
-		
-		fDocument= new Document();
-		IDocumentPartitioner partitioner= fTextTools.createDocumentPartitioner();
-		partitioner.connect(fDocument);
-		if (fDocument instanceof IDocumentExtension3) {
-			IDocumentExtension3 extension3= (IDocumentExtension3) fDocument;
-			extension3.setDocumentPartitioner(IJavaPartitions.JAVA_PARTITIONING, partitioner);
-		} else {
-			fDocument.setDocumentPartitioner(partitioner);
-		}
-	}
-	
-	protected void tearDown () {
-		fTextTools.dispose();
-		fTextTools= null;
-		
-		IDocumentPartitioner partitioner;
-		if (fDocument instanceof IDocumentExtension3) {
-			IDocumentExtension3 extension3= (IDocumentExtension3) fDocument;
-			partitioner= extension3.getDocumentPartitioner(IJavaPartitions.JAVA_PARTITIONING);
-		} else {
-			partitioner= fDocument.getDocumentPartitioner();
-		}
-		partitioner.disconnect();
-		fDocument= null;
-	}
-		
-	void checkSegmentation(int[] result, int[] expectation) {
-		if (expectation == null) {
-			assertTrue("invalid segments", result == null);
-		} else {
-			assertTrue(result != null);
-			assertTrue("invalid number of segments", expectation.length == result.length);
-			for (int i= 0; i < expectation.length; i++)
-				assertTrue(result[i] + " != " + expectation[i], expectation[i] == result[i]);
-		}
-	}
-	
-	
-	public void test11() {
-		fDocument.set("abcde");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, null);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test12() {
-		fDocument.set("abcde\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, null);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test13() {
-		fDocument.set("\nabcde");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, null);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test14() {
-		fDocument.set("\nabcde\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, null);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	
-	public void test21() {
-		fDocument.set("\"ab\"cde");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0, 4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test22() {
-		fDocument.set("\"ab\"cde\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0, 4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test23() {
-		fDocument.set("\n\"ab\"cde");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0, 4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test24() {
-		fDocument.set("\n\"ab\"cde\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0, 4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	
-	public void test31() {
-		fDocument.set("\"ab\"c\"de\"");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0, 4, 5 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test32() {
-		fDocument.set("\"ab\"c\"de\"\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0, 4, 5 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test33() {
-		fDocument.set("\n\"ab\"c\"de\"");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0, 4, 5 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test34() {
-		fDocument.set("\n\"ab\"c\"de\"\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0, 4, 5 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	
-	public void test41() {
-		fDocument.set("\"ab\"\"cd\"e");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0, 4, 8 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test42() {
-		fDocument.set("\"ab\"\"cd\"e\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0, 4, 8 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test43() {
-		fDocument.set("\n\"ab\"\"cd\"e");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0, 4, 8 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test44() {
-		fDocument.set("\n\"ab\"\"cd\"e\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0, 4, 8 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-
-	public void test51() {
-		fDocument.set("\"ab\"\"cde\"");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0, 4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test52() {
-		fDocument.set("\"ab\"\"cde\"\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0, 4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test53() {
-		fDocument.set("\n\"ab\"\"cde\"");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0, 4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test54() {
-		fDocument.set("\n\"ab\"\"cde\"\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0, 4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-
-
-	public void test61() {
-		fDocument.set("\"abcde\"");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test62() {
-		fDocument.set("\"abcde\"\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test63() {
-		fDocument.set("\n\"abcde\"");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test64() {
-		fDocument.set("\n\"abcde\"\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] { 0 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test71() {
-		fDocument.set("ab\"\"cde");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] { 0,  2,  4});
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test72() {
-		fDocument.set("ab\"\"cde\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 0);
-			checkSegmentation(result, new int[] {  0,  2,  4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test73() {
-		fDocument.set("\nab\"\"cde");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] {  0,  2,  4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void test74() {
-		fDocument.set("\nab\"\"cde\n");
-		fTextViewer.setDocument(fDocument);
-		try {
-			int[] result= JavaEditor.getBidiLineSegments(fTextViewer, 1);
-			checkSegmentation(result, new int[] {  0,  2,  4 });
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaParameterListValidatorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaParameterListValidatorTest.java
deleted file mode 100644
index 8cd2791..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaParameterListValidatorTest.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.contentassist.ContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.tests.TestTextViewer;
-
-import org.eclipse.jdt.internal.ui.text.java.JavaParameterListValidator;
-
-
-public class JavaParameterListValidatorTest extends TestCase {
-	
-	protected TestTextViewer fTextViewer;
-	protected IDocument fDocument;
-	protected JavaParameterListValidator fValidator;
-	
-	public JavaParameterListValidatorTest(String name) {
-		super(name);
-	}
-	
-	protected void setUp() {
-		fTextViewer= new TestTextViewer();
-		fDocument= new Document();
-		fValidator= new JavaParameterListValidator();
-	}
-	
-	public static Test suite() {
-		return new TestSuite(JavaParameterListValidatorTest.class); 
-	}
-	
-	protected void tearDown () {
-		fTextViewer= null;
-		fDocument= null;
-		fValidator= null;
-	}
-	
-	protected void checkPresentation(TextPresentation shouldBe, TextPresentation is) {
-		// check lengths
-		assertTrue(shouldBe.getDenumerableRanges() == is.getDenumerableRanges());
-		// check default range
-		assertEquals(shouldBe.getDefaultStyleRange(), is.getDefaultStyleRange());
-		// check rest
-		Iterator e1= shouldBe.getAllStyleRangeIterator();
-		Iterator e2= is.getAllStyleRangeIterator();
-		while (e1.hasNext())
-			assertEquals(e1.next(), e2.next());
-	}
-	
-	protected String print(TextPresentation presentation) {
-		StringBuffer buf= new StringBuffer();
-		if (presentation != null) {
-			// default range
-			buf.append("Default style range: ");
-			StyleRange range= presentation.getDefaultStyleRange();
-			if (range != null)
-				buf.append(range.toString());
-			buf.append('\n');
-			// rest
-			Iterator e= presentation.getAllStyleRangeIterator();
-			while (e.hasNext()) {
-				buf.append(e.next().toString());
-				buf.append('\n');
-			}
-		}
-		return buf.toString();	
-	}
-	
-	protected TextPresentation createSample(int position) {
-		TextPresentation p= new TextPresentation();
-		
-		int entry= Math.round((float) Math.ceil(position/3));
-		
-		if (entry > 4) {
-			p.addStyleRange(new StyleRange(0, 34, null, null, SWT.NORMAL));
-			return p;
-		}
-		
-		if (entry > 0)
-			p.addStyleRange(new StyleRange(0, entry * 7, null, null, SWT.NORMAL));
-		
-		p.addStyleRange(new StyleRange(entry * 7, 6, null, null, SWT.BOLD));
-		
-		if (entry < 4) {
-			int start= entry * 7 + 6;
-			p.addStyleRange(new StyleRange(start, 34 - start, null, null, SWT.NORMAL));
-		}
-		
-		return p;
-	}
-	
-	public void testParameterStyling() {
-		fDocument.set(" a, b, c, d, e");
-		fTextViewer.setDocument(fDocument);
-		
-		IContextInformation info= new ContextInformation("context", " int a, int b, int c, int d, int e");
-		fValidator.install(info, fTextViewer, 0);
-		
-		TextPresentation p= new TextPresentation();
-		for (int i= 0; i < fDocument.getLength(); i++) {
-			fValidator.updatePresentation(i, p);
-			checkPresentation(createSample(i), p);
-		}
-	}
-	
-	public void testValidPositionsForward() {
-		fDocument.set("(a, b, c) ");
-		fTextViewer.setDocument(fDocument);
-		
-		IContextInformation info= new ContextInformation("context", "info");
-		fValidator.install(info, fTextViewer, 1);
-		
-		assertTrue(!fValidator.isContextInformationValid(0));		
-		for (int i= 1; i < 9; i++)
-			assertTrue(fValidator.isContextInformationValid(i));
-		assertTrue(!fValidator.isContextInformationValid(9));
-	}
-	
-	public void testValidPositionsBackward() {
-		fDocument.set("(a, b, c) ");
-		fTextViewer.setDocument(fDocument);
-		
-		IContextInformation info= new ContextInformation("context", "info");
-		fValidator.install(info, fTextViewer, 1);
-		
-		assertTrue(!fValidator.isContextInformationValid(9));
-		for (int i= 8; i > 0; i--)
-			assertTrue(fValidator.isContextInformationValid(i));
-		assertTrue(!fValidator.isContextInformationValid(0));		
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerExtensionTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerExtensionTest.java
deleted file mode 100644
index c7c251d..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerExtensionTest.java
+++ /dev/null

@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.preference.PreferenceStore;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IDocumentPartitioningListener;
-import org.eclipse.jface.text.IDocumentPartitioningListenerExtension;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITypedRegion;
-
-import org.eclipse.jdt.ui.text.JavaTextTools;
-
-
-
-
-
-public class JavaPartitionerExtensionTest extends TestCase {
-	
-	
-	class PartitioningListener implements IDocumentPartitioningListener, IDocumentPartitioningListenerExtension {
-		/*
-		 * @see IDocumentPartitioningListener#documentPartitioningChanged(IDocument)
-		 */
-		public void documentPartitioningChanged(IDocument document) {
-			fDocumentPartitioningChanged= true;
-		}
-
-		/*
-		 * @see IDocumentPartitioningListenerExtension#documentPartitioningChanged(IDocument, IRegion)
-		 */
-		public void documentPartitioningChanged(IDocument document, IRegion region) {
-			fDocumentPartitioningChanged= true;
-			fChangedDocumentPartitioning= region;
-		}
-	}
-	
-	private JavaTextTools fTextTools;
-	private Document fDocument;
-	protected boolean fDocumentPartitioningChanged;
-	protected IRegion fChangedDocumentPartitioning;
-	
-	
-	public JavaPartitionerExtensionTest(String name) {
-		super(name);
-	}
-	
-	protected void setUp() {
-
-		fTextTools= new JavaTextTools(new PreferenceStore());
-		
-		fDocument= new Document();
-		IDocumentPartitioner partitioner= fTextTools.createDocumentPartitioner();
-		partitioner.connect(fDocument);
-		fDocument.setDocumentPartitioner(partitioner);
-		
-		fDocumentPartitioningChanged= false;
-		fChangedDocumentPartitioning= null;
-		fDocument.addDocumentPartitioningListener(new PartitioningListener());
-	}
-	
-	public static Test suite() {
-		return new TestSuite(JavaPartitionerExtensionTest.class); 
-	}
-	
-	protected void tearDown () {
-		fTextTools.dispose();
-		fTextTools= null;
-		
-		IDocumentPartitioner partitioner= fDocument.getDocumentPartitioner();
-		partitioner.disconnect();
-		fDocument= null;
-	}
-
-
-	protected String print(ITypedRegion r) {
-		return r != null ? "[" + r.getOffset() + "," + r.getLength() + "," + r.getType() + "]" : "null";
-	}
-	
-	protected String print(IRegion r) {
-		return r != null ? "[" + r.getOffset() + "," + r.getLength() + "]" : "null";
-	}	
-	
-	protected void check(int offset, int length) {
-		assertTrue(fDocumentPartitioningChanged);
-		assertNotNull(fChangedDocumentPartitioning);
-		assertTrue(fChangedDocumentPartitioning.getOffset() == offset);
-		assertTrue(fChangedDocumentPartitioning.getLength() == length);
-		
-		fDocumentPartitioningChanged= false;
-		fChangedDocumentPartitioning= null;
-	}
-	
-	protected void check() {
-		assertTrue(!fDocumentPartitioningChanged);
-		assertTrue(fChangedDocumentPartitioning == null);
-	}
-	
-	public void testConvertPartition() {
-		
-		try {
-			fDocument.set("/*xxx*/");
-			check(0, 7);
-			fDocument.replace(0,0,"//");
-			check(0, 9);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}	
-	
-	public void testTransformPartition() {
-		
-		try {
-			fDocument.set("/*\nx\nx\nx\n*/");
-			check(0, 11);
-			fDocument.replace(0,0,"//");
-			check(0, 13);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testToggleMultiPartition() {
-		
-		try {
-			fDocument.set("/*\nCode version 1\n/*/\nCode version 2\n//*/");
-			check(0, 41);
-			fDocument.replace(0,0,"//");
-			check(0, 43);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testSplitPartition() {
-		try {
-			fDocument.set("class X {}");
-			check();
-			fDocument.replace(9, 0, "/**/");
-			check(9, 4);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testShortenDocument() {
-		try {
-			fDocument.set("class x {\n/***/\n}");
-			check(10, 5);
-			fDocument.replace(0, fDocument.getLength(), "/**/");
-			check(0, 4);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testDeletePartition() {
-		try {
-			fDocument.set("class x {\n/***/\n}");
-			check(10, 5);
-			fDocument.replace(10, 5,  null);
-			check(10, 0);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testDeletePartition2() {
-		try {
-			fDocument.set("class x {\n/***/\n}");
-			check(10, 5);
-			fDocument.replace(10, 7,  null);
-			check(10, 0);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}	
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerTest.java
deleted file mode 100644
index 99ca3de..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerTest.java
+++ /dev/null

@@ -1,801 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.preference.PreferenceStore;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IDocumentPartitioningListener;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TypedRegion;
-
-import org.eclipse.jdt.ui.text.JavaTextTools;
-
-import org.eclipse.jdt.internal.ui.text.JavaPartitionScanner;
-
-
-
-public class JavaPartitionerTest extends TestCase {
-	
-	private JavaTextTools fTextTools;
-	private Document fDocument;
-	protected boolean fDocumentPartitioningChanged;
-	
-	
-	public JavaPartitionerTest(String name) {
-		super(name);
-	}
-	
-	protected void setUp() {
-
-		fTextTools= new JavaTextTools(new PreferenceStore());
-		
-		fDocument= new Document();
-		IDocumentPartitioner partitioner= fTextTools.createDocumentPartitioner();
-		partitioner.connect(fDocument);
-		fDocument.setDocumentPartitioner(partitioner);
-		fDocument.set("xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx");
-		
-		fDocumentPartitioningChanged= false;
-		fDocument.addDocumentPartitioningListener(new IDocumentPartitioningListener() {
-			public void documentPartitioningChanged(IDocument document) {
-				fDocumentPartitioningChanged= true;
-			}
-		});	
-	}
-	
-	public static Test suite() {
-		return new TestSuite(JavaPartitionerTest.class); 
-	}
-	
-	protected void tearDown () {
-		fTextTools.dispose();
-		fTextTools= null;
-		
-		IDocumentPartitioner partitioner= fDocument.getDocumentPartitioner();
-		partitioner.disconnect();
-		fDocument= null;
-	}
-
-	protected String print(ITypedRegion r) {
-		return "[" + r.getOffset() + "," + r.getLength() + "," + r.getType() + "]";
-	}
-	
-	protected void checkPartitioning(ITypedRegion[] expectation, ITypedRegion[] result) {
-		
-		assertTrue("invalid number of partitions", expectation.length == result.length);
-		
-		for (int i= 0; i < expectation.length; i++) {
-			ITypedRegion e= expectation[i];
-			ITypedRegion r= result[i];
-			assertTrue(print(r) + " != " + print(e), r.equals(e));
-		}
-				
-	}
-	
-	public void testInitialPartitioning() {
-		try {
-			
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx"
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(33, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(38, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(43, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-		
-	public void testIntraPartitionChange() {
-		try {
-			
-			fDocument.replace(34, 3, "y");
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\ny\n/***/\nxxx");
-			
-			assertTrue(!fDocumentPartitioningChanged);
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(33, 3, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(36, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(41, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}	
-	}
-
-	public void testIntraPartitionChange2() {
-		try {
-			
-			fDocument.replace(41, 0, "yyy");
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/**yyy*/\nxxx");
-			
-			// assertTrue(!fDocumentPartitioningChanged);
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(33, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(38, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(46, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}	
-	}
-	public void testInsertNewPartition() {
-		try {
-			
-			fDocument.replace(35, 1, "/***/");
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nx/***/x\n/***/\nxxx");
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(33, 2, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(35, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(40, 2, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(42, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(47, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}	
-	}	
-
-	public void testRemovePartition1() {
-		try {
-			
-			fDocument.replace(13, 16, null);
-			//	"xxx\n/*xxx*/\nx/**/\nxxx\n/***/\nxxx");
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 2, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(13, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(17, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(22, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(27, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testRemovePartition2() {
-		
-		testJoinPartition3();
-		fDocumentPartitioningChanged= false;
-		
-		try {
-			
-			fDocument.replace(5, 2, null);
-			//	"xxx\nxxx\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  12, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(12,  8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(20, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(25, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(29, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(34, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(39, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-
-	
-	public void testJoinPartitions1() {
-		try {
-			
-			fDocument.replace(31, 1, null);
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/*/\nxxx\n/***/\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 13, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(42, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testJoinPartitions2() {
-		try {
-			
-			fDocument.replace(32, 1, null);
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**\nxxx\n/***/\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 13, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(42, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testJoinPartition3() {
-		try {
-			
-			fDocument.replace(9, 2, null);
-			//	"xxx\n/*xxx\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  18, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(22, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(27, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(31, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(36, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(41, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	
-	public void testSplitPartition1() {
-		
-		testJoinPartitions1();
-		fDocumentPartitioningChanged= false;
-		
-		
-		try {
-			
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/*/\nxxx\n/***/\nxxx"
-			fDocument.replace(31, 0, "*");
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-		
-		testInitialPartitioning();
-	}
-	
-	public void testSplitPartition2() {
-		
-		testJoinPartitions2();
-		fDocumentPartitioningChanged= false;
-		
-		try {
-			
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**\nxxx\n/***/\nxxx"
-			fDocument.replace(32, 0, "/");
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-			
-		testInitialPartitioning();
-	}
-	
-	public void testSplitPartition3() {
-		
-		fDocumentPartitioningChanged= false;
-		
-		try {
-			
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx"
-			fDocument.replace(12, 9, "");
-			//	"xxx\n/*xxx*/\nx*/\nxxx\n/**/\nxxx\n/***/\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 9, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(20, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(34, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testCorruptPartitioning1() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "/***/\n/***/");
-						
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(5, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(6, 5, JavaPartitionScanner.JAVA_DOC)
-			};
-						
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(6, 0, "*/\n/***/\n/*");
-			// "/***/\n*/\n/***/\n/*/***/"
-
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(5, 4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(9, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(14, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(15, 7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};		
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}	
-	}
-	
-	public void testCorruptPartitioning2() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "/***/\n/***/\n/***/");
-						
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(5, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(6, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(11, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(12, 5, JavaPartitionScanner.JAVA_DOC)
-			};
-						
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(6, 0, "*/\n/***/\n/*");
-			// "/***/\n*/\n/***/\n/*/***/\n/***/"
-
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(5, 4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(9, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(14, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(15, 7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(22, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(23, 5, JavaPartitionScanner.JAVA_DOC)
-			};		
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}	
-	}
-	
-	public void testCorruptPartitioning3() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "/***/\n/**/");
-						
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(5, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(6, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};
-						
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(0, 9, "/***/\n/***/\n/***/\n/**");
-			// "/***/\n/***/\n/***/\n/***/"
-
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(5, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(6, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(11, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(12, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(17, 1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(18, 5, JavaPartitionScanner.JAVA_DOC)
-			};		
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}	
-	}
-
-	public void testOpenPartition1() {
-		try {
-			
-			fDocument.replace(42, 1, null);
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(33, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(38, 8, JavaPartitionScanner.JAVA_DOC)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testOpenPartition2() {
-		try {
-			
-			fDocument.replace(47, 0, "/*");
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx/*"
-			
-			assertTrue(fDocumentPartitioningChanged);
-
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(33, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(38, 5, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(43, 4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(47, 2, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	
-	public void testChangeContentTypeOfPartition() {
-		try {
-			
-			fDocument.replace(39, 1, null);
-			//	"xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/**/\nxxx"
-			
-			assertTrue(fDocumentPartitioningChanged);
-			
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(4,  7, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(16, 8, JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(24, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(29, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(33, 5, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(38, 4, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(42, 4, IDocument.DEFAULT_CONTENT_TYPE)
-			};
-			
-			checkPartitioning(expectation, result);
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}	
-	}
-	
-	public void testPartitionFinder() {
-		try {
-			
-			ITypedRegion[] partitioning= fDocument.computePartitioning(0, fDocument.getLength());
-			
-			for (int i= 0; i < partitioning.length; i++) {
-				ITypedRegion expected= partitioning[i];
-				for (int j= 0; j < expected.getLength(); j++) {
-					ITypedRegion result= fDocument.getPartition(expected.getOffset() + j);
-					assertTrue(expected.equals(result));
-				}
-			}
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testExtendPartition() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "/*");
-						
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  2, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};
-						
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(2, 0, " ");
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  3, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};
-			
-			checkPartitioning(expectation, result);
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testTransformPartition() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "/*");
-						
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  2, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};
-						
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(2, 0, "*");
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  3, JavaPartitionScanner.JAVA_DOC)
-			};
-			
-			checkPartitioning(expectation, result);
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testTogglePartition() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "\t/*\n\tx\n\t/*/\n\ty\n//\t*/");
-
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation1= {
-				new TypedRegion(0,  1, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(1,  10, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(11, 4, IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(15, 5, JavaPartitionScanner.JAVA_SINGLE_LINE_COMMENT)
-			};			
-			checkPartitioning(expectation1, result);
-			
-			fDocumentPartitioningChanged= false;
-			fDocument.replace(0, 0, "//"); // "//\t/*\n\tx\n\t/*/\n\ty\n//\t*/"
-			assertTrue(fDocumentPartitioningChanged);
-			
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation2= {
-				new TypedRegion(0,  6, JavaPartitionScanner.JAVA_SINGLE_LINE_COMMENT),
-				new TypedRegion(6,  4,  IDocument.DEFAULT_CONTENT_TYPE),
-				new TypedRegion(10,  12, JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};			
-			checkPartitioning(expectation2, result);
-					
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testEditing1() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "");
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  0,  IDocument.DEFAULT_CONTENT_TYPE)
-			};			
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(fDocument.getLength(), 0, "/");
-			fDocument.replace(fDocument.getLength(), 0, "*");
-			fDocument.replace(fDocument.getLength(), 0, "*");
-			fDocument.replace(fDocument.getLength(), 0, "/");
-			
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  fDocument.getLength(),  JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};			
-			checkPartitioning(expectation, result);			
-			
-			
-			fDocument.replace(fDocument.getLength(), 0, "\r\n");
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  4,  JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT),
-				new TypedRegion(4, 2, IDocument.DEFAULT_CONTENT_TYPE)
-			};			
-			checkPartitioning(expectation, result);			
-			
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testEditing2() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "");
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  0,  IDocument.DEFAULT_CONTENT_TYPE)
-			};			
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(fDocument.getLength(), 0, "/");
-			fDocument.replace(fDocument.getLength(), 0, "*");
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  fDocument.getLength(),  JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};			
-			checkPartitioning(expectation, result);			
-			
-			fDocument.replace(fDocument.getLength(), 0, "\r\n");
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  fDocument.getLength(),  JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};			
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(fDocument.getLength(), 0, "*");
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  fDocument.getLength(),  JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};			
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(fDocument.getLength(), 0, "*");
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  fDocument.getLength(),  JavaPartitionScanner.JAVA_MULTI_LINE_COMMENT)
-			};			
-			checkPartitioning(expectation, result);			
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-	
-	public void testEditing3() {
-		try {
-			
-			fDocument.replace(0, fDocument.getLength(), "");
-			
-			ITypedRegion[] result= fDocument.computePartitioning(0, fDocument.getLength());
-			TypedRegion[] expectation= {
-				new TypedRegion(0,  0,  IDocument.DEFAULT_CONTENT_TYPE)
-			};			
-			checkPartitioning(expectation, result);
-			
-			fDocument.replace(fDocument.getLength(), 0, "/");
-			fDocument.replace(fDocument.getLength(), 0, "*");
-			fDocument.replace(fDocument.getLength(), 0, "*");
-			fDocument.replace(fDocument.getLength(), 0, "\r\n *");
-			fDocument.replace(fDocument.getLength(), 0, "/");
-
-
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  fDocument.getLength(),  JavaPartitionScanner.JAVA_DOC)
-			};			
-			checkPartitioning(expectation, result);			
-			
-			fDocument.replace(fDocument.getLength(), 0, "*");
-			result= fDocument.computePartitioning(0, fDocument.getLength());
-			expectation= new TypedRegion[] {
-				new TypedRegion(0,  8,  JavaPartitionScanner.JAVA_DOC),
-				new TypedRegion(8, 1, IDocument.DEFAULT_CONTENT_TYPE)
-			};			
-			checkPartitioning(expectation, result);		
-			
-		} catch (BadLocationException x) {
-			assertTrue(false);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaWordIteratorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaWordIteratorTest.java
deleted file mode 100644
index 7242e99..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaWordIteratorTest.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import org.eclipse.jdt.internal.ui.text.JavaWordIterator;
-
-/**
- * @since 3.0
- */
-public class JavaWordIteratorTest extends BreakIteratorTest {
-
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		fBreakIterator= new JavaWordIterator();
-	}
-	
-	public void testNext1() {
-		assertNextPositions("word word", new int[] { 5, 9 });
-	}
-	
-	public void testNext2() {
-		assertNextPositions("wordWord word", new int[] { 4, 9, 13 });
-	}
-	
-	public void testNextSpace() {
-		assertNextPositions(" word ", new int[] { 1, 6 });
-	}
-	
-	public void testNextParen() {
-		assertNextPositions("word(params)", new int[] { 4, 5, 11, 12 });
-	}
-	
-	public void testNextLn() {
-		String s= new String("word \n" +
-				"  word2");
-		assertNextPositions(s, new int[] { 5, 6, 8, 13 });
-	}
-	
-	public void testMultiNextLn() {
-		String s= new String("word \n" +
-				"\n" +
-				"\n" +
-				"  word2");
-		assertNextPositions(s, new int[] { 5, 6, 7, 8, 10, 15 });
-	}
-	
-	public void testMultiNextLn2() {
-		String s= new String("word \r\n" +
-				"\r\n" +
-				"\r\n" +
-				"  word2");
-		assertNextPositions(s, new int[] { 5, 7, 9, 11, 13, 18 });
-	}
-
-	public void testNextCamelCaseWord() {
-		String s= new String("   _isURLConnection_   ");
-		assertNextPositions(s, new int[] { 3, 6, 9, 23 });
-	}
-	
-	public void testPrevious1() {
-		String s= new String("word word");
-		assertPreviousPositions(s, new int[] { 0, 5 });
-	}
-	
-	public void testPrevious2() {
-		String s= new String("wordWord word");
-		assertPreviousPositions(s, new int[] { 0, 4, 9 });
-	}
-	
-	public void testPreviousSpace() {
-		String s= new String(" word ");
-		assertPreviousPositions(s, new int[] { 1 });
-	}
-	
-	public void testPreviousParen() {
-		String s= new String("word(params)");
-		assertPreviousPositions(s, new int[] { 0, 4, 5, 11 });
-	}
-	
-	public void testPreviousLn() {
-		String s= new String("word \n" +
-				"  word2");
-		assertPreviousPositions(s, new int[] { 0, 5, 6, 8 });
-	}
-	
-	public void testMultiPreviousLn() {
-		String s= new String("word \n" +
-				"\n" +
-				"\n" +
-				"  word2");
-		assertPreviousPositions(s, new int[] { 0, 5, 6, 7, 8, 10 });
-	}
-	
-	public void testMultiPreviousLn2() {
-		String s= new String("word \r\n" +
-				"\r\n" +
-				"\r\n" +
-				"  word2");
-		assertPreviousPositions(s, new int[] { 0, 5, 7, 9, 11, 13 });
-	}
-
-	public void testPreviousCamelCaseWord() {
-		String s= new String("   _isURLConnection_   ");
-		assertPreviousPositions(s, new int[] { 0, 3, 6, 9 });
-	}
-
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestPlugin.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestPlugin.java
deleted file mode 100644
index ceb8153..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestPlugin.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JdtTextTestPlugin extends AbstractUIPlugin {
-	/**
-	 * The plug-in id
-	 * @since 3.1
-	 */
-	public static final String PLUGIN_ID= "org.eclipse.jdt.text.tests";
-	//The shared instance.
-	private static JdtTextTestPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public JdtTextTestPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		plugin = this;
-		try {
-			resourceBundle= ResourceBundle.getBundle("org.eclipse.jdt.text.tests.JdtTextTestPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JdtTextTestPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle= JdtTextTestPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle!=null ? bundle.getString(key) : key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java
deleted file mode 100644
index 745c8da..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests;
-
-import org.eclipse.jdt.text.tests.comments.CommentsTestSuite;
-import org.eclipse.jdt.text.tests.spelling.SpellingTestSuite;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * JDT Text Test Suite.
- * 
- * @since 3.0
- */
-public class JdtTextTestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("JDT Text Test Suite"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTestSuite(CompilationUnitDocumentProviderTest.class);
-		suite.addTest(JavaHeuristicScannerTest.suite());
-		suite.addTest(JavaParameterListValidatorTest.suite());
-		suite.addTest(JavaDoc2HTMLTextReaderTester.suite());
-		suite.addTest(PairMatcherTest.suite());
-		suite.addTest(HTML2TextReaderTester.suite());
-		suite.addTest(JavaPartitionerExtensionTest.suite());
-		suite.addTest(JavaColoringTest.suite());
-		suite.addTest(SmartSemicolonAutoEditStrategyTest.suite());
-		suite.addTest(JavaLineSegmentationTest.suite());
-		suite.addTest(JavaPartitionerTest.suite());
-		suite.addTest(PartitionTokenScannerTest.suite());
-		suite.addTest(StringsTest.suite());
-		suite.addTest(MarkOccurrenceTest.suite());
-		//$JUnit-END$
-		
-		suite.addTest(SpellingTestSuite.suite());
-		suite.addTest(CommentsTestSuite.suite());
-		suite.addTest(SemanticHighlightingTest.suite());
-		
-		return suite;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest.java
deleted file mode 100644
index 6ec7944..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest.java
+++ /dev/null

@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests;
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.RGB;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.FindReplaceDocumentAdapter;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-
-import org.eclipse.ui.editors.text.EditorsUI;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.internal.editors.text.EditorsPlugin;
-import org.eclipse.ui.texteditor.AnnotationPreference;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.text.tests.performance.EditorTestHelper;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.internal.ui.viewsupport.ISelectionListenerWithAST;
-import org.eclipse.jdt.internal.ui.viewsupport.SelectionListenerWithASTManager;
-
-
-/**
- * Tests the Java Editor's occurrence marking feature.
- * 
- * @since 3.1
- */
-public class MarkOccurrenceTest extends TestCase {
-	
-	private static final String OCCURRENCE_ANNOTATION= "org.eclipse.jdt.ui.occurrences";
-	private static final RGB fgHighlightRGB= getHighlightRGB();
-	
-	private JavaEditor fEditor;
-	private IDocument fDocument;
-	private FindReplaceDocumentAdapter fFindReplaceDocumentAdapter;
-	private int fOccurrences;
-	private IAnnotationModel fAnnotationModel;
-	private ISelectionListenerWithAST fSelWASTListener;
-	private IRegion fMatch;
-	private StyledText fTextWidget;
-
-	
-
-	public static Test setUpTest(Test someTest) {
-		return new JUnitProjectTestSetup(someTest);
-	}
-	
-	public static Test suite() {
-		return setUpTest(new TestSuite(MarkOccurrenceTest.class));
-	}
-	
-	
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 * @since 3.1
-	 */
-	protected void setUp() throws Exception {
-		assertNotNull(fgHighlightRGB);
-		JavaPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.EDITOR_MARK_OCCURRENCES, true);
-		fEditor= openJavaEditor(new Path("/" + JUnitProjectTestSetup.getProject().getElementName() + "/src/junit/framework/TestCase.java"));
-		assertNotNull(fEditor);
-		fTextWidget= fEditor.getViewer().getTextWidget();
-		assertNotNull(fTextWidget);
-		fDocument= fEditor.getDocumentProvider().getDocument(fEditor.getEditorInput());
-		assertNotNull(fDocument);
-		fFindReplaceDocumentAdapter= new FindReplaceDocumentAdapter(fDocument);
-		fAnnotationModel= fEditor.getDocumentProvider().getAnnotationModel(fEditor.getEditorInput());
-
-		fMatch= null;
-		fSelWASTListener= new ISelectionListenerWithAST() {
-			
-			/*
-			 * @see org.eclipse.jdt.internal.ui.viewsupport.ISelectionListenerWithAST#selectionChanged(org.eclipse.ui.IEditorPart, org.eclipse.jface.text.ITextSelection, org.eclipse.jdt.core.dom.CompilationUnit)
-			 * @since 3.1
-			 */
-			public void selectionChanged(IEditorPart part, ITextSelection selection, CompilationUnit astRoot) {
-				if (selection != null && selection.getOffset() == fMatch.getOffset() && selection.getLength() == fMatch.getLength()) {
-					countOccurrences();
-				}
-			}
-
-			private synchronized void countOccurrences() {
-				fOccurrences= 0;
-				Iterator iter= fAnnotationModel.getAnnotationIterator();
-				while (iter.hasNext()) {
-					Annotation annotation= (Annotation)iter.next();
-					if (OCCURRENCE_ANNOTATION.equals(annotation.getType()))
-						fOccurrences++;
-				}
-			}
-		};
-		SelectionListenerWithASTManager.getDefault().addListener(fEditor, fSelWASTListener);
-	}
-	
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 * @since 3.1
-	 */
-	protected void tearDown() throws Exception {
-		SelectionListenerWithASTManager.getDefault().removeListener(fEditor, fSelWASTListener);
-		EditorTestHelper.closeAllEditors();
-	}
-	
-	private JavaEditor openJavaEditor(IPath path) {
-		IFile file= ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-		assertTrue(file != null && file.exists());
-		try {
-			return (JavaEditor)EditorTestHelper.openInEditor(file, true);
-		} catch (PartInitException e) {
-			fail();
-			return null;
-		}
-	}
-	
-	public void testMarkTypeOccurrences() {
-		try {
-			fMatch= fFindReplaceDocumentAdapter.find(0, "TestResult", true, true, true, false);
-		} catch (BadLocationException e) {
-			fail();
-		}
-		assertNotNull(fMatch);
-
-		fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength());
-		
-		long timeOut= System.currentTimeMillis() + 60000;
-		while (fOccurrences == 0) {
-			EditorTestHelper.runEventQueue(fEditor);
-			synchronized (this) {
-				try {
-					wait(200);
-				} catch (InterruptedException e1) {
-				}
-			}
-			assertTrue(System.currentTimeMillis() < timeOut);
-		}
-		assertEquals(8, fOccurrences);
-		assertOccurrencesInWidget();
-	}
-	
-	public void testMarkMethodOccurrences() {
-		try {
-			fMatch= fFindReplaceDocumentAdapter.find(0, "getClass", true, true, true, false);
-		} catch (BadLocationException e) {
-			fail();
-		}
-		assertNotNull(fMatch);
-
-		fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength());
-		
-		long timeOut= System.currentTimeMillis() + 60000;
-		while (fOccurrences == 0) {
-			EditorTestHelper.runEventQueue(fEditor);
-			synchronized (this) {
-				try {
-					wait(200);
-				} catch (InterruptedException e1) {
-				}
-			}
-			assertTrue(System.currentTimeMillis() < timeOut);
-		}
-		assertEquals(2, fOccurrences);
-		assertOccurrencesInWidget();
-	}
-	public void testMarkFieldOccurrences() {
-		try {
-			fMatch= fFindReplaceDocumentAdapter.find(0, "fName", true, true, true, false);
-		} catch (BadLocationException e) {
-			fail();
-		}
-		assertNotNull(fMatch);
-
-		fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength());
-		
-		long timeOut= System.currentTimeMillis() + 60000;
-		while (fOccurrences == 0) {
-			EditorTestHelper.runEventQueue(fEditor);
-			synchronized (this) {
-				try {
-					wait(200);
-				} catch (InterruptedException e1) {
-				}
-			}
-			assertTrue(System.currentTimeMillis() < timeOut);
-		}
-		assertEquals(9, fOccurrences);
-		assertOccurrencesInWidget();
-	}
-	
-	public void testMarkLocalOccurrences() {
-		try {
-			fMatch= fFindReplaceDocumentAdapter.find(0, "runMethod", true, true, true, false);
-		} catch (BadLocationException e) {
-			fail();
-		}
-		assertNotNull(fMatch);
-
-		fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength());
-		
-		long timeOut= System.currentTimeMillis() + 60000;
-		while (fOccurrences == 0) {
-			EditorTestHelper.runEventQueue(fEditor);
-			synchronized (this) {
-				try {
-					wait(200);
-				} catch (InterruptedException e1) {
-				}
-			}
-			assertTrue(System.currentTimeMillis() < timeOut);
-		}
-		assertEquals(4, fOccurrences);
-		assertOccurrencesInWidget();
-	}
-	
-	public void testMarkMethodExitOccurrences() {
-		try {
-			fMatch= fFindReplaceDocumentAdapter.find(0, "void runTest() throws", true, true, false, false);
-		} catch (BadLocationException e) {
-			fail();
-		}
-		assertNotNull(fMatch);
-		fMatch= new Region(fMatch.getOffset(), 4);
-
-		fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength());
-		
-		long timeOut= System.currentTimeMillis() + 60000;
-		while (fOccurrences == 0) {
-			EditorTestHelper.runEventQueue(fEditor);
-			synchronized (this) {
-				try {
-					wait(200);
-				} catch (InterruptedException e1) {
-				}
-			}
-			assertTrue(System.currentTimeMillis() < timeOut);
-		}
-		assertEquals(6, fOccurrences);
-		assertOccurrencesInWidget();
-	}
-	
-	public void testMarkMethodExceptionOccurrences() {
-		try {
-			fMatch= fFindReplaceDocumentAdapter.find(0, "NoSuchMethodException", true, true, true, false);
-		} catch (BadLocationException e) {
-			fail();
-		}
-		assertNotNull(fMatch);
-
-		fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength());
-		
-		long timeOut= System.currentTimeMillis() + 60000;
-		while (fOccurrences == 0) {
-			EditorTestHelper.runEventQueue(fEditor);
-			synchronized (this) {
-				try {
-					wait(200);
-				} catch (InterruptedException e1) {
-				}
-			}
-			assertTrue(System.currentTimeMillis() < timeOut);
-		}
-		assertEquals(2, fOccurrences);
-		assertOccurrencesInWidget();
-	}
-	
-	public void testNoOccurrencesIfDisabled() {
-		JavaPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.EDITOR_MARK_OCCURRENCES, false);
-		fOccurrences= Integer.MAX_VALUE;
-		try {
-			fMatch= fFindReplaceDocumentAdapter.find(0, "TestResult", true, true, true, false);
-		} catch (BadLocationException e) {
-			fail();
-		}
-		assertNotNull(fMatch);
-
-		fEditor.selectAndReveal(fMatch.getOffset(), fMatch.getLength());
-		
-		long timeOut= System.currentTimeMillis() + 60000;
-		while (fOccurrences > 0) {
-			EditorTestHelper.runEventQueue(fEditor);
-			synchronized (this) {
-				try {
-					wait(200);
-				} catch (InterruptedException e1) {
-				}
-			}
-			assertTrue(System.currentTimeMillis() < timeOut);
-		}
-		assertEquals(0, fOccurrences);
-		assertOccurrencesInWidget();
-	}
-	
-	private void assertOccurrencesInWidget() {
-		EditorTestHelper.runEventQueue(500);
-
-		Iterator iter= fAnnotationModel.getAnnotationIterator();
-		while (iter.hasNext()) {
-			Annotation annotation= (Annotation)iter.next();
-			if (OCCURRENCE_ANNOTATION.equals(annotation.getType()))
-				assertOccurrenceInWidget(fAnnotationModel.getPosition(annotation));
-		}
-	}
-
-	private void assertOccurrenceInWidget(Position position) {
-		StyleRange[] styleRanges= fTextWidget.getStyleRanges(position.offset, position.length);
-		for (int i= 0; i < styleRanges.length; i++) {
-			if (styleRanges[i].background != null) {
-				RGB rgb= styleRanges[i].background.getRGB();
-				if (fgHighlightRGB.equals(rgb))
-					return;
-			}
-		}
-		fail();
-		
-	}
-	/**
-	 * Returns the shared color for the given key.
-	 * 
-	 * @param key the color key string
-	 * @return the shared color for the given key
-	 */
-	private static RGB getHighlightRGB() {
-		AnnotationPreference annotationPref= EditorsPlugin.getDefault().getAnnotationPreferenceLookup().getAnnotationPreference(OCCURRENCE_ANNOTATION);
-		IPreferenceStore store= EditorsUI.getPreferenceStore();
-		if (store != null)
-			return PreferenceConverter.getColor(store, annotationPref.getColorPreferenceKey());
-		
-		return null;
-	}
-	
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PairMatcherTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PairMatcherTest.java
deleted file mode 100644
index 977240f..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PairMatcherTest.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-
-import org.eclipse.jdt.internal.ui.text.JavaPairMatcher;
-
-public class PairMatcherTest extends TestCase {
-	
-	private static boolean BEFORE_MATCHES_DISABLED= true;
-	
-	protected IDocument fDocument;
-	protected JavaPairMatcher fPairMatcher;
-	
-	
-	public PairMatcherTest(String name) {
-		super(name);
-	}
-	
-	protected void setUp() {
-		fDocument= new Document("xx(yy(xx)yy)xx");
-		fPairMatcher= new JavaPairMatcher(new char[] { '(', ')' });
-	}
-	
-	public static Test suite() {
-		return new TestSuite(PairMatcherTest.class); 
-	}
-	
-	protected void tearDown () {
-		fDocument= null;
-		fPairMatcher= null;
-	}
-	
-	public void testBeforeOpeningMatch() {
-		IRegion match= fPairMatcher.match(fDocument, 2);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 2 && match.getLength() == 10);
-		}
-		
-		match= fPairMatcher.match(fDocument, 5);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 5 && match.getLength() == 4);		
-		}
-	}
-	
-	public void testAfterOpeningMatch() {
-		IRegion match= fPairMatcher.match(fDocument, 3);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 2 && match.getLength() == 10);
-		
-		match= fPairMatcher.match(fDocument, 6);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 5 && match.getLength() == 4);		
-	}
-	
-	public void testBeforeClosingMatch() {
-		IRegion match= fPairMatcher.match(fDocument, 11);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 2 && match.getLength() == 10);
-		}
-		
-		match= fPairMatcher.match(fDocument, 8);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 5 && match.getLength() == 4);		
-		}
-	}
-	
-	public void testAfterClosingMatch() {
-		IRegion match= fPairMatcher.match(fDocument, 12);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 2 && match.getLength() == 10);
-		
-		match= fPairMatcher.match(fDocument, 9);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 5 && match.getLength() == 4);		
-	}	
-	
-	public void testBeforeClosingMatchWithNL() {
-		fDocument.set("x(y\ny)x");
-		IRegion match= fPairMatcher.match(fDocument, 5);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 1 && match.getLength() == 5);
-		}
-	}	
-	
-	public void testAfterClosingMatchWithNL() {
-		fDocument.set("x(y\ny)x");
-		IRegion match= fPairMatcher.match(fDocument, 6);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 1 && match.getLength() == 5);
-	}
-	
-	public void testBeforeClosingMatchWithNLAndSingleLineComment() {
-		fDocument.set("x\nx(y\nx //(x\ny)x");
-		IRegion match= fPairMatcher.match(fDocument, 14);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 3 && match.getLength() == 12);
-		}
-	}	
-	
-	public void testAfterClosingMatchWithNLAndSingleLineComment() {
-		fDocument.set("x\nx(y\nx //(x\ny)x");
-		IRegion match= fPairMatcher.match(fDocument, 15);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 3 && match.getLength() == 12);
-	}	
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PartitionTokenScannerTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PartitionTokenScannerTest.java
deleted file mode 100644
index d49fb4a..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PartitionTokenScannerTest.java
+++ /dev/null

@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.IToken;
-
-import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
-import org.eclipse.jdt.internal.ui.text.JavaPartitionScanner;
-
-/**
- * Compares two <code>IParitionTokenScanner</code>s for conformance and performance.
- */
-public class PartitionTokenScannerTest extends TestCase {
-
-	private IPartitionTokenScanner fReference;
-	private IPartitionTokenScanner fTestee;
-
-	public PartitionTokenScannerTest(String name) {
-		super(name);	
-	}
-
-	protected void setUp() {
-		fReference= new JavaPartitionScanner();
-		fTestee= new FastJavaPartitionScanner(true);
-	}
-
-	// read sample java file
-	private IDocument getDocument(String name, String lineDelimiter) {
-		try {
-			InputStream stream= getClass().getResourceAsStream(name);
-			BufferedReader reader= new BufferedReader(new InputStreamReader(stream));
-			
-			StringBuffer buffer= new StringBuffer();
-			String line= reader.readLine();
-			while (line != null) {
-				buffer.append(line);
-				buffer.append(lineDelimiter);
-				line= reader.readLine();
-			}
-
-			return new Document(buffer.toString());
-
-		} catch (IOException e) {			
-		}
-		
-		return null;
-	}
-	
-	public static IDocument getRandomDocument(int size) {
-		final char[] characters= {'/', '*', '\'', '"', '\r', '\n', '\\'};
-		final StringBuffer buffer= new StringBuffer();
-		
-		for (int i= 0; i < size; i++) {
-			final int randomIndex= (int) (Math.random() * characters.length);
-			buffer.append(characters[randomIndex]);
-		}
-		
-		return new Document(buffer.toString());
-	}
-
-	public static Test suite() {
-		return new TestSuite(PartitionTokenScannerTest.class);
-	}
-
-	public void testTestCaseLF() {
-		testConformance(getDocument("TestCase.txt", "\n"));
-	}
-
-	public void testTestCaseCRLF() {
-		testConformance(getDocument("TestCase.txt", "\r\n"));
-	}
-
-	public void testTestCaseCR() {
-		testConformance(getDocument("TestCase.txt", "\r"));
-	}
-
-	public void testTestCase2LF() {
-		testConformance(getDocument("TestCase2.txt", "\n"));
-	}
-
-	public void testTestCase2CRLF() {
-		testConformance(getDocument("TestCase2.txt", "\r\n"));
-	}
-
-	public void testTestCase2CR() {
-		testConformance(getDocument("TestCase2.txt", "\r"));
-	}
-
-//	XXX not fully passing because of "\<LF> and '\<LF>
-//	public void testRandom() {
-//		testConformance(getRandomDocument(2048));
-//	}
-
-	/**
-	 * Tests performance of the testee against the reference IPartitionTokenScanner.
-	 */
-	public void testPerformance() {
-		final int COUNT= 5000;
-		final IDocument document= getDocument("TestCase.txt", "\n");
-
-		final long referenceTime= getTime(fReference, document, COUNT);
-		final long testeeTime= getTime(fTestee, document, COUNT);
-
-		if (false) {
-			System.out.println("reference time = " + referenceTime / 1000.0f);
-			System.out.println("testee time = " + testeeTime / 1000.0f);
-			System.out.println("factor = " + (float) referenceTime / testeeTime);
-		}
-		
-		// dangerous: assert no regression in performance
-		// assertTrue(testeeTime <= referenceTime);
-	}
-	
-	private long getTime(IPartitionTokenScanner scanner, IDocument document, int count) {
-		final long start= System.currentTimeMillis();
-
-		for (int i= 0; i < count; i++)
-			testPerformance(scanner, document);
-
-		final long end= System.currentTimeMillis();
-		
-		return end - start;
-	}
-	
-	private void testConformance(final IDocument document) {
-		
-		final StringBuffer message= new StringBuffer();
-		
-		fReference.setRange(document, 0, document.getLength());
-		fTestee.setRange(document, 0, document.getLength());
-		
-		while (true) {
-			
-			message.setLength(0);
-			
-			final IToken referenceToken= fReference.nextToken();
-			final IToken testeeToken= fTestee.nextToken();
-			assertTokenEquals(referenceToken, testeeToken);
-			
-			final int referenceOffset= fReference.getTokenOffset();
-			final int testeeOffset= fTestee.getTokenOffset();
-			message.append(", offset = " + referenceOffset);
-			message.append(", " + extractString(document, referenceOffset));
-			assertEquals(message.toString(), referenceOffset, testeeOffset);
-
-			final int referenceLength= fReference.getTokenLength();
-			final int testeeLength= fTestee.getTokenLength();
-			message.append(", length = " + referenceLength);
-			assertEquals(message.toString(), referenceLength, testeeLength);
-
-			if (referenceToken.isEOF())
-				break;
-		}
-	}
-
-	private static void testPerformance(final IPartitionTokenScanner scanner, final IDocument document) {
-		
-		scanner.setRange(document, 0, document.getLength());
-
-		IToken token;
-		do {
-			token= scanner.nextToken();			
-			scanner.getTokenOffset();
-			scanner.getTokenLength();
-
-		} while (!token.isEOF());
-	}
-	
-	private void assertTokenEquals(IToken expected, IToken actual) {
-		assertEquals(expected.isEOF(), actual.isEOF());
-		assertEquals(expected.isOther(), actual.isOther());
-		assertEquals(expected.isUndefined(), actual.isUndefined());
-		assertEquals(expected.isWhitespace(), actual.isWhitespace());
-	}
-		
-	private static String extractString(IDocument document, int offset) {
-		final StringBuffer buffer= new StringBuffer();
-
-		try {
-			IRegion region= document.getLineInformationOfOffset(offset);
-			String line= document.get(region.getOffset(), region.getLength());
-			
-			int offsetIndex= offset - region.getOffset();
-
-			// XXX kludge
-			if (offsetIndex > line.length())
-				offsetIndex= line.length();
-			
-			buffer.append("line = " + document.getLineOfOffset(offset) + ": [");
-			buffer.append(line.substring(0, offsetIndex));
-			buffer.append("<POS>");
-			buffer.append(line.substring(offsetIndex));
-			buffer.append(']');
-			
-		} catch (BadLocationException e) {
-		}	
-		
-		return buffer.toString();	
-	}
-
-	/**
-	 * Escapes CR, LF and TAB in a string.
-	 */
-	public static String escape(String string) {
-		final StringBuffer buffer= new StringBuffer();
-		
-		final int length= string.length();
-		for (int i= 0; i < length; i++) {
-			final char character= string.charAt(i);
-			switch (character) {
-			case '\t':
-				buffer.append("\\t");
-				break;
-
-			case '\r':
-				buffer.append("\\r");
-				break;
-				
-			case '\n':
-				buffer.append("\\n");
-				break;			
-			
-			default:	
-				buffer.append(character);
-				break;
-			}
-		}
-		
-		return buffer.toString();	
-	}
-	
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/SemanticHighlightingTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/SemanticHighlightingTest.java
deleted file mode 100644
index c3780b6..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/SemanticHighlightingTest.java
+++ /dev/null

@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.filebuffers.tests.ResourceHelper;
-
-import org.eclipse.text.tests.Accessor;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.SourceViewer;
-
-import org.eclipse.jdt.core.IJavaProject;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.text.tests.performance.EditorTestHelper;
-import org.eclipse.jdt.text.tests.performance.ResourceTestHelper;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlighting;
-import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingManager;
-import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingPresenter;
-import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings;
-
-
-public class SemanticHighlightingTest extends TestCase {
-	
-	public static final Class THIS= SemanticHighlightingTest.class;
-	
-	private static class SemanticHighlightingTestSetup extends TestSetup {
-
-		private IJavaProject fJavaProject;
-		
-		public SemanticHighlightingTestSetup(Test test) {
-			super(test);
-		}
-		
-		protected void setUp() throws Exception {
-			super.setUp();
-			fJavaProject= JavaProjectHelper.createJavaProject("SHTest", "bin");
-			assertNotNull("JRE is null", JavaProjectHelper.addRTJar(fJavaProject));
-			
-			IProject project= (IProject) fJavaProject.getUnderlyingResource();
-			IFolder folder= ResourceHelper.createLinkedFolder(project, new Path("src"), JdtTextTestPlugin.getDefault(), new Path("testResources/semanticHighlightingTest1"));
-			assertNotNull(folder);
-			assertTrue(folder.exists());
-			JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-			
-			
-			IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-			if (!store.getBoolean(PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED))
-				store.setValue(PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED, true);
-			disableAllSemanticHighlightings();
-			
-			fEditor= (JavaEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile("/SHTest/src/SHTest.java"), true);
-			fSourceViewer= EditorTestHelper.getSourceViewer(fEditor);
-			assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 0, 10000, 100));
-		}
-
-		protected void tearDown () throws Exception {
-			IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-			if (!store.isDefault(PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED))
-				store.setToDefault(PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED);
-			
-			SemanticHighlighting[] semanticHighlightings= SemanticHighlightings.getSemanticHighlightings();
-			for (int i= 0, n= semanticHighlightings.length; i < n; i++) {
-				String enabledPreferenceKey= SemanticHighlightings.getEnabledPreferenceKey(semanticHighlightings[i]);
-				if (!store.isDefault(enabledPreferenceKey))
-					store.setToDefault(enabledPreferenceKey);
-			}
-
-			if (fJavaProject != null)
-				JavaProjectHelper.delete(fJavaProject);
-			
-			super.tearDown();
-		}
-	}
-	
-	private static JavaEditor fEditor;
-	
-	private static SourceViewer fSourceViewer;
-
-	public static Test suite() {
-		return new SemanticHighlightingTestSetup(new TestSuite(THIS));
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		disableAllSemanticHighlightings();
-	}
-	
-	public void testDeprecatedMemberHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.DEPRECATED_MEMBER);
-		Position[] expected= new Position[] {
-				createPosition(0, 12, 13),
-				createPosition(22, 5, 15),
-				createPosition(24, 1, 13),
-				createPosition(24, 15, 16),
-				createPosition(25, 2, 15),
-				createPosition(26, 2, 16),
-				createPosition(27, 10, 10),
-				createPosition(30, 7, 10),
-				createPosition(30, 26, 13),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-
-	public void testStaticFinalFieldHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.STATIC_FINAL_FIELD);
-		Position[] expected= new Position[] {
-				createPosition(6, 18, 16),
-				createPosition(35, 37, 16),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	public void testStaticFieldHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.STATIC_FIELD);
-		Position[] expected= new Position[] {
-				createPosition(4, 12, 11),
-				createPosition(6, 18, 16),
-				createPosition(33, 32, 11),
-				createPosition(35, 37, 16),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	public void testFieldHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.FIELD);
-		Position[] expected= new Position[] {
-				createPosition(3, 5, 5),
-				createPosition(4, 12, 11),
-				createPosition(5, 11, 10),
-				createPosition(6, 18, 16),
-				createPosition(22, 5, 15),
-				createPosition(25, 2, 15),
-				createPosition(31, 9, 6),
-				createPosition(32, 6, 11),
-				createPosition(32, 31, 5),
-				createPosition(33, 6, 17),
-				createPosition(33, 32, 11),
-				createPosition(34, 6, 16),
-				createPosition(34, 36, 10),
-				createPosition(35, 6, 22),
-				createPosition(35, 37, 16),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	public void testMethodDeclarationHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.METHOD_DECLARATION);
-		Position[] expected= new Position[] {
-				createPosition(7, 6, 6),
-				createPosition(19, 13, 12),
-				createPosition(20, 15, 14),
-				createPosition(24, 15, 16),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	public void testStaticMethodInvocationHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.STATIC_METHOD_INVOCATION);
-		Position[] expected= new Position[] {
-				createPosition(10, 2, 12),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	/*
-	 * [syntax highlighting] 'Abstract Method Invocation' highlighting also matches declaration
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=73353
-	 */
-	public void testAbstractMethodInvocationHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.ABSTRACT_METHOD_INVOCATION);
-		Position[] expected= new Position[] {
-				createPosition(11, 2, 14),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	public void testInheritedMethodInvocationHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.INHERITED_METHOD_INVOCATION);
-		Position[] expected= new Position[] {
-				createPosition(12, 2, 8),
-				createPosition(15, 17, 8),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	public void testLocalVariableDeclarationHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.LOCAL_VARIABLE_DECLARATION);
-		Position[] expected= new Position[] {
-				createPosition(8, 6, 5),
-				createPosition(13, 11, 6),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	public void testLocalVariableHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.LOCAL_VARIABLE);
-		Position[] expected= new Position[] {
-				createPosition(8, 6, 5),
-				createPosition(9, 2, 5),
-				createPosition(13, 11, 6),
-				createPosition(13, 22, 6),
-				createPosition(13, 35, 6),
-				createPosition(15, 3, 5),
-		};
-		Position[] actual= getSemanticHighlightingPositions();
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-	
-	public void testParameterVariableHighlighting() throws Exception {
-		setUpSemanticHighlighting(SemanticHighlightings.PARAMETER_VARIABLE);
-		Position[] actual= getSemanticHighlightingPositions();
-		Position[] expected= new Position[] {
-				createPosition(7, 17, 5),
-				createPosition(8, 13, 5),
-				createPosition(14, 26, 6),
-				createPosition(15, 10, 6),
-				createPosition(16, 3, 6),
-		};
-//		System.out.println(toString(actual));
-		assertEqualPositions(expected, actual);
-	}
-
-	private void assertEqualPositions(Position[] expected, Position[] actual) {
-		assertEquals(expected.length, actual.length);
-		for (int i= 0, n= expected.length; i < n; i++) {
-			assertEquals(expected[i].isDeleted(), actual[i].isDeleted());
-			assertEquals(expected[i].getOffset(), actual[i].getOffset());
-			assertEquals(expected[i].getLength(), actual[i].getLength());
-		}
-	}
-
-	private Position createPosition(int line, int column, int length) throws BadLocationException {
-		IDocument document= fSourceViewer.getDocument();
-		return new Position(document.getLineOffset(line) + column, length);
-	}
-
-	String toString(Position[] positions) throws BadLocationException {
-		StringBuffer buf= new StringBuffer();
-		IDocument document= fSourceViewer.getDocument();
-		buf.append("Position[] expected= new Position[] {\n");
-		for (int i= 0, n= positions.length; i < n; i++) {
-			Position position= positions[i];
-			int line= document.getLineOfOffset(position.getOffset());
-			int column= position.getOffset() - document.getLineOffset(line);
-			buf.append("\tcreatePosition(" + line + ", " + column + ", " + position.getLength() + "),\n");
-		}
-		buf.append("};\n");
-		return buf.toString();
-	}
-
-	private Position[] getSemanticHighlightingPositions() throws BadPositionCategoryException {
-		SemanticHighlightingManager manager= (SemanticHighlightingManager) new Accessor(fEditor, JavaEditor.class).get("fSemanticManager");
-		SemanticHighlightingPresenter presenter= (SemanticHighlightingPresenter) new Accessor(manager, manager.getClass()).get("fPresenter");
-		String positionCategory= (String) new Accessor(presenter, presenter.getClass()).invoke("getPositionCategory", new Object[0]);
-		IDocument document= fSourceViewer.getDocument();
-		return document.getPositions(positionCategory);
-	}
-
-	private void setUpSemanticHighlighting(String semanticHighlighting) {
-		enableSemanticHighlighting(semanticHighlighting);
-		EditorTestHelper.forceReconcile(fSourceViewer);
-		assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 0, 10000, 100));
-		EditorTestHelper.sleep(100);
-		EditorTestHelper.runEventQueue();
-	}
-
-	private void enableSemanticHighlighting(String preferenceKey) {
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(getEnabledPreferenceKey(preferenceKey), true);
-	}
-
-	private String getEnabledPreferenceKey(String preferenceKey) {
-		return PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_PREFIX + preferenceKey + PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED_SUFFIX;
-	}
-	
-	private static void disableAllSemanticHighlightings() {
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		SemanticHighlighting[] semanticHilightings= SemanticHighlightings.getSemanticHighlightings();
-		for (int i= 0, n= semanticHilightings.length; i < n; i++) {
-			SemanticHighlighting semanticHilighting= semanticHilightings[i];
-			if (store.getBoolean(SemanticHighlightings.getEnabledPreferenceKey(semanticHilighting)))
-				store.setValue(SemanticHighlightings.getEnabledPreferenceKey(semanticHilighting), false);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/SmartSemicolonAutoEditStrategyTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/SmartSemicolonAutoEditStrategyTest.java
deleted file mode 100644
index 7541f20..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/SmartSemicolonAutoEditStrategyTest.java
+++ /dev/null

@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-
-import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
-import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
-import org.eclipse.jdt.internal.ui.text.java.SmartSemicolonAutoEditStrategy;
-
-/**
- * SmartSemicolonAutoEditStrategyTest
- * @since 3.0
- */
-public class SmartSemicolonAutoEditStrategyTest extends TestCase {
-
-	/**
-	 * Testclass exposing the method to be tested
-	 */
-	private static class SmartSemicolon extends SmartSemicolonAutoEditStrategy {
-
-		public SmartSemicolon() {
-			super("");
-		}
-		
-		public static int computeCharacterPosition(IDocument document, ITextSelection line, int offset, char character, String partitioning) {
-			return SmartSemicolonAutoEditStrategy.computeCharacterPosition(document, line, offset, character, partitioning);
-		}
-	}
-	
-	public static Test suite() {
-		return new TestSuite(SmartSemicolonAutoEditStrategyTest.class);
-	}
-	
-	private DefaultPartitioner fPartitioner;
-
-	private static final char SEMI= ';';
-	private static final char BRACE= '{';
-
-	private Document fDocument;
-
-	public SmartSemicolonAutoEditStrategyTest() {
-		fDocument= new Document();
-		String[] types= new String[] {
-			IJavaPartitions.JAVA_DOC,
-			IJavaPartitions.JAVA_MULTI_LINE_COMMENT,
-			IJavaPartitions.JAVA_SINGLE_LINE_COMMENT,
-			IJavaPartitions.JAVA_STRING,
-			IJavaPartitions.JAVA_CHARACTER,
-			IDocument.DEFAULT_CONTENT_TYPE
-		};
-		fPartitioner= new DefaultPartitioner(new FastJavaPartitionScanner(), types);
-		fPartitioner.connect(fDocument); 
-		fDocument.setDocumentPartitioner(IJavaPartitions.JAVA_PARTITIONING, fPartitioner); 
-	}
-
-	private void verifySemicolonPosition(int caret, int expected) throws BadLocationException {
-		IRegion region= fDocument.getLineInformation(0);
-		ITextSelection selection= new TextSelection(fDocument, region.getOffset(), region.getLength());
-		int pos= SmartSemicolon.computeCharacterPosition(fDocument, selection, caret, SEMI, IJavaPartitions.JAVA_PARTITIONING);
-		Assert.assertEquals(expected, pos);
-	}
-	
-	private void verifyBracePosition(int caret, int expected) throws BadLocationException {
-		IRegion region= fDocument.getLineInformation(0);
-		ITextSelection selection= new TextSelection(fDocument, region.getOffset(), region.getLength());
-		int pos= SmartSemicolon.computeCharacterPosition(fDocument, selection, caret, BRACE, IJavaPartitions.JAVA_PARTITIONING);
-		if (pos == -1) pos= caret;
-		Assert.assertEquals(expected, pos);
-	}
-	
-	/* semicolon tests */
-	
-	public void testGoToEOL() throws BadLocationException {
-		fDocument.set("public void foobar()");
-		verifySemicolonPosition(5, 20);
-	}
-	
-	public void testGoToExisting() throws BadLocationException {
-		System.out.println("testGoToExisting disabled - unwanted functionality");
-		if (true) return;
-		fDocument.set("public void; foobar()");
-		verifySemicolonPosition(5, 11);
-	}
-	
-	public void testFor() throws BadLocationException {
-		fDocument.set("for (int i= 0)");
-		verifySemicolonPosition(13, -1);
-	}
-	
-	public void testWithExistingBefore() throws BadLocationException {
-		fDocument.set("public void; foobar()");
-		verifySemicolonPosition(12, 21);
-	}
-	
-	public void testWithExistingBeforeWithComment() throws BadLocationException {
-		fDocument.set("public void; foobar() // comment\r\n ");
-		verifySemicolonPosition(12, 21);
-	}
-	
-	public void testWithExistingAtInsertPosition() throws BadLocationException {
-		System.out.println("testWithExistingAtInsertPosition disabled - existing characters handled by framework");
-		if (true) return;
-		fDocument.set("public void foobar(); // comment\r\n");
-		verifySemicolonPosition(12, 12);
-	}
-
-	public void testEndLineComment() throws BadLocationException {
-		fDocument.set("private string foo= \"foobar\" // comment\r\n");
-		verifySemicolonPosition(12, 28);
-	}
-
-	public void testFakeEndLineComment() throws BadLocationException {
-		fDocument.set("private string foo= \"foobar\" /* comment */   \r\n");
-		verifySemicolonPosition(12, 28);
-	}
-	
-	public void testBlockComment() throws BadLocationException {
-		fDocument.set("doStuff(arg1 /* comment */, args)  ");
-		verifySemicolonPosition(5, 33);
-	}
-
-	public void testMultiLineComment() throws BadLocationException {
-		fDocument.set("private string foo= \"foobar\" /* comment1 \r\n comment2 */");
-		verifySemicolonPosition(12, 28);
-	}
-
-	public void testEndLineCommentWithFor() throws BadLocationException {
-		fDocument.set("for (int i= 0; i < 2; i++) // comment");
-		verifySemicolonPosition(13, -1);
-	}
-
-	public void testFakeEndLineCommentWithFor() throws BadLocationException {
-		fDocument.set("for (int i= 0; i < 2; i++) /* comment */  ");
-		verifySemicolonPosition(13, -1);
-	}
-
-	public void testMultiLineCommentWithFor() throws BadLocationException {
-		fDocument.set("for (int i= 0; i < 2; i++) /* comment\r\n comment2 */  ");
-		verifySemicolonPosition(13, -1);
-	}
-
-	public void testSemicolonInEmptyMethodBody() throws BadLocationException {
-		fDocument.set("void foobar(int param) {}");
-		verifySemicolonPosition(24, 24);
-	}
-	
-	/* brace tests */
-	
-	public void testBraceClassDef() throws BadLocationException {
-		fDocument.set("public static final class Main ");
-		verifyBracePosition(31, 31);
-	}
-
-	public void testBraceMethodDef() throws BadLocationException {
-		fDocument.set("void bla(int p1, int p2) // comment");
-		verifyBracePosition(8, 24);
-	}
-
-	public void testBraceMethodDef2() throws BadLocationException {
-		fDocument.set("void bla(int p1, int p2) // comment");
-		verifyBracePosition(12, 24);
-	}
-	
-	public void testBraceIf() throws BadLocationException {
-		fDocument.set("if (condition && condition()) // comment");
-		verifyBracePosition(12, 29);
-	}
-
-	public void testBraceIf2() throws BadLocationException {
-		fDocument.set("if (value == expected) // comment");
-		verifyBracePosition(12, 22);
-	}
-
-	public void testBraceMethodCall() throws BadLocationException {
-		fDocument.set("call(param1, param2) // comment");
-		verifyBracePosition(12, 12);
-	}
-
-	public void testBraceElse() throws BadLocationException {
-		fDocument.set(" } else somecode();");
-		verifyBracePosition(4, 7);
-	}
-
-	public void testBraceArray() throws BadLocationException {
-		fDocument.set("int[] arr= bla, bli, blu;");
-		verifyBracePosition(10, 10);
-		verifyBracePosition(11, 11);
-	}
-
-	public void testBraceArray2() throws BadLocationException {
-		fDocument.set("arr= bla, bli, blu;");
-		verifyBracePosition(4, 4);
-		verifyBracePosition(5, 5);
-	}
-	
-	public void testBraceAnonymousClassDef() throws BadLocationException {
-		fDocument.set("this.addListener(blu, new Listener(), bla)");
-		verifyBracePosition(34, 36);
-	}
-	
-	public void testBraceAnonymousClassDef2() throws BadLocationException {
-		fDocument.set("this.addListener(blu, \"new\", Listener(), bla)");
-		verifyBracePosition(41, 41);
-	}
-	
-	public void testBraceIfAnonymousClassDef() throws BadLocationException {
-		fDocument.set("  if addListener(blu, new Listener(), bla)");
-		verifyBracePosition(34, 36);
-		verifyBracePosition(37, 42);
-	}
-
-	public void testBraceIfAnonymousClassDef2() throws BadLocationException {
-		fDocument.set("  if addListener(blu, \"new\", Listener(), bla)");
-		verifyBracePosition(20, 45);
-		verifyBracePosition(39, 45);
-	}
-	
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/StringsTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/StringsTest.java
deleted file mode 100644
index 89ed21f..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/StringsTest.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.jdt.internal.corext.util.Strings;
-
-public class StringsTest extends TestCase {
-
-
-	public StringsTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new TestSuite(StringsTest.class);
-	}
-
-	
-	public void testIsIndentChar() {
-		assertTrue(Strings.isIndentChar(' '));
-		assertTrue(Strings.isIndentChar('\t'));
-		assertTrue(!Strings.isIndentChar('x'));
-		assertTrue(!Strings.isIndentChar('\n'));
-		assertTrue(!Strings.isIndentChar('\r'));
-	}
-		
-	public void testIsLineDelimiterChar() {
-		assertTrue(!Strings.isLineDelimiterChar(' '));
-		assertTrue(!Strings.isLineDelimiterChar('\t'));
-		assertTrue(!Strings.isLineDelimiterChar('x'));
-		assertTrue(Strings.isLineDelimiterChar('\n'));
-		assertTrue(Strings.isLineDelimiterChar('\r'));
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/TestCase.txt b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/TestCase.txt
deleted file mode 100644
index 09eca5f..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/TestCase.txt
+++ /dev/null

@@ -1,211 +0,0 @@
-package org.eclipse.jdt.ui.tests.text;
-
-import java.lang.reflect.*;
-
-/**
- * A test case defines the fixture to run multiple tests. To define a test case<br>
- * 1) implement a subclass of TestCase<br>
- * 2) define instance variables that store the state of the fixture<br>
- * 3) initialize the fixture state by overriding <code>setUp</code><br>
- * 4) clean-up after a test by overriding <code>tearDown</code>.<br>
- * Each test runs in its own fixture so there
- * can be no side effects among test runs.
- * Here is an example:
- * <pre>
- * public class MathTest extends TestCase {
- *     protected double fValue1;
- *     protected double fValue2;
- *
- *     public MathTest(String name) {
- *         super(name);
- *     }
- *
- *    protected void setUp() {
- *         fValue1= 2.0;
- *         fValue2= 3.0;
- *     }
- * }
- * </pre>
- *
- * For each test implement a method which interacts
- * with the fixture. Verify the expected results with assertions specified
- * by calling <code>assert</code> with a boolean.
- * <pre>
- *    protected void testAdd() {
- *        double result= fValue1 + fValue2;
- *        assert(result == 5.0);
- *    }
- * </pre>
- * Once the methods are defined you can run them. The framework supports
- * both a static type safe and more dynamic way to run a test.
- * In the static way you override the runTest method and define the method to
- * be invoked. A convenient way to do so is with an anonymous inner class.
- * <pre>
- * Test test= new MathTest("add") {
- *        public void runTest() {
- *            testAdd();
- *        }
- * };
- * test.run();
- * </pre>
- * The dynamic way uses reflection to implement <code>runTest</code>. It dynamically finds
- * and invokes a method.
- * In this case the name of the test case has to correspond to the test method
- * to be run.
- * <pre>
- * Test= new MathTest("testAdd");
- * test.run();
- * </pre>
- * The tests to be run can be collected into a TestSuite. JUnit provides
- * different <i>test runners</i> which can run a test suite and collect the results.
- * A test runner either expects a static method <code>suite</code> as the entry
- * point to get a test to run or it will extract the suite automatically.
- * <pre>
- * public static Test suite() {
- *      suite.addTest(new MathTest("testAdd"));
- *      suite.addTest(new MathTest("testDivideByZero"));
- *      return suite;
- *  }
- * </pre>
- * @see TestResult
- * @see TestSuite
- */
-
-public abstract class TestCase extends Assert implements Test {
-	/**
-	 * the name of the test case
-	 */
-	private String fName;
-	
-	/**
-	 * No-arg constructor to enable serialization. This method
-	 * is not intended to be used by mere mortals.
-	 */
-	TestCase() {
-		fName= null;
-	}
-	
-	/**
-	 * Constructs a test case with the given name.
-	 */
-	public TestCase(String name) {
-		fName= name;
-	}
-	
-	/**
-	 * Counts the number of test cases executed by run(TestResult result).
-	 */
-	public int countTestCases() {
-		return 1;
-	}
-	/**
-	 * Creates a default TestResult object
-	 *
-	 * @see TestResult
-	 */
-	protected TestResult createResult() {
-	    return new TestResult();
-	}
-	/**
-	 * Gets the name of the test case.
-	 * @deprecated use getName()
-	 */
-	public String name() {
-		return fName;
-	}
-	/**
-	 * A convenience method to run this test, collecting the results with a
-	 * default TestResult object.
-	 *
-	 * @see TestResult
-	 */
-	public TestResult run() {
-		TestResult result= createResult();
-		run(result);
-		return result;
-	}
-	/**
-	 * Runs the test case and collects the results in TestResult.
-	 */
-	public void run(TestResult result) {
-		result.run(this);
-	}
-	/**
-	 * Runs the bare test sequence.
-	 * @exception Throwable if any exception is thrown
-	 */
-	public void runBare() throws Throwable {
-		setUp();
-		try {
-			runTest();
-		}
-		finally {
-			tearDown();
-		}
-	}
-	/**
-	 * Override to run the test and assert its state.
-	 * @exception Throwable if any exception is thrown
-	 */
-	protected void runTest() throws Throwable {
-		Method runMethod= null;
-		try {
-			// use getMethod to get all public inherited
-			// methods. getDeclaredMethods returns all
-			// methods of this class but excludes the
-			// inherited ones.
-			runMethod= getClass().getMethod(fName, null);
-		} catch (NoSuchMethodException e) {
-			fail("Method \""+fName+"\" not found");
-		}
-		if (!Modifier.isPublic(runMethod.getModifiers())) {
-			fail("Method \""+fName+"\" should be public");
-		}
-
-		try {
-			runMethod.invoke(this, new Class[0]);
-		}
-		catch (InvocationTargetException e) {
-			e.fillInStackTrace();
-			throw e.getTargetException();
-		}
-		catch (IllegalAccessException e) {
-			e.fillInStackTrace();
-			throw e;
-		}
-	}
-	/**
-	 * Sets up the fixture, for example, open a network connection.
-	 * This method is called before a test is executed.
-	 */
-	protected void setUp() throws Exception {
-	}
-	/**
-	 * Tears down the fixture, for example, close a network connection.
-	 * This method is called after a test is executed.
-	 */
-	protected void tearDown() throws Exception {
-	}
-	/**
-	 * Returns a string representation of the test case
-	 */
-	public String toString() {
-	    return name()+"("+getClass().getName()+")";
-	}
-	/**
-	 * Gets the name of a TestCase
-	 * @return returns a String
-	 */
-	public String getName() {
-		return fName;
-	}
-
-	/**
-	 * Sets the name of a TestCase
-	 * @param name The name to set
-	 */
-	public void setName(String name) {
-		fName= name;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/TestCase2.txt b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/TestCase2.txt
deleted file mode 100644
index f9a86b8..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/TestCase2.txt
+++ /dev/null

@@ -1,66 +0,0 @@
-package org.eclipse.jdt.ui.tests.text;
-
-/**
- * javadoc
- */
-public class TestCase2 {
-	/*
-	 * multi line comment
-	 */
-	 private void foo() {
-	 	// single line comment
-	 	int value= 42;
-	 	
-	 	/**/
-	 	
-	 	String s= "string";
-	 	char c= 'c';
-	 	
-	 	String s2= "string2"/* ads*/;
-	 	
-	 	Nastyness: ""/**/''"";
-	 	
-	 	// open strings and characters
-	 	'open characters
-	 	"open strings
-	 	
-	 	// all state transitions
-	 	/* multi line comment */// single line comment
-	 	/* multi line comment *//* multi line comment */
-	 	/* multi line comment *//** java doc */
-	 	/* multi line comment */'character'
-	 	/* multi line comment */"string"
-	 	/* java doc */// single line comment
-	 	/* java doc *//* multi line comment */
-	 	/* java doc *//** java doc */
-	 	/* java doc */'character'
-	 	/* java doc */"string"
-	 	"string"// single line comment
-	 	"string"//* multi line comment */
-	 	"string"/** java doc */
-	 	"string"'character'
-	 	"string""string"
-	 	'character'// single line comment
-	 	'character'"//* multi line comment */
-	 	'character'/** java doc */
-	 	'character''character'
-	 	'character'"string"
-
-		// more nasty cases
-		/'asdf
-		/"asdf
-
-		/**
-		 *	// single line comment inside javadoc
-		 */
-		
-		/*
-		 *	// single line comment inside multi-line comment
-		 */
-		 
-		// would fail conformance, but it's ok
-		"<backslash>
-		'<backslash>		
-	 }
-
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentFormatterUtil.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentFormatterUtil.java
deleted file mode 100644
index 665e422..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentFormatterUtil.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.comments;
-
-import java.util.Map;
-
-import org.eclipse.text.edits.TextEdit;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.text.TypedPosition;
-
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.corext.Assert;
-
-import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
-import org.eclipse.jdt.internal.ui.text.comment.CommentFormattingStrategy;
-import org.eclipse.jdt.internal.ui.text.comment.CommentObjectFactory;
-import org.eclipse.jdt.internal.ui.text.comment.CommentRegion;
-import org.eclipse.jdt.internal.ui.text.comment.ITextMeasurement;
-
-/**
- * Utilities for the comment formatter.
- * 
- * @since 3.0
- */
-public class CommentFormatterUtil {
-
-	/**
-	 * Formats the source string as a comment region of the specified type.
-	 * <p>
-	 * Both offset and length must denote a valid comment partition, that is to
-	 * say a substring that starts and ends with the corresponding comment
-	 * delimiter tokens.
-	 * 
-	 * @param type
-	 *                   The type of the comment. Must be one of the constants of
-	 *                   <code>IJavaPartitions</code>
-	 * @param source
-	 *                   The source string to format
-	 * @param offset
-	 *                   The offset relative to the source string where to format
-	 * @param length
-	 *                   The length of the region in the source string to format
-	 * @param preferences
-	 *                   Preferences for the comment formatter
-	 * @param textMeasurement
-	 *                   Optional text measurement for font specific formatting. Can be
-	 *                   <code>null</code>.
-	 * @return The text edit of the formatting process
-	 */
-	public static TextEdit format(String type, String source, int offset, int length, Map preferences, ITextMeasurement textMeasurement) {
-		Assert.isTrue(IJavaPartitions.JAVA_DOC.equals(type) || IJavaPartitions.JAVA_MULTI_LINE_COMMENT.equals(type) || IJavaPartitions.JAVA_SINGLE_LINE_COMMENT.equals(type));
-
-		Assert.isNotNull(source);
-		Assert.isNotNull(preferences);
-
-		Assert.isTrue(offset >= 0);
-		Assert.isTrue(length <= source.length());
-
-		final IDocument document= new Document(source);
-		final TypedPosition position= new TypedPosition(offset, length, type);
-		final boolean tabs= JavaCore.TAB.equals(preferences.get(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR));
-
-		final CommentRegion region= CommentObjectFactory.createRegion(document, position, TextUtilities.getDefaultLineDelimiter(document), preferences, textMeasurement);
-
-		return region.format(CommentFormattingStrategy.getLineIndentation(document, region, offset, tabs));
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentTestCase.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentTestCase.java
deleted file mode 100644
index 98f08d5..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentTestCase.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.comments;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.text.edits.TextEdit;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextUtilities;
-
-import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil;
-
-import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
-import org.eclipse.jdt.internal.ui.text.comment.CommentFormattingContext;
-
-public abstract class CommentTestCase extends TestCase {
-
-	public static final String DELIMITER= TextUtilities.getDefaultLineDelimiter(new Document());
-
-	protected CommentTestCase(String name) {
-		super(name);
-	}
-
-	protected final Map createOptions(CommentFormattingContext context) {
-		assertNotNull(context);
-
-		final Map map= new HashMap();
-		final String[] keys= context.getPreferenceKeys();
-
-		for (int index= 0; index < keys.length; index++) {
-
-			if (context.isBooleanPreference(keys[index]))
-				map.put(keys[index], IPreferenceStore.TRUE);
-			else if (context.isIntegerPreference(keys[index]))
-				map.put(keys[index], "80"); //$NON-NLS-1$
-		}
-
-		final Map user= getUserOptions();
-		if (user != null) {
-
-			Object key= null;
-			for (final Iterator iterator= user.keySet().iterator(); iterator.hasNext();) {
-
-				key= iterator.next();
-				map.put(key, user.get(key));
-			}
-		}
-		return map;
-	}
-
-	protected abstract String getCommentType();
-
-	protected abstract Map getUserOptions();
-
-	protected final String testFormat(String text) {
-		return testFormat(text, 0, text.length());
-	}
-
-	protected String testFormat(String text, int offset, int length) {
-		assertNotNull(text);
-		assertTrue(offset >= 0);
-		assertTrue(offset < text.length());
-		assertTrue(length >= 0);
-		assertTrue(offset + length <= text.length());
-
-		final String type= getCommentType();
-		assertNotNull(type);
-		assertTrue(type.equals(IJavaPartitions.JAVA_DOC) || type.equals(IJavaPartitions.JAVA_MULTI_LINE_COMMENT) || type.equals(IJavaPartitions.JAVA_SINGLE_LINE_COMMENT));
-
-		final CommentFormattingContext context= new CommentFormattingContext();
-		final TextEdit edit= CommentFormatterUtil.format(type, text, offset, length, createOptions(context), null);
-
-		return CodeFormatterUtil.evaluateFormatterEdit(text, edit, null);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentsTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentsTestSuite.java
deleted file mode 100644
index a89fbf1..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/CommentsTestSuite.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.comments;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * 
- * @since 3.0
- */
-public class CommentsTestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite org.eclipse.jdt.text.tests.comments"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTest(MultiLineTestCase.suite());
-		suite.addTest(SingleLineTestCase.suite());
-		suite.addTest(JavaDocTestCase.suite());
-		//$JUnit-END$
-		return suite;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/JavaDocTestCase.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/JavaDocTestCase.java
deleted file mode 100644
index 454b53b..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/JavaDocTestCase.java
+++ /dev/null

@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.comments;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
-import org.eclipse.jdt.internal.ui.text.comment.JavaDocLine;
-import org.eclipse.jdt.internal.ui.text.comment.MultiCommentLine;
-
-public class JavaDocTestCase extends CommentTestCase {
-
-	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
-
-	protected static final String POSTFIX= MultiCommentLine.MULTI_COMMENT_END_PREFIX;
-
-	protected static final String PREFIX= JavaDocLine.JAVADOC_START_PREFIX;
-	
-	private Map fUserOptions;
-
-	public static Test suite() {
-		return new TestSuite(JavaDocTestCase.class);
-	}
-
-	public JavaDocTestCase(String name) {
-		super(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	protected void tearDown() throws Exception {
-		fUserOptions= null;
-	}
-	
-	protected String getCommentType() {
-		return IJavaPartitions.JAVA_DOC;
-	}
-
-	protected Map getUserOptions() {
-		return fUserOptions;
-	}
-	
-	protected void setUserOption(String name, String value) {
-		if (fUserOptions == null)
-			fUserOptions= new HashMap();
-		
-		fUserOptions.put(name, value);
-	}
-	
-	public void testSingleLineComment1() {
-		assertEquals(PREFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + "\t\t" + DELIMITER + "*\t test*/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	public void testSingleLineComment2() {
-		assertEquals(PREFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + "test" + DELIMITER + "\t" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	public void testSingleLineComment3() {
-		assertEquals(PREFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + DELIMITER + "* test\t*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineComment4() {
-		assertEquals(PREFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + "test" + DELIMITER + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentSpace1() {
-		assertEquals(PREFIX + " test" + POSTFIX, testFormat(PREFIX + "test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentSpace2() {
-		assertEquals(PREFIX + " test" + POSTFIX, testFormat(PREFIX + "test" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentSpace3() {
-		assertEquals(PREFIX + " test" + POSTFIX, testFormat(PREFIX + "test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentSpace4() {
-		assertEquals(PREFIX + " test test" + POSTFIX, testFormat(PREFIX + " test   test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentTabs1() {
-		assertEquals(PREFIX + " test test" + POSTFIX, testFormat(PREFIX + "\ttest\ttest" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testSingleLineCommentTabs2() {
-		assertEquals(PREFIX + " test test" + POSTFIX, testFormat(PREFIX + "\ttest\ttest*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public void testMultiLineCommentBreak1() {
-		String input= PREFIX + " test<br>test" + POSTFIX; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + INFIX + "test <br>" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$
-		assertEquals(expected, testFormat(input));
-	}
-	
-	public void testMultiLineCommentCodeSnippet1() {
-		String prefix= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + "while (i != 0) i--;" + postfix; //$NON-NLS-1$
-		String expected= prefix + "while (i != 0)" + DELIMITER + INFIX + "\ti--;" + postfix;    //$NON-NLS-1$//$NON-NLS-2$
-		assertEquals(expected, testFormat(input));
-	}
-	
-	/**
-	 * [formatting] Error in formatting parts of java code snippets in comment
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=44035
-	 */
-	public void testMultiLineCommentCodeSnippet2() {
-		String prefix= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + "while (i != 0) { i--; }" + postfix; //$NON-NLS-1$
-		String expected= prefix + "while (i != 0) {" + DELIMITER + INFIX + "\ti--;" + DELIMITER + INFIX + "}" + postfix; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		assertEquals(expected, testFormat(input));
-	}
-	
-	public void testMultiLineCommentCodeSnippet3() {
-		String input= PREFIX + DELIMITER + "<pre>" + DELIMITER + "while (i != 0)" + DELIMITER + "i--;" + DELIMITER + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		String expected= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX + "while (i != 0)" + DELIMITER + INFIX + "\ti--;" + DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		assertEquals(expected, testFormat(input));
-	}
-	
-	public void testMultiLineCommentCodeSnippetHtmlEntities1() {
-		String prefix= PREFIX + DELIMITER + INFIX + "<pre>" + DELIMITER + INFIX; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "</pre>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + "System.out.println(\"test\");" + postfix; //$NON-NLS-1$
-		String expected= prefix + "System.out.println(&quot;test&quot;);" + postfix; //$NON-NLS-1$
-		assertEquals(expected, testFormat(input));
-	}
-	
-	public void testMultiLineCommentIndentTabs1() {
-		String prefix= "public class Test {" + DELIMITER + "\t\t"; //$NON-NLS-1$ //$NON-NLS-2$
-		String content= PREFIX + DELIMITER + "\t\t\t" + INFIX + "test test" + DELIMITER + "\t\t\t\t" + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		String postfix= DELIMITER + "}"; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + "\t\t" + INFIX + "test test" + DELIMITER + "\t\t" + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
-		assertEquals(prefix + expected + postfix, testFormat(prefix + content + postfix, prefix.length(), content.length()));
-	}
-	
-	/**
-	 * [formatting] Comments formatter inserts tabs when it should use spaces
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=47491
-	 */
-	public void testMultiLineCommentIndentSpaces1() {
-		String prefix= "public class Test {" + DELIMITER + "\t"; //$NON-NLS-1$ //$NON-NLS-2$
-		String content= PREFIX + DELIMITER + "\t\t" + INFIX + "test test" + DELIMITER + "        " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		String postfix= DELIMITER + "}"; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + "   " + INFIX + "test test" + DELIMITER + "   " + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "3"); //$NON-NLS-1$
-		assertEquals(prefix + expected + postfix, testFormat(prefix + content + postfix, prefix.length(), content.length()));
-	}
-	
-	/**
-	 * [formatting] Repeated insertion of new line when formatting javadoc comment
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=50212
-	 */
-	public void testMultiLineCommentBlankLineAfterPre1() {
-		String input= PREFIX + DELIMITER + INFIX + "<pre></pre>" + DELIMITER  + INFIX + "test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$
-		String expected= PREFIX + DELIMITER + INFIX + "<pre></pre>" + DELIMITER + INFIX + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-		result= testFormat(result);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting][implementation] comment line length not correctly applied
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46341
-	 * Do not wrap.
-	 */
-	public void testMultiLineCommentLineBreakBeforeImmutableRegions1() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "22"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "a <code>test</code>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting][implementation] comment line length not correctly applied
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46341
-	 * Do wrap.
-	 */
-	public void testMultiLineCommentLineBreakBeforeImmutableRegions2() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "21"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "a <code>test</code>" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String expected= PREFIX + DELIMITER + INFIX + "a" + DELIMITER + INFIX + "<code>test</code>" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting][implementation] comment line length not correctly applied
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=46341
-	 * Do not wrap. (Consecutive immutable regions on multiple lines.)
-	 */
-	public void testMultiLineCommentLineBreakBeforeImmutableRegions3() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "20"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "a <code>" + DELIMITER + INFIX + "testestestestestestestestestest" + DELIMITER + INFIX + "</code>" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do not insert blank line before Javadoc tags
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags1() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_SEPARATEROOTTAGS, "false"); //$NON-NLS-1$
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, "false"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "Description" + DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do insert blank line before Javadoc tags
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags2() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_SEPARATEROOTTAGS, "true"); //$NON-NLS-1$
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, "true"); //$NON-NLS-1$
-		String prefix= PREFIX + DELIMITER + INFIX + "Description"; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + postfix;
-		String expected= prefix + DELIMITER + INFIX + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do not remove blank line before Javadoc tags
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags3() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_SEPARATEROOTTAGS, "true"); //$NON-NLS-1$
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, "true"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "Description" + DELIMITER + INFIX + DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * Prefs > Java > Code Formatter > Comments: Preview incorrect
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=55204
-	 * Do remove blank line before Javadoc tags
-	 */
-	public void testMultiLineCommentBlankLineBeforeJavadoctags4() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_SEPARATEROOTTAGS, "false"); //$NON-NLS-1$
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, "true"); //$NON-NLS-1$
-		String prefix= PREFIX + DELIMITER + INFIX + "Description"; //$NON-NLS-1$
-		String postfix= DELIMITER + INFIX + "@param test" + DELIMITER + POSTFIX; //$NON-NLS-1$
-		String input= prefix + DELIMITER + INFIX + postfix;
-		String expected= prefix + postfix;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] javadoc formatter removes blank lines between empty javadoc tags (xdoclet fails)
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68577
-	 */
-	public void testLineBreaksBetweenEmptyJavaDocTags1() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, "false"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "@custom1" + DELIMITER + INFIX + DELIMITER + INFIX + "@custom2" + DELIMITER + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-	
-	/**
-	 * [formatting] javadoc formatter removes blank lines between empty javadoc tags (xdoclet fails)
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=68577
-	 */
-	public void testLineBreaksBetweenEmptyJavaDocTags2() {
-		setUserOption(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, "false"); //$NON-NLS-1$
-		String input= PREFIX + DELIMITER + INFIX + "@custom1" + DELIMITER + INFIX + "@custom2" + DELIMITER + POSTFIX;  //$NON-NLS-1$//$NON-NLS-2$
-		String expected= input;
-		String result= testFormat(input);
-		assertEquals(expected, result);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/MultiLineTestCase.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/MultiLineTestCase.java
deleted file mode 100644
index 854d914..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/MultiLineTestCase.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.comments;
-
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
-import org.eclipse.jdt.internal.ui.text.comment.MultiCommentLine;
-
-public class MultiLineTestCase extends CommentTestCase {
-
-	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
-
-	protected static final String POSTFIX= MultiCommentLine.MULTI_COMMENT_END_PREFIX;
-
-	protected static final String PREFIX= MultiCommentLine.MULTI_COMMENT_START_PREFIX;
-
-	public static Test suite() {
-		return new TestSuite(MultiLineTestCase.class);
-	}
-
-	public MultiLineTestCase(String name) {
-		super(name);
-	}
-
-	protected String getCommentType() {
-		return IJavaPartitions.JAVA_MULTI_LINE_COMMENT;
-	}
-
-	protected Map getUserOptions() {
-		return null;
-	}
-
-	public void testSingleLineComment1() {
-		assertEquals("/*" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat("/*\t\t" + DELIMITER + "*\t test*/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-
-	public void testSingleLineComment2() {
-		assertEquals("/*" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + "test" + DELIMITER + "\t" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-
-	public void testSingleLineComment3() {
-		assertEquals("/*" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat(PREFIX + DELIMITER + "* test\t*/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testSingleLineComment4() {
-		assertEquals("/*" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX, testFormat("/*test" + DELIMITER + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	public void testSingleLineCommentSpace1() {
-		assertEquals(PREFIX + "test" + POSTFIX, testFormat("/*test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentSpace2() {
-		assertEquals(PREFIX + "test" + POSTFIX, testFormat("/*test" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentSpace3() {
-		assertEquals(PREFIX + "test" + POSTFIX, testFormat(PREFIX + "test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentSpace4() {
-		assertEquals(PREFIX + "test test" + POSTFIX, testFormat("/* test   test*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentTabs1() {
-		assertEquals(PREFIX + "test test" + POSTFIX, testFormat("/*\ttest\ttest" + POSTFIX)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testSingleLineCommentTabs2() {
-		assertEquals(PREFIX + "test test" + POSTFIX, testFormat("/*\ttest\ttest*/")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * [formatting] formatter removes last line with block comments
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=51654
-	 */
-	public void testMultiLineCommentAsterisk1() {
-		// test3 (currently) forces the comment formatter to acctually do something, it wouldn't do anything otherwise.
-		String input= PREFIX + INFIX + "test1" + DELIMITER + "test2" + INFIX + DELIMITER + "test3" + DELIMITER + "test4" + POSTFIX; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		String result= testFormat(input);
-		assertTrue(result.indexOf("test1") != -1); //$NON-NLS-1$
-		assertTrue(result.indexOf("test2") != -1); //$NON-NLS-1$
-		assertTrue(result.indexOf("test3") != -1); //$NON-NLS-1$
-		assertTrue(result.indexOf("test4") != -1); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/SingleLineTestCase.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/SingleLineTestCase.java
deleted file mode 100644
index 64ca7a7..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/comments/SingleLineTestCase.java
+++ /dev/null

@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.comments;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
-import org.eclipse.jdt.internal.ui.text.comment.SingleCommentLine;
-
-public class SingleLineTestCase extends CommentTestCase {
-
-	protected static final String PREFIX= SingleCommentLine.SINGLE_COMMENT_PREFIX;
-
-	public static Test suite() {
-		return new TestSuite(SingleLineTestCase.class);
-	}
-
-	private Map fMap= null;
-
-	public SingleLineTestCase(String name) {
-		super(name);
-	}
-
-	protected String getCommentType() {
-		return IJavaPartitions.JAVA_SINGLE_LINE_COMMENT;
-	}
-
-	protected Map getUserOptions() {
-		return fMap;
-	}
-
-	public void testClearBlankLines1() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "5"); //$NON-NLS-1$
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, IPreferenceStore.FALSE);
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest" + DELIMITER + "//" + DELIMITER + "//\t\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-		fMap= null;
-	}
-
-	public void testClearBlankLines2() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "5"); //$NON-NLS-1$
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, IPreferenceStore.FALSE);
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\t\ttest" + DELIMITER + PREFIX + DELIMITER + "//\t\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-		fMap= null;
-	}
-
-	public void testClearBlankLines3() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "5"); //$NON-NLS-1$
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_CLEARBLANKLINES, IPreferenceStore.FALSE);
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest" + DELIMITER + "//" + DELIMITER + PREFIX + "test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-		fMap= null;
-	}
-
-	public void testCommentBegin1() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat("//test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentBegin2() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat(PREFIX + "test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentBegin3() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat("//\t\ttest " + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentDelimiter1() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat("//\t\ttest " + DELIMITER + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentDelimiter2() {
-		assertEquals(PREFIX + "test" + DELIMITER, testFormat(PREFIX + "test " + DELIMITER + DELIMITER + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentNls1() {
-		assertEquals("//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$", testFormat("//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentNls2() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "1"); //$NON-NLS-1$
-		assertEquals("//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$", testFormat("//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$")); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap= null;
-	}
-
-	public void testCommentNls3() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "5"); //$NON-NLS-1$
-		assertEquals("//$NON-NLS-1", testFormat("//$NON-NLS-1")); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap= null;
-	}
-
-	public void testCommentNls4() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "5"); //$NON-NLS-1$
-		assertEquals("//$NON-NLS-4", testFormat("//$NON-NLS-4")); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap= null;
-	}
-
-	public void testCommentNls5() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "-2"); //$NON-NLS-1$
-		assertEquals("//$NON-NLS-15$", testFormat("//$NON-NLS-15$")); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap= null;
-	}
-
-	public void testCommentSpace1() {
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat("//test\t \t test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentSpace2() {
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat("//test test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentSpace3() {
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat(PREFIX + "test \t    \t test")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void testCommentWrapping1() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "5"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		fMap= null;
-	}
-
-	public void testCommentWrapping2() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "1"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		fMap= null;
-	}
-
-	public void testCommentWrapping3() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "32"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat("//test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		fMap= null;
-	}
-
-	public void testCommentWrapping4() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "32"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test" + DELIMITER, testFormat("//test\ttest" + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		fMap= null;
-	}
-
-	public void testHeaderComment1() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_FORMATHEADER, IPreferenceStore.FALSE);
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "12"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test" + DELIMITER + PREFIX + "test test" + DELIMITER + PREFIX + "test test" + DELIMITER, testFormat("//test\t\t\t\ttest" + DELIMITER + PREFIX + "test test test test")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		fMap= null;
-	}
-
-	public void testHeaderComment2() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_FORMATHEADER, IPreferenceStore.FALSE);
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "24"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test test test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\t\t\t" + DELIMITER + PREFIX + "test test test test" + DELIMITER)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		fMap= null;
-	}
-
-	public void testIllegalLineLength1() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "1"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		fMap= null;
-	}
-
-	public void testIllegalLineLength2() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "-16"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat(PREFIX + "\t\t test\ttest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		fMap= null;
-	}
-
-	public void testMultipleComments1() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "5"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test test" + DELIMITER + PREFIX + "test test test test")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-		fMap= null;
-	}
-
-	public void testMultipleComments2() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "12"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test test" + DELIMITER + PREFIX + "test test" + DELIMITER + PREFIX + "test test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//test test\ttest" + DELIMITER + PREFIX + DELIMITER + PREFIX + "test test test test")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-		fMap= null;
-	}
-
-	public void testMultipleComments3() {
-		fMap= new HashMap();
-		fMap.put(PreferenceConstants.FORMATTER_COMMENT_LINELENGTH, "11"); //$NON-NLS-1$
-		assertEquals(PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER + PREFIX + "test" + DELIMITER, testFormat("//   test\t\t\ttest\ttest" + DELIMITER + PREFIX + "test test test test")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-		fMap= null;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/Condition.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/Condition.java
deleted file mode 100644
index e258763..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/Condition.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-public abstract class Condition {
-
-	public abstract boolean isTrue();
-	
-	public boolean isStrict() {
-		return false;
-	}
-	
-	public boolean busyWaitFor(long maxTime) {
-		return busyWaitFor(maxTime, isStrict());
-	}
-	
-	public boolean busyWaitFor(long maxTime, boolean strict) {
-		long maxEndTime= System.currentTimeMillis() + maxTime;
-		while (System.currentTimeMillis() < maxEndTime)
-			if (isTrue())
-				return !strict || System.currentTimeMillis() < maxEndTime;
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EditorTestHelper.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EditorTestHelper.java
deleted file mode 100644
index 8bd4e38..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EditorTestHelper.java
+++ /dev/null

@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.performance;
-
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.text.tests.Accessor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.reconciler.AbstractReconciler;
-import org.eclipse.jface.text.source.SourceViewer;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.ITypeNameRequestor;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-
-import org.eclipse.jdt.internal.corext.util.AllTypesCache;
-
-import org.eclipse.jdt.internal.ui.text.JavaReconciler;
-
-
-/**
- * @since 3.1
- */
-public class EditorTestHelper {
-
-	private static class Requestor implements ITypeNameRequestor {
-		public void acceptClass(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-		}
-		public void acceptInterface(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-		}
-	}
-	
-	public static IEditorPart openInEditor(IFile file, boolean runEventLoop) throws PartInitException {
-		IEditorPart part= IDE.openEditor(getActivePage(), file);
-		if (runEventLoop)
-			runEventQueue(part);
-		return part;
-	}
-
-	public static IEditorPart openInEditor(IFile file, String editorId, boolean runEventLoop) throws PartInitException {
-		IEditorPart part= IDE.openEditor(getActivePage(), file, editorId);
-		if (runEventLoop)
-			runEventQueue(part);
-		return part;
-	}
-
-	public static IDocument getDocument(ITextEditor editor) {
-		IDocumentProvider provider= editor.getDocumentProvider();
-		IEditorInput input= editor.getEditorInput();
-		return provider.getDocument(input);
-	}
-
-	public static void revertEditor(ITextEditor editor, boolean runEventQueue) {
-		editor.doRevertToSaved();
-		if (runEventQueue)
-			runEventQueue(editor);
-	}
-	
-	public static void closeAllEditors() {
-		IWorkbenchPage page= getActivePage();
-		if (page != null)
-			page.closeAllEditors(false);
-	}
-	
-	public static void runEventQueue() {
-		IWorkbenchWindow window= getActiveWorkbenchWindow();
-		if (window != null)
-			runEventQueue(window.getShell());
-	}
-	
-	public static void runEventQueue(IWorkbenchPart part) {
-		runEventQueue(part.getSite().getShell());
-	}
-	
-	public static void runEventQueue(Shell shell) {
-		while (shell.getDisplay().readAndDispatch());
-	}
-	
-	public static void runEventQueue(long minTime) {
-		long nextCheck= System.currentTimeMillis() + minTime;
-		while (System.currentTimeMillis() < nextCheck) {
-			runEventQueue();
-			sleep(1);
-		}
-	}
-	
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public static IWorkbenchPage getActivePage() {
-		IWorkbenchWindow window= getActiveWorkbenchWindow();
-		return window != null ? window.getActivePage() : null;
-	}
-
-	public static Display getActiveDisplay() {
-		IWorkbenchWindow window= getActiveWorkbenchWindow();
-		return window != null ? window.getShell().getDisplay() : null;
-	}
-
-	public void joinBackgroundActivities(SourceViewer sourceViewer) throws CoreException {
-		joinBackgroundActivities();
-		joinReconciler(sourceViewer, 0, Long.MAX_VALUE, 500);
-	}
-	
-	public void joinBackgroundActivities() throws CoreException {
-		// Join Building
-		boolean interrupted= true;
-		while (interrupted) {
-			try {
-				Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-				interrupted= false;
-			} catch (InterruptedException e) {
-				interrupted= true;
-			}
-		}
-		// Join indexing
-		new SearchEngine().searchAllTypeNames(
-			null,
-			null,
-			SearchPattern.R_EXACT_MATCH,
-			IJavaSearchConstants.CLASS,
-			SearchEngine.createJavaSearchScope(new IJavaElement[0]),
-			new Requestor(),
-			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-			null);
-		// Join all types cache
-		AllTypesCache.getTypes(SearchEngine.createJavaSearchScope(new IJavaElement[0]), 
-			IJavaSearchConstants.CLASS, new NullProgressMonitor(), new ArrayList());
-		// Join jobs
-		joinJobs(0, Long.MAX_VALUE, 500);
-	}
-	
-	public static boolean joinJobs(long minTime, long maxTime, long intervalTime) {
-		long startTime= System.currentTimeMillis() + minTime;
-		runEventQueue();
-		while (System.currentTimeMillis() < startTime)
-			runEventQueue(intervalTime);
-		
-		long endTime= maxTime > 0 ? System.currentTimeMillis() + maxTime : Long.MAX_VALUE;
-		boolean calm= allJobsQuiet();
-		while (!calm && System.currentTimeMillis() < endTime) {
-			runEventQueue(intervalTime);
-			calm= allJobsQuiet();
-		}
-//		System.out.println("--------------------------------------------------");
-		return calm;
-	}
-
-	public static void sleep(int intervalTime) {
-		try {
-			Thread.sleep(intervalTime);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static boolean allJobsQuiet() {
-		IJobManager jobManager= Platform.getJobManager();
-		Job[] jobs= jobManager.find(null);
-		for (int i= 0; i < jobs.length; i++) {
-			Job job= jobs[i];
-			int state= job.getState();
-//			System.out.println(job.getName() + ": " + getStateName(state));
-			if (state == Job.RUNNING || state == Job.WAITING) {
-//				System.out.println();
-				return false;
-			}
-		}
-//		System.out.println();
-		return true;
-	}
-
-//	private static String getStateName(int state) {
-//		switch (state) {
-//			case Job.RUNNING: return "RUNNING";
-//			case Job.WAITING: return "WAITING";
-//			case Job.SLEEPING: return "SLEEPING";
-//			case Job.NONE: return "NONE";
-//			default: return "unknown " + state;
-//		}
-//	}
-
-	public static boolean showView(String viewId) throws PartInitException {
-		IWorkbenchPage activePage= getActivePage();
-		IViewReference view= activePage.findViewReference(viewId);
-		boolean notShown= view == null;
-		if (notShown)
-			activePage.showView(viewId);
-		return notShown;
-	}
-
-	public static boolean hideView(String viewId) {
-		IWorkbenchPage activePage= getActivePage();
-		IViewReference view= activePage.findViewReference(viewId);
-		boolean shown= view != null;
-		if (shown)
-			activePage.hideView(view);
-		return shown;
-	}
-
-	public static void bringToTop() {
-		getActiveWorkbenchWindow().getShell().forceActive();
-	}
-	
-	public static void forceReconcile(SourceViewer sourceViewer) {
-		Accessor reconcilerAccessor= new Accessor(getReconciler(sourceViewer), AbstractReconciler.class);
-		reconcilerAccessor.invoke("forceReconciling", new Object[0]);
-	}
-	
-	public static boolean joinReconciler(SourceViewer sourceViewer, long minTime, long maxTime, long intervalTime) {
-		if (minTime > 0)
-			runEventQueue(minTime);
-		
-		long endTime= maxTime > 0 ? System.currentTimeMillis() + maxTime : Long.MAX_VALUE;
-		AbstractReconciler reconciler= getReconciler(sourceViewer);
-		Accessor backgroundThreadAccessor= getBackgroundThreadAccessor(reconciler);
-		Accessor javaReconcilerAccessor= null;
-		if (reconciler instanceof JavaReconciler)
-			javaReconcilerAccessor= new Accessor(reconciler, JavaReconciler.class);
-		boolean isRunning= isRunning(javaReconcilerAccessor, backgroundThreadAccessor);
-		while (isRunning && System.currentTimeMillis() < endTime) {
-			runEventQueue(intervalTime);
-			isRunning= isRunning(javaReconcilerAccessor, backgroundThreadAccessor);
-		}
-		return !isRunning;
-	}
-
-	public static AbstractReconciler getReconciler(SourceViewer sourceViewer) {
-		return (AbstractReconciler) new Accessor(sourceViewer, SourceViewer.class).get("fReconciler");
-	}
-
-	public static SourceViewer getSourceViewer(AbstractTextEditor editor) {
-		SourceViewer sourceViewer= (SourceViewer) new Accessor(editor, AbstractTextEditor.class).invoke("getSourceViewer", new Object[0]);
-		return sourceViewer;
-	}
-
-	private static Accessor getBackgroundThreadAccessor(AbstractReconciler reconciler) {
-		Object backgroundThread= new Accessor(reconciler, AbstractReconciler.class).get("fThread");
-		return new Accessor(backgroundThread, backgroundThread.getClass());
-	}
-
-	private static boolean isRunning(Accessor javaReconcilerAccessor, Accessor backgroundThreadAccessor) {
-		return (javaReconcilerAccessor != null ? !isInitialProcessDone(javaReconcilerAccessor) : false) || isDirty(backgroundThreadAccessor) || isActive(backgroundThreadAccessor);
-	}
-
-	private static boolean isInitialProcessDone(Accessor javaReconcilerAccessor) {
-		return ((Boolean) javaReconcilerAccessor.get("fIninitalProcessDone")).booleanValue();
-	}
-
-	private static boolean isDirty(Accessor backgroundThreadAccessor) {
-		return ((Boolean) backgroundThreadAccessor.invoke("isDirty", new Object[0])).booleanValue();
-	}
-
-	private static boolean isActive(Accessor backgroundThreadAccessor) {
-		return ((Boolean) backgroundThreadAccessor.invoke("isActive", new Object[0])).booleanValue();
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EmptyTestCase.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EmptyTestCase.java
deleted file mode 100644
index 0e5559b..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EmptyTestCase.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class EmptyTestCase extends TestCase {
-
-	public static Test suite() {
-		return new TestSuite(EmptyTestCase.class);
-	}
-	
-	public void test() {}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java
deleted file mode 100644
index fe1dcf1..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Depends on {@link PerformanceTestSetup}, which is currently run by
- * {@link PerformanceTestSuite}. {@link PerformanceTestSuite} precedes
- * this suite in the test.xml.
- * 
- * @since 3.1
- */
-public class EventDrivenTestSuite extends TestSuite {
-
-	public static Test suite() {
-		return new EventDrivenTestSuite();
-	}
-	
-	public EventDrivenTestSuite() {
-		addTestSuite(ScrollJavaEditorTest.class);
-		addTestSuite(ScrollTextEditorTest.class);
-		addTestSuite(JavaIndenterTest.class);
-		addTestSuite(NonInitialTypingTest.class);
-		addTestSuite(OpenPreferencePageTest.class);
-		addTestSuite(ScrollAnnotatedJavaEditorTest.class);
-		// TODO: enable when Bug 72244: "Posting mouse events locks up event handling" is fixed
-		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=72244
-//		addTestSuite(MouseScrollJavaEditorTest.class);
-//		addTestSuite(MouseScrollTextEditorTest.class);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/FileTool.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/FileTool.java
deleted file mode 100644
index 0bd658a..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/FileTool.java
+++ /dev/null

@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-
-public class FileTool {
-	
-	/**
-	 * A buffer.
-	 */
-	private static byte[] buffer = new byte[8192];
-	/**
-	 * Unzips the given zip file to the given destination directory
-	 * extracting only those entries the pass through the given
-	 * filter.
-	 * 
-	 * @param filter filters out unwanted zip entries
-	 * @param zipFile the zip file to unzip
-	 * @param dstDir the destination directory
-	 */
-	public static void unzip(ZipFile zipFile, File dstDir) throws IOException {
-		unzip(zipFile, dstDir, dstDir, 0);
-	}
-	
-	private static void unzip(ZipFile zipFile, File rootDstDir, File dstDir, int depth) throws IOException {
-	
-		Enumeration entries = zipFile.entries();
-	
-		try {
-			while(entries.hasMoreElements()){
-				ZipEntry entry = (ZipEntry)entries.nextElement();
-				if(entry.isDirectory()){
-					continue;
-				}
-				String entryName = entry.getName();
-				File file = new File(dstDir, changeSeparator(entryName, '/', File.separatorChar));
-				file.getParentFile().mkdirs();
-				InputStream src = null;
-				OutputStream dst = null;
-				try {
-					src = zipFile.getInputStream(entry);
-					dst = new FileOutputStream(file);
-					transferData(src, dst);
-				} finally {
-					if(dst != null){
-						try {
-							dst.close();
-						} catch(IOException e){
-						}
-					}
-					if(src != null){
-						try {
-							src.close();
-						} catch(IOException e){
-						}
-					}
-				}
-			}
-		} finally {
-			try {
-				zipFile.close();
-			} catch(IOException e){
-			}
-		}
-	}
-	/**
-	 * Returns the given file path with its separator
-	 * character changed from the given old separator to the
-	 * given new separator.
-	 * 
-	 * @param path a file path
-	 * @param oldSeparator a path separator character
-	 * @param newSeparator a path separator character
-	 * @return the file path with its separator character
-	 * changed from the given old separator to the given new
-	 * separator
-	 */
-	public static String changeSeparator(String path, char oldSeparator, char newSeparator){
-		return path.replace(oldSeparator, newSeparator);
-	}
-	/**
-	 * Copies all bytes in the given source file to
-	 * the given destination file.
-	 * 
-	 * @param source the given source file
-	 * @param destination the given destination file
-	 */
-	public static void transferData(File source, File destination) throws IOException {
-		destination.getParentFile().mkdirs();
-		InputStream is = null;
-		OutputStream os = null;
-		try {
-			is = new FileInputStream(source);
-			os = new FileOutputStream(destination);
-			transferData(is, os);
-		} finally {
-			if(os != null){
-				try {
-					os.close();
-				} catch(IOException e){
-				}
-			}
-			if(is != null){
-				try {
-					is.close();
-				} catch(IOException e){
-				}
-			}
-		}
-	}
-	/**
-	 * Copies all bytes in the given source stream to
-	 * the given destination stream. Neither streams
-	 * are closed.
-	 * 
-	 * @param source the given source stream
-	 * @param destination the given destination stream
-	 */
-	public static void transferData(InputStream source, OutputStream destination) throws IOException {
-		int bytesRead = 0;
-		while(bytesRead != -1){
-			bytesRead = source.read(buffer, 0, buffer.length);
-			if(bytesRead != -1){
-				destination.write(buffer, 0, bytesRead);
-			}
-		}
-	}
-
-	/**
-	 * Copies the given source file to the given destination file.
-	 * 
-	 * @param src the given source file
-	 * @param dst the given destination file
-	 */
-	public static void copy(File src, File dst) throws IOException {
-		if(src.isDirectory()){
-			String[] srcChildren = src.list();
-			for(int i = 0; i < srcChildren.length; ++i){
-				File srcChild= new File(src, srcChildren[i]);
-				File dstChild= new File(dst, srcChildren[i]);
-				copy(srcChild, dstChild);
-			}
-		} else
-			transferData(src, dst);
-	}
-
-	public static File getFileInPlugin(Plugin plugin, IPath path) {
-		try {
-			URL installURL= plugin.getBundle().getEntry(path.toString());
-			URL localURL= Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-
-	public static StringBuffer read(String fileName) throws IOException {
-		return read(new FileReader(fileName));
-	}
-
-	public static StringBuffer read(Reader reader) throws IOException {
-		StringBuffer s= new StringBuffer();
-		try {
-			char[] buffer= new char[8196];
-			int chars= reader.read(buffer);
-			while (chars != -1) {
-				s.append(buffer, 0, chars);
-				chars= reader.read(buffer);
-			}
-		} finally {
-			try {
-				reader.close();
-			} catch (IOException e) {
-			}
-		}
-		return s;
-	}
-
-	public static void write(String fileName, StringBuffer content) throws IOException {
-		Writer writer= new FileWriter(fileName);
-		try {
-			writer.write(content.toString());
-		} finally {
-			try {
-				writer.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/JavaIndenterTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/JavaIndenterTest.java
deleted file mode 100644
index ad8d65b..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/JavaIndenterTest.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.jface.action.IAction;
-
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-
-public class JavaIndenterTest extends TestCase {
-	
-	private static final String FILE= "org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java";
-
-	private static final int N_OF_RUNS= 2;
-
-	private static final int[] CTRL_END= new int[] { SWT.CTRL, SWT.END };
-	
-	private PerformanceMeter fPerformanceMeter;
-
-	private ITextEditor fEditor;
-
-	protected void setUp() throws Exception {
-		EditorTestHelper.runEventQueue();
-		Performance performance= Performance.getDefault();
-		fPerformanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-		
-		EditorTestHelper.bringToTop();
-		fEditor= (ITextEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile(FILE), true);
-		runAction(fEditor.getAction(ITextEditorActionConstants.SELECT_ALL));
-		runAction(fEditor.getAction("ToggleComment"));
-		SWTEventHelper.pressKeyCodeCombination(EditorTestHelper.getActiveDisplay(), CTRL_END);
-		EditorTestHelper.joinJobs(2000, 5000, 100);
-	}
-
-	protected void tearDown() throws Exception {
-		EditorTestHelper.closeAllEditors();
-		fPerformanceMeter.dispose();
-	}
-	
-	public void testJavaIndenter1() {
-		// cold run
-		measureJavaIndenter();
-	}
-
-	public void testJavaIndenter2() {
-		// warm run
-		measureJavaIndenter();
-	}
-
-	private void measureJavaIndenter() {
-		IDocument document= ((JavaEditor) fEditor).getViewer().getDocument();
-		Display display= EditorTestHelper.getActiveDisplay();
-		IAction undo= fEditor.getAction(ITextEditorActionConstants.UNDO);
-		int originalNumberOfLines= document.getNumberOfLines();
-		for (int i= 0; i < N_OF_RUNS; i++) {
-			fPerformanceMeter.start();
-			SWTEventHelper.pressKeyCode(display, SWT.CR);
-			fPerformanceMeter.stop();
-			assertEquals(originalNumberOfLines + 1, document.getNumberOfLines());
-			runAction(undo);
-			assertEquals(originalNumberOfLines, document.getNumberOfLines());
-			sleep(2000); // NOTE: runnables posted from other threads, while the main thread waits here, are executed and measured only in the next iteration
-		}
-		fPerformanceMeter.commit();
-		Performance.getDefault().assertPerformance(fPerformanceMeter);
-	}
-
-	private void runAction(IAction action) {
-		action.run();
-		EditorTestHelper.runEventQueue();
-	}
-
-	private synchronized void sleep(int time) {
-		try {
-			wait(time);
-		} catch (InterruptedException e) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java
deleted file mode 100644
index d150ca2..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java
+++ /dev/null

@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-
-/**
- * @since 3.1
- */
-public class KeyboardProbe {
-	
-	private static final boolean TRACE= false;
-	private static final char FAKE_CHAR= '$';
-	
-	public static void main(String[] args) {
-		new KeyboardProbe().getKeycodes();
-	}
-	
-	private Display fDisplay;
-	private char[][] fCodes= null;
-	private int fKeyCode;
-	private static final int NONE= 0;
-	private static final int SHIFT= 1;
-	private boolean fKeyContinue;
-	private boolean fTextContinue;
-	private boolean fDisposeDisplay= false;
-	private Shell fShell;
-	
-	/**
-	 * Returns the characters being input into a text component by injecting key
-	 * events into the system event queue. For each character, the array holds
-	 * the resulting character when pressed alone and when pressed together with
-	 * shift.
-	 * 
-	 * @return the characters input by pressing the keys. The key code is the
-	 *         index into the array.
-	 */
-	public synchronized char[][] getKeycodes() {
-		if (fCodes == null) {
-			try {
-				probe();
-			} finally {
-				if (fDisposeDisplay && fDisplay != null) {
-					fDisplay.dispose();
-				}
-				fDisplay= null;
-				
-				if (fShell != null && !fShell.isDisposed()) {
-					fShell.dispose();
-				}
-				fShell= null;
-			}
-		}
-		return fCodes;
-	}
-	
-	/**
-	 * Returns the character resulting from pressing the character 'key' with
-	 * or without shift being pressed.
-	 * 
-	 * @param key the key to press
-	 * @param pressShift whether pressed together with shift
-	 * @return the char resulting from the given key combo, or 0 if there is no equivalent
-	 */
-	public char getCharForKeybinding(char key, boolean pressShift) {
-		char[][] keycodes= getKeycodes();
-		if (key < keycodes.length)
-			return keycodes[key][pressShift ? SHIFT : NONE];
-		else
-			return 0;
-	}
-	
-	/**
-	 * Returns a keybinding combo that will produce the wanted character. Note
-	 * that there may be more than one combo that can produce the wanted
-	 * binding, any one is returned. The last integer in the returned array is
-	 * a character that must be set to the Event.character field, any integers 
-	 * before are SWT constants describing modifier keys that must be pressed
-	 * to get the desired result.
-	 * 
-	 * @param expected the char to be input
-	 * @return the corresponding key combo, or an empty array if there is no combo
-	 */
-	public int[] getKeybindingForChar(char expected) {
-		char[][] keycodes= getKeycodes();
-		for (int i= 0; i < keycodes.length; i++) {
-			if (keycodes[i][NONE] == expected)
-				return new int[] {i};
-			else if (keycodes[i][SHIFT] == expected)
-				return new int[] { SWT.SHIFT, i };
-		}
-		return new int[0];
-	}
-	
-	/**
-	 * Presses a key combination such that the expected character is input by
-	 * simulating key events on the given display. Returns <code>true</code>
-	 * if a key combo could be found, <code>false</code> if not.
-	 * 
-	 * @param expected the expected character
-	 * @param display the display to simulate the events on
-	 * @return <code>true</code> if there was a key combo to press,
-	 *         <code>false</code> if <code>expected</code> has no combo on
-	 *         the current keyboard layout.
-	 */
-	public boolean pressChar(char expected, Display display) {
-		return pressChar(expected, new int[0], display);
-	}
-	
-	/**
-	 * Presses a key combination such that the expected character is input by
-	 * simulating key events on the given display. Returns <code>true</code>
-	 * if a key combo could be found, <code>false</code> if not.
-	 * 
-	 * @param expected the expected character
-	 * @param modifiers additional modifiers to press
-	 * @param display the display to simulate the events on
-	 * @return <code>true</code> if there was a key combo to press,
-	 *         <code>false</code> if <code>expected</code> has no combo on
-	 *         the current keyboard layout.
-	 */
-	public boolean pressChar(char expected, int[] modifiers, Display display) {
-		int[] charkeys= getKeybindingForChar(expected);
-		int[] combo= new int[charkeys.length + modifiers.length];
-		System.arraycopy(modifiers, 0, combo, 0, modifiers.length);
-		System.arraycopy(charkeys, 0, combo, modifiers.length, charkeys.length);
-		
-		for (int i= 0; i <= combo.length - 2; i++) {
-			Event event= new Event();
-			event.type= SWT.KeyDown;
-			event.keyCode= combo[i];
-			display.post(event);
-		}
-		
-		if (combo.length > 0) {
-			Event event= new Event();
-			event.type= SWT.KeyDown;
-			event.character= (char) combo[combo.length - 1];
-			display.post(event);
-			
-			event.type= SWT.KeyUp;
-			display.post(event);
-		}
-		
-		for (int i= combo.length - 2; i >= 0; i--) {
-			Event event= new Event();
-			event.type= SWT.KeyUp;
-			event.keyCode= combo[i];
-			display.post(event);
-		}
-		
-		return combo.length > 0;
-	}
-	
-	void probe() {
-		fCodes= new char[128][];
-		
-		fDisplay= createDisplay();
-		Text text= createControl(fDisplay);
-		
-		for (fKeyCode= 0; fKeyCode < 128; fKeyCode++) {
-			fCodes[fKeyCode]= new char[2];
-			
-			postNaturalKeyPress(fKeyCode);
-			char c= getContent(text);
-			if (TRACE) System.out.println("" + fKeyCode + "content[NONE]: " + c);
-			fCodes[fKeyCode][NONE]= c;
-			clearText(text);
-			
-			postShiftKeyPress(fKeyCode);
-			c= getContent(text);
-			if (TRACE) System.out.println("" + fKeyCode + "content[SHIFT]: " + c);
-			fCodes[fKeyCode][SHIFT]= c;
-			clearText(text);
-
-		}
-		
-	}
-	
-	private char getContent(Text text) {
-		String content= text.getText();
-		char c;
-		if (content.length() == 2) {
-			c= content.charAt(0);
-			if (TRACE && content.charAt(1) != FAKE_CHAR)
-				System.out.println("second char was '" + content.charAt(1) + "'");
-		} else if (content.length() > 2) {
-			c= content.charAt(0);
-			if (TRACE) System.out.println("rest content was '" + content.substring(1) + "'");			
-		} else if (content.length() == 1) {
-			c= '\0';
-			if (TRACE && content.charAt(0) != FAKE_CHAR)
-				System.out.println("second char was '" + content.charAt(0) + "'");
-		} else {
-			c= '\0';
-			if (TRACE) System.out.println("no content");
-		}
-		return c;
-	}
-
-	private void clearText(Text text) {
-		fTextContinue= false;
-		text.setText("");
-		do
-			driveEventQueue();
-		while (!fTextContinue && fDisplay.sleep());
-	}
-
-	private Display createDisplay() {
-		Display display= Display.getCurrent();
-		if (display == null) {
-			display= Display.getDefault();
-			fDisposeDisplay= true;
-		}
-		return display;
-	}
-	
-	private void addListeners(Text control) {
-		control.addListener(SWT.KeyDown, new Listener() {
-			public void handleEvent(Event event) {
-				onKeyDown(event);
-			}
-		});
-		control.addListener(SWT.KeyUp, new Listener() {
-			public void handleEvent(Event event) {
-				onKeyUp(event);
-			}
-		});
-		control.addListener(SWT.Modify, new Listener() {
-			
-			public void handleEvent(Event event) {
-				onModify(event);
-			}
-		});
-	}
-	
-	private Text createControl(Display display) {
-		fShell= new Shell(display);
-		fShell.setActive();
-		fShell.setSize(300, 200);
-		fShell.setText("Keyboard Probe"); //$NON-NLS-1$
-		fShell.setLayout(new FillLayout());
-		Text text= new Text(fShell, SWT.MULTI | SWT.LEFT | SWT.WRAP);
-		text.setSize(300, 200);
-		fShell.setVisible(true);
-		addListeners(text);
-		
-		text.setFocus();
-		return text;
-	}
-	
-	private void postNaturalKeyPress(int i) {
-		
-		fKeyContinue= false;
-		
-		Event event= new Event();
-		event.type= SWT.KeyDown;
-		event.keyCode= i;
-		event.character= (char) i;
-		fDisplay.post(event);
-		
-		event.type= SWT.KeyUp;
-		fDisplay.post(event);
-		
-		Event event2= new Event();
-		event2.type= SWT.KeyDown;
-//		event2.keyCode= i;
-		event2.character= FAKE_CHAR;
-		fDisplay.post(event2);
-		
-		event2.type= SWT.KeyUp;
-		fDisplay.post(event2);
-		
-		do
-			driveEventQueue();
-		while (!fKeyContinue && fDisplay.sleep());
-
-	}
-	
-	private void postShiftKeyPress(int i) {
-		fKeyContinue= false;
-		
-		Event shift= new Event();
-		shift.type= SWT.KeyDown;
-		shift.keyCode= SWT.SHIFT;
-		fDisplay.post(shift);
-		
-		Event event= new Event();
-		event.type= SWT.KeyDown;
-		event.character= (char) i;
-		fDisplay.post(event);
-		
-		event.type= SWT.KeyUp;
-		fDisplay.post(event);
-		
-		shift.type= SWT.KeyUp;
-		fDisplay.post(shift);
-		
-		Event event2= new Event();
-		event2.type= SWT.KeyDown;
-		event2.character= FAKE_CHAR;
-		fDisplay.post(event2);
-		
-		event2.type= SWT.KeyUp;
-		fDisplay.post(event2);
-		
-		do
-			driveEventQueue();
-		while (!fKeyContinue && fDisplay.sleep());
-	}
-	
-	private boolean fShiftPressed= false;
-	
-	private void onKeyDown(Event event) {
-		if (event.keyCode == SWT.SHIFT)
-			fShiftPressed= true;
-	}
-	
-	private void onKeyUp(Event event) {
-		if (!fShiftPressed || event.keyCode == SWT.SHIFT)
-			fKeyContinue= true;
-		fShiftPressed= false;
-	}
-	
-	private void onModify(Event event) {
-		fTextContinue= true;
-	}
-	
-	private void driveEventQueue() {
-		while (fDisplay.readAndDispatch());
-	}
-	
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollEditorTest.java
deleted file mode 100644
index 145b14e..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollEditorTest.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-public abstract class MouseScrollEditorTest extends TestCase {
-	
-	public static abstract class Poster {
-		
-		public abstract void initializeFromForeground(StyledText text);
-		
-		public abstract void initializeFromBackground();
-		
-		public abstract void driveFromBackground();
-	}
-	
-	public static class ThumbScrollPoster extends Poster {
-
-		private Display fDisplay;
-
-		private Point fThumb;
-
-		public void initializeFromForeground(StyledText text) {
-			fDisplay= text.getDisplay();
-			Rectangle textBounds= fDisplay.map(text.getParent(), null, text.getBounds());
-			int thumbX= textBounds.width - (text.getVerticalBar().getSize().x >> 1);
-			int thumbY= text.computeTrim(0, 0, 0, 0).height + 2;
-			fThumb= fDisplay.map(text, null, thumbX, thumbY);
-		}
-
-		public void initializeFromBackground() {
-			SWTEventHelper.mouseMoveEvent(fDisplay, fThumb.x, fThumb.y++, false);
-			SWTEventHelper.mouseDownEvent(fDisplay, 1, false);
-		}
-		
-		public void driveFromBackground() {
-			SWTEventHelper.mouseMoveEvent(fDisplay, fThumb.x, fThumb.y++, false);
-		}
-	}
-
-	public static class AutoScrollPoster extends Poster {
-
-		private Display fDisplay;
-		
-		private Rectangle fTextBounds;
-
-		public void initializeFromForeground(StyledText text) {
-			fDisplay= text.getDisplay();
-			fTextBounds= fDisplay.map(text.getParent(), null, text.getBounds());
-		}
-
-		public void initializeFromBackground() {
-			SWTEventHelper.mouseMoveEvent(fDisplay, fTextBounds.x + 1, fTextBounds.y + 1, false);
-			SWTEventHelper.mouseDownEvent(fDisplay, 1, false);
-			SWTEventHelper.mouseMoveEvent(fDisplay, fTextBounds.x + 1, fTextBounds.y + fTextBounds.height + 1, false);
-			SWTEventHelper.mouseMoveEvent(fDisplay, fTextBounds.x + 2, fTextBounds.y + fTextBounds.height + 1, false); // needed for GTK
-		}
-		
-		public void driveFromBackground() {
-		}
-	}
-
-	private PerformanceMeter fPerformanceMeter;
-
-	private volatile boolean fDone;
-
-	private Display fDisplay;
-
-	private StyledText fText;
-
-	private int fMaxTopPixel;
-	
-	private Poster fPoster;
-
-	private Error fBackgroundError;
-
-	private Runnable fThreadRunnable= new Runnable() {
-		private volatile int fTopPixel;
-		private int fOldTopPixel;
-		private Runnable fRunnable= new Runnable() {
-			public void run() {
-				fTopPixel= fText.getTopPixel();
-			}
-		};
-		private Condition fCondition= new Condition() {
-			public boolean isTrue() {
-				fDisplay.syncExec(fRunnable);
-				return fOldTopPixel != fTopPixel;
-			}
-		};
-		public void run() {
-			try {
-				fTopPixel= 0;
-				fPoster.initializeFromBackground();
-				while (fTopPixel < fMaxTopPixel) {
-					fPoster.driveFromBackground();
-					fOldTopPixel= fTopPixel;
-					assertTrue(fCondition.busyWaitFor(1000));
-				}
-			} catch (Error e) {
-				fBackgroundError= e;
-				throw e;
-			} finally {
-				SWTEventHelper.mouseUpEvent(fDisplay, 1, false);
-				fDone= true;
-				fDisplay.wake();
-			}
-		}
-	};
-
-	protected void setUp() throws Exception {
-		Performance performance= Performance.getDefault();
-		fPerformanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-		EditorTestHelper.bringToTop();
-	}
-
-	protected void tearDown() throws Exception {
-		fPerformanceMeter.dispose();
-	}
-
-	protected void measureScrolling(int nOfRuns, Poster poster, IFile file) throws PartInitException {
-		try {
-			IEditorPart editor= EditorTestHelper.openInEditor(file, true);
-			EditorTestHelper.joinJobs(5000, 10000, 100);
-			
-			fText= (StyledText) editor.getAdapter(Control.class);
-			fDisplay= fText.getDisplay();
-			
-			fText.setTopPixel(Integer.MAX_VALUE);
-			fMaxTopPixel= fText.getTopPixel();
-			fText.setTopPixel(0);
-			EditorTestHelper.joinJobs(100, 1000, 100);
-			
-			fPoster= poster;
-			
-			for (int i= 0; i < nOfRuns; i++) {
-				fPoster.initializeFromForeground(fText);
-				
-				fDone= false;
-				new Thread(fThreadRunnable).start();
-				fPerformanceMeter.start();
-				while (!fDone)
-					if (!fDisplay.readAndDispatch())
-						fDisplay.sleep();
-				if (fBackgroundError != null)
-					throw fBackgroundError;
-				fPerformanceMeter.stop();
-				assertEquals(fMaxTopPixel, fText.getTopPixel());
-				EditorTestHelper.joinJobs(100, 1000, 100);
-				fText.setTopPixel(0);
-				EditorTestHelper.joinJobs(100, 1000, 100);
-			}
-			fPerformanceMeter.commit();
-			Performance.getDefault().assertPerformance(fPerformanceMeter);
-		} finally {
-			EditorTestHelper.closeAllEditors();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollJavaEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollJavaEditorTest.java
deleted file mode 100644
index 0c01e88..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollJavaEditorTest.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ui.PartInitException;
-
-public class MouseScrollJavaEditorTest extends MouseScrollEditorTest {
-
-	private static final Class THIS= MouseScrollJavaEditorTest.class;
-	
-	private static final String THUMB_SCROLLING_FILE= "/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java";
-	
-	private static final String AUTO_SCROLLING_FILE= "/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java";
-	
-	private static final int N_OF_RUNS= 5;
-	
-	public static Test suite() {
-		return new TestSuite(THIS);
-	}
-	
-	public void testThumbScrollJavaEditor1() throws PartInitException {
-		measureScrolling(N_OF_RUNS, new ThumbScrollPoster(), ResourceTestHelper.findFile(THUMB_SCROLLING_FILE));
-	}
-	
-	public void testAutoScrollJavaEditor1() throws PartInitException {
-		measureScrolling(N_OF_RUNS, new AutoScrollPoster(), ResourceTestHelper.findFile(AUTO_SCROLLING_FILE));
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollTextEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollTextEditorTest.java
deleted file mode 100644
index f7d3a80..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollTextEditorTest.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-
-public class MouseScrollTextEditorTest extends MouseScrollEditorTest {
-	
-	private static final Class THIS= MouseScrollTextEditorTest.class;
-	
-	private static final String THUMB_SCROLLING_FILE_PREFIX= "/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText";
-	
-	private static final String THUMB_SCROLLING_ORIG_FILE= THUMB_SCROLLING_FILE_PREFIX + ".java";
-
-	private static final String THUMB_SCROLLING_FILE= THUMB_SCROLLING_FILE_PREFIX + ".txt";
-
-	private static final String AUTO_SCROLLING_FILE_PREFIX= "/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout";
-	
-	private static final String AUTO_SCROLLING_ORIG_FILE= AUTO_SCROLLING_FILE_PREFIX + ".java";
-
-	private static final String AUTO_SCROLLING_FILE= AUTO_SCROLLING_FILE_PREFIX + ".txt";
-
-	private static final int N_OF_RUNS= 5;
-
-	public static Test suite() {
-		return new TestSuite(THIS);
-	}
-	
-	public void testThumbScrollTextEditor1() throws CoreException {
-		try {
-			ResourceTestHelper.copy(THUMB_SCROLLING_ORIG_FILE, THUMB_SCROLLING_FILE);
-			measureScrolling(N_OF_RUNS, new ThumbScrollPoster(), ResourceTestHelper.findFile(THUMB_SCROLLING_FILE));
-		} finally {
-			ResourceTestHelper.delete(THUMB_SCROLLING_FILE);
-		}
-	}
-	
-	public void testAutoScrollTextEditor1() throws CoreException {
-		try {
-			ResourceTestHelper.copy(AUTO_SCROLLING_ORIG_FILE, AUTO_SCROLLING_FILE);
-			measureScrolling(N_OF_RUNS, new AutoScrollPoster(), ResourceTestHelper.findFile(AUTO_SCROLLING_FILE));
-		} finally {
-			ResourceTestHelper.delete(AUTO_SCROLLING_FILE);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/NonInitialTypingTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/NonInitialTypingTest.java
deleted file mode 100644
index a0f3cce..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/NonInitialTypingTest.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextSelection;
-
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Measures the time to type in one single method into a large Java class
- * @since 3.1
- */
-public class NonInitialTypingTest extends TestCase {
-	
-	private static final String FILE= "org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java";
-
-	private ITextEditor fEditor;
-	
-	private static final char[] METHOD= ("public int foobar(int iParam, Object oParam) {\r" +
-			"return 42;\r" +
-			"}\r").toCharArray();
-
-	private PerformanceMeter fMeter;
-
-	private KeyboardProbe fKeyboardProbe;
-
-	protected void setUp() throws PartInitException, BadLocationException {
-		EditorTestHelper.runEventQueue();
-		fEditor= (ITextEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile(FILE), true);
-		// dirty editor to avoid initial dirtying / validate edit costs
-		fKeyboardProbe= new KeyboardProbe();
-		dirtyEditor();
-		Performance performance= Performance.getDefault();
-		fMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-
-		int offset= getInsertPosition();
-		fEditor.getSelectionProvider().setSelection(new TextSelection(offset, 0));
-		EditorTestHelper.runEventQueue();
-		sleep(1000);
-	}
-	
-	private void dirtyEditor() {
-		fEditor.getSelectionProvider().setSelection(new TextSelection(0, 0));
-		EditorTestHelper.runEventQueue();
-		sleep(1000);
-		
-		Display display= EditorTestHelper.getActiveDisplay();
-		fKeyboardProbe.pressChar('{', display);
-		EditorTestHelper.runEventQueue();
-		SWTEventHelper.pressKeyCode(display, SWT.BS);
-		sleep(1000);
-	}
-
-	protected void tearDown() throws Exception {
-		sleep(1000);
-		fMeter.dispose();
-		EditorTestHelper.revertEditor(fEditor, true);
-		EditorTestHelper.closeAllEditors();
-	}
-
-	public void testTypeAMethod() {
-		Display display= EditorTestHelper.getActiveDisplay();
-		
-		fMeter.start();
-		for (int i= 0; i < METHOD.length; i++) {
-			fKeyboardProbe.pressChar(METHOD[i], display);
-			EditorTestHelper.runEventQueue();
-		}
-		fMeter.stop();
-		fMeter.commit();
-		Performance.getDefault().assertPerformance(fMeter);
-	}
-
-	private synchronized void sleep(int time) {
-		try {
-			wait(time);
-		} catch (InterruptedException e) {
-		}
-	}
-	
-	private int getInsertPosition() throws BadLocationException {
-		IDocument document= EditorTestHelper.getDocument(fEditor);
-		int lines= document.getNumberOfLines();
-		int offset= document.getLineOffset(lines - 2);
-		return offset;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenEditorTest.java
deleted file mode 100644
index c01c433..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenEditorTest.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.ui.PartInitException;
-
-public abstract class OpenEditorTest extends TestCase {
-	protected void measureOpenInEditor(IFile[] files) throws PartInitException {
-		Performance performance= Performance.getDefault();
-		PerformanceMeter performanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-		try {
-			for (int i= 0, n= files.length; i < n; i++) {
-				performanceMeter.start();
-				EditorTestHelper.openInEditor(files[i], true);
-				performanceMeter.stop();
-				sleep(2000); // NOTE: runnables posted from other threads, while the main thread waits here, are executed and measured only in the next iteration
-			}
-			performanceMeter.commit();
-			Performance.getDefault().assertPerformance(performanceMeter);
-		} finally {
-			performanceMeter.dispose();
-			EditorTestHelper.closeAllEditors();
-		}
-	}
-
-	private synchronized void sleep(int time) {
-		try {
-			wait(time);
-		} catch (InterruptedException e) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorStressTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorStressTest.java
deleted file mode 100644
index 5e982f8..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorStressTest.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.ide.IDE;
-
-public class OpenJavaEditorStressTest extends TestCase {
-
-	private static final String FILE= PerformanceTestSetup.PROJECT + "/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java";
-	
-	private static final int NUMBER_OF_RUNS= 100;
-
-	public void testOpenJavaEditor1() throws PartInitException {
-		IFile file= ResourceTestHelper.findFile(FILE);
-		
-		// make sure everything has been activated and loaded at least once
-		IDE.openEditor(EditorTestHelper.getActivePage(), file);
-		EditorTestHelper.closeAllEditors();
-		
-		Performance performance= Performance.getDefault();
-		PerformanceMeter performanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-		performanceMeter.start();
-		try {
-			for (int i= 0; i < NUMBER_OF_RUNS; i++) {
-				EditorTestHelper.openInEditor(file, true);
-				EditorTestHelper.closeAllEditors();
-				EditorTestHelper.runEventQueue();
-			}
-			performanceMeter.stop();
-			performanceMeter.commit();
-			performance.assertPerformanceInAbsoluteBand(performanceMeter, Dimension.USED_JAVA_HEAP, -20*1024*1024, +20*1024*1024);
-		} finally {
-			performanceMeter.dispose();
-			EditorTestHelper.closeAllEditors();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorTest.java
deleted file mode 100644
index f85eca7..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorTest.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.ui.PartInitException;
-/**
- * Opens 20 instances of org.eclipse.swt.graphics.TextLayout leaving
- * each of them open and then closes all together them (close all).
- * Then repeats above scenario.
- * <p>
- * This tests a mid-size file.
- * </p>
- *  
- * @since 3.1
- */
-public class OpenJavaEditorTest extends OpenEditorTest {
-
-	public static final int N_OF_COPIES= 20;
-	
-	public static final String PATH= "/Eclipse SWT/win32/org/eclipse/swt/graphics/";
-	
-	public static final String FILE_PREFIX= "TextLayout";
-	
-	public static final String FILE_SUFFIX= ".java";
-	
-	protected void setUp() {
-		EditorTestHelper.runEventQueue();
-	}
-
-	public void testOpenJavaEditor1() throws PartInitException {
-		// cold run
-		measureOpenInEditor(ResourceTestHelper.findFiles(PerformanceTestSetup.PROJECT + PATH + FILE_PREFIX, FILE_SUFFIX, 0, N_OF_COPIES));
-	}
-	
-	public void testOpenJavaEditor2() throws PartInitException {
-		// warm run
-		measureOpenInEditor(ResourceTestHelper.findFiles(PerformanceTestSetup.PROJECT + PATH + FILE_PREFIX, FILE_SUFFIX, 0, N_OF_COPIES));
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorTestSetup.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorTestSetup.java
deleted file mode 100644
index 57420a3..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenJavaEditorTestSetup.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-public class OpenJavaEditorTestSetup extends TestSetup {
-
-	public OpenJavaEditorTestSetup(Test test) {
-		super(test);
-	}
-
-	protected void setUp() throws Exception {
-		String src= "/" + PerformanceTestSetup.PROJECT + OpenJavaEditorTest.PATH + OpenJavaEditorTest.FILE_PREFIX + OpenJavaEditorTest.FILE_SUFFIX;
-		String destPrefix= "/" + PerformanceTestSetup.PROJECT + OpenJavaEditorTest.PATH + OpenJavaEditorTest.FILE_PREFIX;
-		String destSuffix= OpenJavaEditorTest.FILE_SUFFIX;
-		String name= OpenJavaEditorTest.FILE_PREFIX;
-		ResourceTestHelper.replicate(src, destPrefix, destSuffix, OpenJavaEditorTest.N_OF_COPIES, name, name);
-	}
-	
-	protected void tearDown() throws Exception {
-		// do nothing, the actual test runs in its own workbench
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenPreferencePageTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenPreferencePageTest.java
deleted file mode 100644
index 73e771a..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenPreferencePageTest.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.internal.IWorkbenchHelpContextIds;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.dialogs.WorkbenchPreferenceDialog;
-
-
-/**
- * @since 3.1
- */
-public class OpenPreferencePageTest extends TestCase {
-	private PerformanceMeter fMeter;
-
-	public void testOpenPreferencePage() {
-		Display display= EditorTestHelper.getActiveDisplay();
-		
-        PreferenceManager pm = WorkbenchPlugin.getDefault().getPreferenceManager();
-        assertNotNull(pm);
-        
-       	PreferenceDialog d = new WorkbenchPreferenceDialog(display.getActiveShell(), pm);
-       	d.create();
-       	WorkbenchHelp.setHelp(d.getShell(), IWorkbenchHelpContextIds.PREFERENCE_DIALOG);
-       	// HACK to get control back instantly
-       	d.setBlockOnOpen(false);
-       	d.open();
-       	
-       	EditorTestHelper.runEventQueue();
-		
-		Control control= display.getFocusControl();
-		assertTrue(control instanceof Tree);
-		Tree tree= (Tree) control;
-		TreeItem item= findTreeItem(tree.getItems(), "Java"); //$NON-NLS-1$
-		assertTrue(item != null);
-		tree.setSelection(new TreeItem[] {item});
-		EditorTestHelper.runEventQueue();
-		
-		// setExpanded does not work - use keyboard events
-		// item.setExpanded(true);
-		SWTEventHelper.pressKeyCode(display, SWT.KEYPAD_ADD);
-		EditorTestHelper.runEventQueue(200);
-
-		item= findTreeItem(item.getItems(), "Editor");
-		assertNotNull(item);
-		EditorTestHelper.runEventQueue();
-		
-		Rectangle bounds= item.getBounds();
-		Point p= new Point(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
-		p= tree.toDisplay(p);
-		Event event= new Event();
-		event.type= SWT.MouseMove;
-		event.x= p.x;
-		event.y= p.y;
-		display.post(event);
-		EditorTestHelper.runEventQueue();
-		event.type= SWT.MouseDown;
-		event.button= 1;
-		
-		fMeter.start();
-		display.post(event);
-		event.type= SWT.MouseUp;
-		display.post(event);
-		EditorTestHelper.runEventQueue();
-		fMeter.stop();
-		fMeter.commit();
-		
-		d.close();
-		
-		Performance.getDefault().assertPerformance(fMeter);
-	}
-
-	protected void setUp() throws Exception {
-		Performance performance= Performance.getDefault();
-		fMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this, "cold"));
-		EditorTestHelper.joinJobs(1000, 10000, 100);
-	}
-	
-	protected void tearDown() throws Exception {
-		fMeter.dispose();
-	}
-
-	private TreeItem findTreeItem(TreeItem[] items, String string) {
-		// depth first
-		for (int i= 0; i < items.length; i++) {
-			if (string.equals(items[i].getText()))
-				return items[i];
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenQuickOutlineTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenQuickOutlineTest.java
deleted file mode 100644
index 5103627..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenQuickOutlineTest.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.jface.action.IAction;
-
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
-
-public class OpenQuickOutlineTest extends TestCase {
-	
-	private static final String PATH= "/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/";
-	
-	private static final String ORIG_NAME= "StyledText";
-	
-	private static final String ORIG_FILE= PATH + ORIG_NAME + ".java";
-
-	private static final int N_OF_RUNS= 20;
-
-	private PerformanceMeter fFirstMeter;
-
-	private PerformanceMeter fSecondMeter;
-
-	private static final String OUTLINE_VIEW= "org.eclipse.ui.views.ContentOutline";
-
-	private boolean fWasOutlineViewShown;
-	
-	protected void setUp() throws Exception {
-		Performance performance= Performance.getDefault();
-		fFirstMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this, "cold"));
-		fSecondMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this, "warm"));
-		fWasOutlineViewShown= EditorTestHelper.hideView(OUTLINE_VIEW); // TODO: find solution to hide view in other perspectives too
-		ResourceTestHelper.replicate(ORIG_FILE, PATH + ORIG_NAME, ".java", N_OF_RUNS, ORIG_NAME, ORIG_NAME);
-		ResourceTestHelper.incrementalBuild();
-		EditorTestHelper.bringToTop();
-		EditorTestHelper.joinJobs(1000, 10000, 100);
-	}
-	
-	protected void tearDown() throws Exception {
-		for (int i= 0; i < N_OF_RUNS; i++)
-			ResourceTestHelper.delete(PATH + ORIG_NAME + i + ".java");
-		if (fWasOutlineViewShown)
-			EditorTestHelper.showView(OUTLINE_VIEW);
-		fFirstMeter.dispose();
-		fSecondMeter.dispose();
-	}
-
-	public void testOpenQuickOutline1() throws IOException, CoreException {
-		for (int i= 0; i < N_OF_RUNS; i++) {
-			String name= ORIG_NAME + i;
-			String file= PATH + name + ".java";
-			ITextEditor editor= (ITextEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile(file), true);
-			EditorTestHelper.joinJobs(5000, 10000, 100);
-			
-			measureOpenQuickOutline(editor, fFirstMeter);
-			measureOpenQuickOutline(editor, fSecondMeter);
-			
-			EditorTestHelper.closeAllEditors();
-		}
-		fFirstMeter.commit();
-		fSecondMeter.commit();
-		Performance.getDefault().assertPerformance(fFirstMeter);
-		Performance.getDefault().assertPerformance(fSecondMeter);
-	}
-
-	private void measureOpenQuickOutline(ITextEditor editor, PerformanceMeter performanceMeter) {
-		IAction showOutline= editor.getAction(IJavaEditorActionDefinitionIds.SHOW_OUTLINE);
-		EditorTestHelper.joinJobs(500, 1000, 100);
-		performanceMeter.start();
-		runAction(showOutline);
-		performanceMeter.stop();
-		Shell shell= EditorTestHelper.getActiveDisplay().getActiveShell();
-		assertEquals("", shell.getText());
-		shell.close();
-		shell= EditorTestHelper.getActiveDisplay().getActiveShell();
-		assertFalse("".equals(shell.getText()));
-	}
-
-	private void runAction(IAction action) {
-		action.run();
-		EditorTestHelper.runEventQueue();
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenTextEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenTextEditorTest.java
deleted file mode 100644
index 102a8d5..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenTextEditorTest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.ui.PartInitException;
-
-/**
- * Opens 20 instances of org.eclipse.swt.graphics.TextLayout leaving
- * each of them open and then closes all together them (close all).
- * Then repeats above scenario.
- * <p>
- * This tests a mid-size file.
- * </p> 
- * 
- * @since 3.1
- */
-public class OpenTextEditorTest extends OpenEditorTest {
-
-	public static final int N_OF_COPIES= 20;
-	
-	public static final String PATH= "/Eclipse SWT/win32/org/eclipse/swt/graphics/";
-	
-	public static final String FILE_PREFIX= "TextLayout";
-	
-	public static final String FILE_SUFFIX= ".txt";
-	
-	public static final String ORIG_FILE= PATH + FILE_PREFIX + ".java";
-	
-	protected void setUp() {
-		EditorTestHelper.runEventQueue();
-	}
-
-	public void testOpenTextEditor1() throws PartInitException {
-		// cold run
-		measureOpenInEditor(ResourceTestHelper.findFiles(PerformanceTestSetup.PROJECT + PATH + FILE_PREFIX, FILE_SUFFIX, 0, N_OF_COPIES));
-	}
-	public void testOpenTextEditor2() throws PartInitException {
-		// warm run
-		measureOpenInEditor(ResourceTestHelper.findFiles(PerformanceTestSetup.PROJECT + PATH + FILE_PREFIX, FILE_SUFFIX, 0, N_OF_COPIES));
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenTextEditorTestSetup.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenTextEditorTestSetup.java
deleted file mode 100644
index 29b5828..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/OpenTextEditorTestSetup.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-public class OpenTextEditorTestSetup extends TestSetup {
-
-	public OpenTextEditorTestSetup(Test test) {
-		super(test);
-	}
-
-	protected void setUp() throws Exception {
-		ResourceTestHelper.replicate("/" + PerformanceTestSetup.PROJECT + OpenTextEditorTest.ORIG_FILE, "/" + PerformanceTestSetup.PROJECT + OpenTextEditorTest.PATH + OpenTextEditorTest.FILE_PREFIX, OpenTextEditorTest.FILE_SUFFIX, OpenTextEditorTest.N_OF_COPIES);
-	}
-	
-	protected void tearDown() {
-		// do nothing, the actual test runs in its own workbench
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestCase.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestCase.java
deleted file mode 100644
index 17a8fe1..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestCase.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import junit.framework.TestCase;
-
-public class PerformanceTestCase extends TestCase {
-	
-	protected void runTest() throws Throwable {
-		Performance performance= Performance.getDefault();
-		PerformanceMeter meter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-		try {
-			meter.start();
-			super.runTest();
-			meter.stop();
-			meter.commit();
-			Performance.getDefault().assertPerformance(meter);
-		} finally {
-			meter.dispose();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestSetup.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestSetup.java
deleted file mode 100644
index dd28970..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestSetup.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.text.tests.JdtTextTestPlugin;
-
-public class PerformanceTestSetup extends TestSetup {
-
-	private static final String PERSPECTIVE= "org.eclipse.jdt.ui.JavaPerspective";
-
-	public static final String PROJECT= "org.eclipse.swt";
-	
-	private static final String PROJECT_ZIP= "/testResources/org.eclipse.swt-R3_0.zip";
-
-	private static final String INTRO_VIEW= "org.eclipse.ui.internal.introview";
-	
-	public PerformanceTestSetup(Test test) {
-		super(test);
-	}
-
-	/*
-	 * @see junit.extensions.TestSetup#setUp()
-	 */
-	protected void setUp() throws Exception {
-		IWorkbench workbench= PlatformUI.getWorkbench();
-		IWorkbenchWindow activeWindow= workbench.getActiveWorkbenchWindow();
-		IWorkbenchPage activePage= activeWindow.getActivePage();
-		
-		activePage.hideView(activePage.findViewReference(INTRO_VIEW));
-		
-		workbench.showPerspective(PERSPECTIVE, activeWindow);
-		
-		boolean wasAutobuilding= ResourceTestHelper.disableAutoBuilding();
-		setUpProject();
-		ResourceTestHelper.fullBuild();
-		if (wasAutobuilding) {
-			ResourceTestHelper.enableAutoBuilding();
-			EditorTestHelper.joinJobs(2000, 30000, 1000);
-		}
-	}
-	
-	/*
-	 * @see junit.extensions.TestSetup#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		// do nothing, the set up workspace will be used by the open editor tests
-		
-		/* 
-		 * ensure the workbench state gets saved when running with the Automated Testing Framework
-                 * TODO: remove when https://bugs.eclipse.org/bugs/show_bug.cgi?id=71362 is fixed
-                 */
-		StackTraceElement[] elements=  new Throwable().getStackTrace();
-		for (int i= 0; i < elements.length; i++) {
-			StackTraceElement element= elements[i];
-			if (element.getClassName().equals("org.eclipse.test.EclipseTestRunner")) {
-				PlatformUI.getWorkbench().close();
-				break;
-			}
-		}
-	}
-	
-	private void setUpProject() throws IOException, ZipException, CoreException {
-		String workspacePath= ResourcesPlugin.getWorkspace().getRoot().getLocation().toString() + "/";
-		FileTool.unzip(new ZipFile(FileTool.getFileInPlugin(JdtTextTestPlugin.getDefault(), new Path(PROJECT_ZIP))), new File(workspacePath));
-		File oldFile= new File(workspacePath + PROJECT + "/.classpath_win32");
-		File newFile= new File(workspacePath + PROJECT + "/.classpath");
-		assertTrue(oldFile.renameTo(newFile));
-
-		IProject project= createExistingProject(PROJECT);
-		assertTrue(JavaCore.create(project).exists());
-	}
-
-	private IProject createExistingProject(String projectName) throws CoreException {
-
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IProject project= workspace.getRoot().getProject(projectName);
-		IProjectDescription description= workspace.newProjectDescription(projectName);
-		description.setLocation(null);
-
-		project.create(description, null);
-		project.open(null);
-		return project;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestSuite.java
deleted file mode 100644
index 95213ca..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/PerformanceTestSuite.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @since 3.1
- */
-public class PerformanceTestSuite extends TestSuite {
-
-	public static Test suite() {
-		return new PerformanceTestSetup(new PerformanceTestSuite());
-	}
-	
-	public PerformanceTestSuite() {
-		addTest(new OpenJavaEditorTestSetup(EmptyTestCase.suite())); // the actual test runs in its own workbench (see test.xml)
-		addTest(new OpenTextEditorTestSetup(EmptyTestCase.suite())); // the actual test runs in its own workbench (see test.xml)
-		addTestSuite(RevertTextEditorTest.class);
-		addTestSuite(RevertJavaEditorTest.class);
-		addTestSuite(ToggleCommentTest.class);
-		addTestSuite(UndoJavaEditorTest.class);
-		addTestSuite(UndoTextEditorTest.class);
-		addTestSuite(OpenQuickOutlineTest.class);
-		addTestSuite(OpenJavaEditorStressTest.class);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ResourceTestHelper.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ResourceTestHelper.java
deleted file mode 100644
index ee34a67..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ResourceTestHelper.java
+++ /dev/null

@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-public class ResourceTestHelper {
-
-	public static void replicate(String src, String destPrefix, String destSuffix, int n) throws CoreException {
-		for (int i= 0; i < n; i++)
-			copy(src, destPrefix + i + destSuffix);
-	}
-
-	public static void copy(String src, String dest) throws CoreException {
-		IFile file= getFile(src);
-		file.copy(new Path(dest), true, null);
-	}
-
-	private static IFile getFile(String path) {
-		return getRoot().getFile(new Path(path));
-	}
-
-	public static void delete(String file) throws CoreException {
-		getFile(file).delete(true, null);
-	}
-
-	public static IFile findFile(String pathStr) {
-		IFile file= getFile(pathStr);
-		Assert.assertTrue(file != null && file.exists());
-		return file;
-	}
-
-	public static IFile[] findFiles(String prefix, String suffix, int i, int n) {
-		List files= new ArrayList(n - i);
-		for (int j= i; j < i + n; j++) {
-			String path= prefix + j + suffix;
-			files.add(findFile(path));
-		}
-		return (IFile[]) files.toArray(new IFile[files.size()]);
-	}
-
-	public static StringBuffer read(String src) throws IOException, CoreException {
-		return FileTool.read(new InputStreamReader(getFile(src).getContents()));
-	}
-
-	public static void write(String dest, final String content) throws IOException, CoreException {
-		InputStream stream= new InputStream() {
-			private Reader fReader= new StringReader(content);
-			public int read() throws IOException {
-				return fReader.read();
-			}
-		};
-		getFile(dest).create(stream, true, null);
-	}
-	
-
-	public static void replicate(String src, String destPrefix, String destSuffix, int n, String srcName, String destNamePrefix) throws IOException, CoreException {
-		
-		StringBuffer s= read(src);
-		
-		List positions= identifierPositions(s, srcName);
-		
-		for (int j= 0; j < n; j++) {
-			StringBuffer c= new StringBuffer(s.toString());
-			replacePositions(c, srcName.length(), destNamePrefix + j, positions);
-			write(destPrefix + j + destSuffix, c.toString());
-		}
-	}
-
-	public static void copy(String src, String dest, String srcName, String destName) throws IOException, CoreException {
-		StringBuffer buf= read(src);
-		List positions= identifierPositions(buf, srcName);
-		replacePositions(buf, srcName.length(), destName, positions);
-		write(dest, buf.toString());
-	}
-
-	private static void replacePositions(StringBuffer c, int origLength, String string, List positions) {
-		int offset= 0;
-		for (Iterator iter= positions.iterator(); iter.hasNext();) {
-			int position= ((Integer) iter.next()).intValue();
-			c.replace(offset + position, offset + position + origLength, string);
-			offset += string.length() - origLength;
-		}
-	}
-
-	private static List identifierPositions(StringBuffer buffer, String identifier) {
-		List positions= new ArrayList();
-		int i= -1;
-		while (true) {
-			i= buffer.indexOf(identifier, i + 1);
-			if (i == -1)
-				break;
-			if (i > 0 && Character.isJavaIdentifierPart(buffer.charAt(i - 1)))
-				continue;
-			if (i < buffer.length() - 1 && Character.isJavaIdentifierPart(buffer.charAt(i + identifier.length())))
-				continue;
-			positions.add(new Integer(i));
-		}
-		return positions;
-	}
-
-	private static IWorkspaceRoot getRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-
-	public static boolean enableAutoBuilding() {
-		IWorkspaceDescription description= ResourcesPlugin.getWorkspace().getDescription();
-		boolean wasOff= !description.isAutoBuilding();
-		if (wasOff)
-			description.setAutoBuilding(true);
-		return wasOff;
-	}
-
-	public static void incrementalBuild() throws CoreException {
-		ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
-	}
-
-	public static void fullBuild() throws CoreException {
-		ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
-	}
-
-	public static boolean disableAutoBuilding() {
-		IWorkspaceDescription description= ResourcesPlugin.getWorkspace().getDescription();
-		boolean wasOn= description.isAutoBuilding();
-		if (wasOn)
-			description.setAutoBuilding(false);
-		return wasOn;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertEditorTest.java
deleted file mode 100644
index c455e01..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertEditorTest.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public abstract class RevertEditorTest extends TestCase {
-	private static final int RUNS= 20;
-	private static final String REPLACE_TEXT= "XXX"; //$NON-NLS-1$
-	
-	private PerformanceMeter fPerformanceMeter;
-	
-	protected void setUp() throws Exception {
-		Performance performance= Performance.getDefault();
-		fPerformanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-	}
-	
-	protected void measureRevert(IFile file) throws PartInitException, BadLocationException {
-		ITextEditor part= (ITextEditor) EditorTestHelper.openInEditor(file, true);
-		for (int i= 0; i < RUNS; i++) {
-			dirtyEditor(part);
-			fPerformanceMeter.start();
-			EditorTestHelper.revertEditor(part, true);
-			fPerformanceMeter.stop();
-			sleep(2000); // NOTE: runnables posted from other threads, while the main thread waits here, are executed and measured only in the next iteration
-			EditorTestHelper.runEventQueue(part);
-		}
-		
-		fPerformanceMeter.commit();
-		Performance.getDefault().assertPerformance(fPerformanceMeter);
-	}
-	
-	protected void tearDown() throws Exception {
-		fPerformanceMeter.dispose();
-		EditorTestHelper.closeAllEditors();
-	}
-
-	private synchronized void sleep(int time) {
-		try {
-			wait(time);
-		} catch (InterruptedException e) {
-		}
-	}
-
-	protected void dirtyEditor(ITextEditor part) throws BadLocationException {
-		IDocument document= EditorTestHelper.getDocument(part);
-		int line= document.getNumberOfLines() / 2; // dirty middle line
-		int offset= document.getLineOffset(line);
-		document.replace(offset, 0, REPLACE_TEXT);
-		EditorTestHelper.runEventQueue(part);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertJavaEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertJavaEditorTest.java
deleted file mode 100644
index 07abb98..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertJavaEditorTest.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.jface.text.BadLocationException;
-
-import org.eclipse.ui.PartInitException;
-
-
-/**
- * @since 3.1
- */
-public class RevertJavaEditorTest extends RevertEditorTest {
-
-	private static final String PATH= "/Eclipse SWT/win32/org/eclipse/swt/graphics/";
-	private static final String FILE_PREFIX= "TextLayout";
-	private static final String FILE_SUFFIX= ".java";
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		EditorTestHelper.runEventQueue();
-	}
-
-	public void testRevertJavaEditor() throws PartInitException, BadLocationException {
-		// cold run
-		measureRevert(ResourceTestHelper.findFile(PerformanceTestSetup.PROJECT + PATH + FILE_PREFIX + FILE_SUFFIX));
-	}
-
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertTextEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertTextEditorTest.java
deleted file mode 100644
index 89106ba..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/RevertTextEditorTest.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.jface.text.BadLocationException;
-
-import org.eclipse.ui.PartInitException;
-
-
-/**
- * @since 3.1
- */
-public class RevertTextEditorTest extends RevertEditorTest {
-
-	private static final String PREFIX= "/" + PerformanceTestSetup.PROJECT + "/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout";
-	
-	private static final String ORIG_FILE= PREFIX + ".java";
-	
-	private static final String FILE= PREFIX + ".txt";
-	
-	protected void setUp() throws Exception {
-		ResourceTestHelper.copy(ORIG_FILE, FILE);
-		super.setUp();
-		EditorTestHelper.runEventQueue();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		ResourceTestHelper.delete(FILE);
-	}
-	
-	public void testRevertTextEditor() throws PartInitException, BadLocationException {
-		// cold run
-		measureRevert(ResourceTestHelper.findFile(FILE));
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/SWTEventHelper.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/SWTEventHelper.java
deleted file mode 100644
index 98e7a19..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/SWTEventHelper.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-
-
-
-/**
- * @since 3.1
- */
-public class SWTEventHelper {
-	
-	public static void pressKeyCode(Display display, int keyCode) {
-		pressKeyCode(display, keyCode, true);
-	}
-	
-	public static void pressKeyCode(Display display, int keyCode, boolean runEventQueue) {
-		keyCodeDown(display, keyCode, runEventQueue);
-		keyCodeUp(display, keyCode, runEventQueue);
-	}
-
-	public static void pressKeyCodeCombination(Display display, int[] keyCodes) {
-		pressKeyCodeCombination(display, keyCodes, true);
-	}
-	
-	public static void pressKeyCodeCombination(Display display, int[] keyCodes, boolean runEventQueue) {
-		for (int i= 0; i < keyCodes.length; i++)
-			keyCodeDown(display, keyCodes[i], runEventQueue);
-		for (int i= keyCodes.length - 1; i >= 0; i--)
-			keyCodeUp(display, keyCodes[i], runEventQueue);
-	}
-
-	private static void keyCodeDown(Display display, int keyCode, boolean runEventQueue) {
-		keyCodeEvent(display, SWT.KeyDown, keyCode, runEventQueue);
-	}
-
-	private static void keyCodeUp(Display display, int keyCode, boolean runEventQueue) {
-		keyCodeEvent(display, SWT.KeyUp, keyCode, runEventQueue);
-	}
-
-	private static Event sfKeyCodeEvent= new Event();
-	private static void keyCodeEvent(Display display, int type, int keyCode, boolean runEventQueue) {
-		sfKeyCodeEvent.type= type;
-		sfKeyCodeEvent.keyCode= keyCode;
-		
-		display.post(sfKeyCodeEvent);
-		if (runEventQueue)
-			EditorTestHelper.runEventQueue();
-	}
-	
-	private static Event sfMouseMoveEvent= new Event();
-	public static void mouseMoveEvent(Display display, int x, int y, boolean runEventQueue) {
-		sfMouseMoveEvent.type= SWT.MouseMove;
-		sfMouseMoveEvent.x= x;
-		sfMouseMoveEvent.y= y;
-		
-		display.post(sfMouseMoveEvent);
-		if (runEventQueue)
-			EditorTestHelper.runEventQueue();
-	}
-	
-	public static void mouseDownEvent(Display display, int button, boolean runEventQueue) {
-		mouseButtonEvent(display, SWT.MouseDown, button, runEventQueue);
-	}
-
-	public static void mouseUpEvent(Display display, int button, boolean runEventQueue) {
-		mouseButtonEvent(display, SWT.MouseUp, button, runEventQueue);
-	}
-
-	private static Event sfMouseButtonEvent= new Event();
-	private static void mouseButtonEvent(Display display, int type, int button, boolean runEventQueue) {
-		sfMouseButtonEvent.type= type;
-		sfMouseButtonEvent.button= button;
-		
-		display.post(sfMouseButtonEvent);
-		if (runEventQueue)
-			EditorTestHelper.runEventQueue();
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollAnnotatedJavaEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollAnnotatedJavaEditorTest.java
deleted file mode 100644
index 61490ff..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollAnnotatedJavaEditorTest.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewerExtension;
-import org.eclipse.jface.text.source.ISourceViewer;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-
-public class ScrollAnnotatedJavaEditorTest extends ScrollEditorTest {
-
-	private static final String PAGE_SCROLLING_FILE= "/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java";
-
-	private static final String LINE_SCROLLING_FILE= "/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java";
-
-	private static final int N_OF_RUNS= 3;
-
-	protected void setUp(IEditorPart editor) throws Exception {
-		super.setUp(editor);
-		createAnnotations(editor);
-		EditorTestHelper.joinJobs(1000, 20000, 100);
-	}
-	
-	private void createAnnotations(IEditorPart editor) throws BadLocationException, JavaModelException {
-		// produce a lot of annotations: rename all declarations
-		ITextViewerExtension extension= null;
-		JavaEditor javaEditor= (JavaEditor) editor;
-		ISourceViewer viewer= javaEditor.getViewer();
-		if (viewer instanceof ITextViewerExtension) {
-			extension= (ITextViewerExtension) viewer;
-			extension.getRewriteTarget().beginCompoundChange();
-		}
-		try {
-			IDocument document= EditorTestHelper.getDocument((ITextEditor) editor);
-			ICompilationUnit unit= JavaPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(javaEditor.getEditorInput());
-			IType[] allTypes= unit.getAllTypes();
-			for (int i= 0; i < allTypes.length; i++) {
-				IType type= allTypes[i];
-				renameMemberDecls(document, type.getMethods());
-				renameMemberDecls(document, type.getFields());
-			}
-		} finally {
-			if (extension != null)
-				extension.getRewriteTarget().endCompoundChange();
-		}
-		
-	}
-
-	private void renameMemberDecls(IDocument document, IMember[] members) throws JavaModelException, BadLocationException {
-		for (int j= 0; j < members.length; j++) {
-			IMember member= members[j];
-			ISourceRange range= member.getNameRange();
-			if (range != null)
-				document.replace(range.getOffset(), 2, "XX");
-		}
-	}
-
-	protected void tearDown(IEditorPart editor) throws Exception {
-		super.tearDown(editor);
-		if (editor instanceof ITextEditor)
-			EditorTestHelper.revertEditor((ITextEditor) editor, true);
-	}
-	
-	public void testScrollJavaEditorLineWise1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_NO_CARET_MOVE, false, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorPageWise() throws Exception {
-		measureScrolling(PAGE_SCROLLING_FILE, PAGE_WISE, false, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorLineWisePreloaded1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_NO_CARET_MOVE, true, N_OF_RUNS);
-	}
-	
-	public void testScrollJavaEditorPageWisePreloaded1() throws Exception {
-		measureScrolling(PAGE_SCROLLING_FILE, PAGE_WISE, true, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorLineWiseMoveCaret1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE, false, N_OF_RUNS);
-	}
-	
-	public void testScrollJavaEditorLineWiseMoveCaretPreloaded1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE, true, N_OF_RUNS);
-	}
-	
-	public void testScrollJavaEditorLineWiseSelect1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_SELECT, false, N_OF_RUNS);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollEditorTest.java
deleted file mode 100644
index 423dac0..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollEditorTest.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.ui.IEditorPart;
-
-public abstract class ScrollEditorTest extends TestCase {
-	
-	private static final int[] CTRL_HOME= new int[] { SWT.CTRL, SWT.HOME };
-	private static final int[] CTRL_DOWN= new int[] { SWT.CTRL, SWT.ARROW_DOWN };
-	private static final int[] PG_DOWN= new int[] { SWT.PAGE_DOWN };
-	private static final int[] SHIFT_PG_DOWN= new int[] { SWT.SHIFT, SWT.PAGE_DOWN };
-	private static final int[] DOWN= new int[] { SWT.ARROW_DOWN };
-	private static final int[] SHIFT_DOWN= new int[] { SWT.SHIFT, SWT.ARROW_DOWN };
-	private static final int[] PG_UP= new int[] { SWT.PAGE_UP };
-	
-	protected abstract static class ScrollingMode {
-		ScrollingMode(int[] scroll_combo, int[] home_combo) {
-			super();
-			SCROLL_COMBO= scroll_combo;
-			HOME_COMBO= home_combo;
-		}
-		final int[] SCROLL_COMBO;
-		final int[] HOME_COMBO;
-		abstract int computeOperations(int numberOfLines, int visibleLines);
-	}
-	
-	public static final ScrollingMode PAGE_WISE= new ScrollingMode(PG_DOWN, CTRL_HOME) {
-		int computeOperations(int numberOfLines, int visibleLines) {
-			return numberOfLines / visibleLines;
-		}
-	};
-	public static final ScrollingMode PAGE_WISE_SELECT= new ScrollingMode(SHIFT_PG_DOWN, CTRL_HOME) {
-		int computeOperations(int numberOfLines, int visibleLines) {
-			return numberOfLines / visibleLines;
-		}
-	};
-	public static final ScrollingMode LINE_WISE_NO_CARET_MOVE= new ScrollingMode(CTRL_DOWN, PG_UP) {
-		int computeOperations(int numberOfLines, int visibleLines) {
-			return numberOfLines - visibleLines;
-		}
-	};
-	public static final ScrollingMode LINE_WISE= new ScrollingMode(DOWN, CTRL_HOME) {
-		int computeOperations(int numberOfLines, int visibleLines) {
-			return numberOfLines - 1;
-		}
-	};
-	public static final ScrollingMode LINE_WISE_SELECT= new ScrollingMode(SHIFT_DOWN, CTRL_HOME) {
-		int computeOperations(int numberOfLines, int visibleLines) {
-			return numberOfLines - 1;
-		}
-	};
-	
-	private PerformanceMeter fPerformanceMeter;
-	
-	protected void setUp() throws Exception {
-		Performance performance= Performance.getDefault();
-		fPerformanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-		EditorTestHelper.bringToTop();
-	}
-	
-	protected void tearDown() throws Exception {
-		fPerformanceMeter.dispose();
-	}
-	
-	protected void measureScrolling(String file, ScrollingMode mode, boolean preload, int nOfRuns) throws Exception {
-		IEditorPart editor= null;
-		try {
-			editor= EditorTestHelper.openInEditor(ResourceTestHelper.findFile(file), true);
-			EditorTestHelper.joinJobs(3000, 10000, 100);
-			
-			setUp(editor);
-			
-			Display display= EditorTestHelper.getActiveDisplay();
-			
-			StyledText text= (StyledText) editor.getAdapter(Control.class);
-			int numberOfLines= text.getLineCount();
-			int visibleLinesInViewport= text.getClientArea().height / text.getLineHeight();
-			int operations= mode.computeOperations(numberOfLines, visibleLinesInViewport);
-			
-			for (int i= 0; i < nOfRuns; i++) {
-				if (preload) {
-					for (int j= 0; j < operations; j++) {
-						// avoid overhead: assertTrue(text.getTopIndex() + visibleLinesInViewport < numberOfLines - 1);
-						SWTEventHelper.pressKeyCodeCombination(display, mode.SCROLL_COMBO, false);
-					}
-					fPerformanceMeter.start();
-					EditorTestHelper.runEventQueue(100);
-					fPerformanceMeter.stop();
-				} else {
-					fPerformanceMeter.start();
-					for (int j= 0; j < operations; j++) {
-						// avoid overhead: assertTrue(text.getTopIndex() + visibleLinesInViewport < numberOfLines - 1);
-						SWTEventHelper.pressKeyCodeCombination(display, mode.SCROLL_COMBO);
-					}
-					fPerformanceMeter.stop();
-					EditorTestHelper.runEventQueue(100);
-				}
-				assertTrue("TopIndex: "+text.getTopIndex() + " visibleLines: "+visibleLinesInViewport + " totalLines: " + numberOfLines + " operations: " + operations, text.getTopIndex() + visibleLinesInViewport >= numberOfLines - 1);
-				SWTEventHelper.pressKeyCodeCombination(display, mode.HOME_COMBO);
-				EditorTestHelper.runEventQueue(100);
-				assertEquals(0, text.getTopIndex());
-			}
-			fPerformanceMeter.commit();
-			Performance.getDefault().assertPerformance(fPerformanceMeter);
-		} finally {
-			tearDown(editor);
-			EditorTestHelper.closeAllEditors();
-		}
-	}
-
-	protected void setUp(IEditorPart editor) throws Exception {
-	}
-
-	protected void tearDown(IEditorPart editor) throws Exception {
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollJavaEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollJavaEditorTest.java
deleted file mode 100644
index 530fd4c..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollJavaEditorTest.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-public class ScrollJavaEditorTest extends ScrollEditorTest {
-	
-	private static final String PAGE_SCROLLING_FILE= "/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java";
-
-	private static final String LINE_SCROLLING_FILE= "/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java";
-
-	private static final int N_OF_RUNS= 3;
-
-	public void testScrollJavaEditorLineWise1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_NO_CARET_MOVE, false, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorLineWise2() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_NO_CARET_MOVE, false, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorPageWise() throws Exception {
-		measureScrolling(PAGE_SCROLLING_FILE, PAGE_WISE, false, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorLineWisePreloaded1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_NO_CARET_MOVE, true, N_OF_RUNS);
-	}
-	
-	public void testScrollJavaEditorLineWisePreloaded2() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_NO_CARET_MOVE, true, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorPageWisePreloaded1() throws Exception {
-		measureScrolling(PAGE_SCROLLING_FILE, PAGE_WISE, true, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorPageWisePreloaded2() throws Exception {
-		measureScrolling(PAGE_SCROLLING_FILE, PAGE_WISE, true, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorLineWiseMoveCaret1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE, false, N_OF_RUNS);
-	}
-	
-	public void testScrollJavaEditorLineWiseMoveCaret2() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE, false, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorLineWiseMoveCaretPreloaded1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE, true, N_OF_RUNS);
-	}
-	
-	public void testScrollJavaEditorLineWiseMoveCaretPreloaded2() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE, true, N_OF_RUNS);
-	}
-
-	public void testScrollJavaEditorLineWiseSelect1() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_SELECT, false, N_OF_RUNS);
-	}
-	
-	public void testScrollJavaEditorLineWiseSelect2() throws Exception {
-		measureScrolling(LINE_SCROLLING_FILE, LINE_WISE_SELECT, false, N_OF_RUNS);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollTextEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollTextEditorTest.java
deleted file mode 100644
index 73802d4..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollTextEditorTest.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-
-public class ScrollTextEditorTest extends ScrollEditorTest {
-	
-	private static final String PAGE_FILE_PREFIX= "/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText";
-	
-	private static final String ORIG_PAGE_FILE= PAGE_FILE_PREFIX + ".java";
-	
-	private static final String PAGE_FILE= PAGE_FILE_PREFIX + ".txt";
-	
-	private static final String LINE_FILE_PREFIX= "/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout";
-	
-	private static final String ORIG_LINE_FILE= LINE_FILE_PREFIX + ".java";
-	
-	private static final String LINE_FILE= LINE_FILE_PREFIX + ".txt";
-	
-	private static final int N_OF_RUNS= 3;
-	
-	public void testScrollTextEditorLineWise1() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE_NO_CARET_MOVE, false, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWise2() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE_NO_CARET_MOVE, false, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorPageWise() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_PAGE_FILE, PAGE_FILE);
-			measureScrolling(PAGE_FILE, PAGE_WISE, false, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(PAGE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWisePreloaded1() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE_NO_CARET_MOVE, true, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWisePreloaded2() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE_NO_CARET_MOVE, true, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorPageWisePreloaded1() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_PAGE_FILE, PAGE_FILE);
-			measureScrolling(PAGE_FILE, PAGE_WISE, true, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(PAGE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorPageWisePreloaded2() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_PAGE_FILE, PAGE_FILE);
-			measureScrolling(PAGE_FILE, PAGE_WISE, true, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(PAGE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWiseMoveCaret1() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE, false, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWiseMoveCaret2() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE, false, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWiseMoveCaretPreloaded1() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE, true, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWiseMoveCaretPreloaded2() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE, true, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWiseSelect1() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE_SELECT, false, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-	
-	public void testScrollTextEditorLineWiseSelect2() throws Exception {
-		try {
-			ResourceTestHelper.copy(ORIG_LINE_FILE, LINE_FILE);
-			measureScrolling(LINE_FILE, LINE_WISE_SELECT, false, N_OF_RUNS);
-		} finally {
-			ResourceTestHelper.delete(LINE_FILE);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ToggleCommentTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ToggleCommentTest.java
deleted file mode 100644
index 4a7fe3a..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ToggleCommentTest.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import junit.framework.TestCase;
-
-import org.eclipse.jface.action.IAction;
-
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-
-public class ToggleCommentTest extends TestCase {
-	
-	private static final String FILE= "org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java";
-
-	private static final int N_OF_RUNS= 5;
-
-	private PerformanceMeter fCommentMeter;
-
-	private PerformanceMeter fUncommentMeter;
-
-	private ITextEditor fEditor;
-
-	protected void setUp() throws Exception {
-		Performance performance= Performance.getDefault();
-		fCommentMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this, "comment"));
-		fUncommentMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this, "uncomment"));
-		fEditor= (ITextEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile(FILE), true);
-		runAction(fEditor.getAction(ITextEditorActionConstants.SELECT_ALL));
-	}
-	
-	protected void tearDown() throws Exception {
-		EditorTestHelper.closeAllEditors();
-		fCommentMeter.dispose();
-		fUncommentMeter.dispose();
-	}
-
-	public void testToggleComment1() throws PartInitException {
-		// cold run
-		measureToggleComment();
-	}
-
-	public void testToggleComment2() throws PartInitException {
-		// warm run
-		measureToggleComment();
-	}
-
-	private void measureToggleComment() throws PartInitException {
-		IAction toggleComment= fEditor.getAction("ToggleComment");
-		for (int i= 0; i < N_OF_RUNS; i++) {
-			fCommentMeter.start();
-			runAction(toggleComment);
-			fCommentMeter.stop();
-			sleep(5000);
-			fUncommentMeter.start();
-			runAction(toggleComment);
-			fUncommentMeter.stop();
-			sleep(5000);
-		}
-		fCommentMeter.commit();
-		fUncommentMeter.commit();
-		Performance.getDefault().assertPerformance(fCommentMeter);
-		Performance.getDefault().assertPerformance(fUncommentMeter);
-	}
-
-	private void runAction(IAction action) {
-		action.run();
-		EditorTestHelper.runEventQueue();
-	}
-
-	private synchronized void sleep(int time) {
-		try {
-			wait(time);
-		} catch (InterruptedException e) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoEditorTest.java
deleted file mode 100644
index 7c2ff72..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoEditorTest.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-import org.eclipse.jface.action.IAction;
-
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-
-public abstract class UndoEditorTest extends TestCase {
-
-	private PerformanceMeter fPerformanceMeter;
-
-	protected void setUp() throws Exception {
-		Performance performance= Performance.getDefault();
-		fPerformanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-		EditorTestHelper.runEventQueue();
-	}
-
-	protected void tearDown() throws Exception {
-		EditorTestHelper.closeAllEditors();
-		fPerformanceMeter.dispose();
-	}
-	
-	protected void measureUndo(IFile file, int nOfRuns) throws PartInitException {
-		AbstractDecoratedTextEditor editor= (AbstractDecoratedTextEditor) EditorTestHelper.openInEditor(file, true);
-		editor.showChangeInformation(false); // TODO: remove when undo does no longer trigger timing issue
-		
-		IAction selectAll= editor.getAction(ITextEditorActionConstants.SELECT_ALL);
-		IAction shiftRight= editor.getAction(ITextEditorActionConstants.SHIFT_RIGHT);
-		IAction undo= editor.getAction(ITextEditorActionConstants.UNDO);
-		for (int i= 0; i < nOfRuns; i++) {
-			runAction(selectAll);
-			runAction(shiftRight);
-			sleep(5000);
-			EditorTestHelper.runEventQueue();
-			fPerformanceMeter.start();
-			runAction(undo);
-			fPerformanceMeter.stop();
-			sleep(5000); // NOTE: runnables posted from other threads, while the main thread waits here, are not measured at all
-		}
-		fPerformanceMeter.commit();
-		Performance.getDefault().assertPerformance(fPerformanceMeter);
-	}
-
-	private void runAction(IAction action) {
-		action.run();
-		EditorTestHelper.runEventQueue();
-	}
-
-	private synchronized void sleep(int time) {
-		try {
-			wait(time);
-		} catch (InterruptedException e) {
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoJavaEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoJavaEditorTest.java
deleted file mode 100644
index ab87467..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoJavaEditorTest.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.ui.PartInitException;
-
-public class UndoJavaEditorTest extends UndoEditorTest {
-	
-	private static final String FILE= "org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java";
-
-	private static final int N_OF_RUNS= 2;
-
-	public void testUndoJavaEditor1() throws PartInitException {
-		measureUndo(ResourceTestHelper.findFile(FILE), N_OF_RUNS);
-	}
-
-	public void testUndoJavaEditor2() throws PartInitException {
-		measureUndo(ResourceTestHelper.findFile(FILE), N_OF_RUNS);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoTextEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoTextEditorTest.java
deleted file mode 100644
index a28f00d..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/UndoTextEditorTest.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.performance;
-
-import org.eclipse.ui.PartInitException;
-
-public class UndoTextEditorTest extends UndoEditorTest {
-	
-	private static final String FILE_PREFIX= "/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText";
-	
-	private static final String ORIG_FILE= FILE_PREFIX + ".java";
-
-	private static final String FILE= FILE_PREFIX + ".txt";
-
-	private static final int N_OF_RUNS= 2;
-
-	protected void setUp() throws Exception {
-		ResourceTestHelper.copy(ORIG_FILE, FILE);
-		super.setUp();
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		ResourceTestHelper.delete(FILE);
-	}
-	
-	public void testUndoTextEditor1() throws PartInitException {
-		measureUndo(ResourceTestHelper.findFile(FILE), N_OF_RUNS);
-	}
-
-	public void testUndoTextEditor2() throws PartInitException {
-		measureUndo(ResourceTestHelper.findFile(FILE), N_OF_RUNS);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/spelling/SpellCheckEngineTestCase.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/spelling/SpellCheckEngineTestCase.java
deleted file mode 100644
index d698c60..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/spelling/SpellCheckEngineTestCase.java
+++ /dev/null

@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.text.tests.spelling;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceStore;
-
-import org.eclipse.jdt.internal.ui.text.spelling.SpellCheckEngine;
-import org.eclipse.jdt.internal.ui.text.spelling.engine.AbstractSpellDictionary;
-import org.eclipse.jdt.internal.ui.text.spelling.engine.DefaultPhoneticDistanceAlgorithm;
-import org.eclipse.jdt.internal.ui.text.spelling.engine.ISpellCheckEngine;
-import org.eclipse.jdt.internal.ui.text.spelling.engine.ISpellChecker;
-import org.eclipse.jdt.internal.ui.text.spelling.engine.RankedWordProposal;
-
-public class SpellCheckEngineTestCase extends TestCase {
-
-	protected static class TestDictionary extends AbstractSpellDictionary {
-
-		/*
-		 * @see org.eclipse.jdt.ui.text.spelling.engine.ISpellDictionary#addWord(java.lang.String)
-		 */
-		public void addWord(String word) {
-			hashWord(word);
-		}
-
-		/*
-		 * @see org.eclipse.jdt.ui.text.spelling.engine.AbstractSpellDictionary#getURL()
-		 */
-		protected URL getURL() throws MalformedURLException {
-			return getClass().getResource("Dictionary"); //$NON-NLS-1$
-		}
-	}
-
-	public static final String GLOBAL= "Global"; //$NON-NLS-1$
-	public static final String LASTWAGEN= "Lastwagen"; //$NON-NLS-1$
-	public static final String LORRY= "Lorry"; //$NON-NLS-1$
-	public static final String SENTENCECONTENT= "sentence"; //$NON-NLS-1$
-	public static final String SENTENCESTART= "Sentence"; //$NON-NLS-1$
-	public static final String TRUCK= "Truck"; //$NON-NLS-1$
-
-	public static Test suite() {
-		return new TestSuite(SpellCheckEngineTestCase.class);
-	}
-
-	private final TestDictionary fDEDictionary= new TestDictionary();
-	private final ISpellCheckEngine fEngine= SpellCheckEngine.getInstance();
-	private final TestDictionary fGlobalDictionary= new TestDictionary();
-	private final IPreferenceStore fPreferences= new PreferenceStore();
-	private final TestDictionary fUKDictionary= new TestDictionary();
-	private final TestDictionary fUSDictionary= new TestDictionary();
-
-	public SpellCheckEngineTestCase(String name) {
-		super(name);
-	}
-
-	protected final boolean contains(Set words, String word) {
-
-		RankedWordProposal proposal= null;
-		for (final Iterator iterator= words.iterator(); iterator.hasNext();) {
-
-			proposal= (RankedWordProposal)iterator.next();
-			if (proposal.getText().equals(word))
-				return true;
-		}
-		return false;
-	}
-
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		fUSDictionary.addWord(TRUCK);
-		fUKDictionary.addWord(LORRY);
-		fDEDictionary.addWord(LASTWAGEN);
-		fGlobalDictionary.addWord(GLOBAL);
-
-		fEngine.registerDictionary(Locale.US, fUSDictionary);
-		fEngine.registerDictionary(Locale.UK, fUKDictionary);
-		fEngine.registerDictionary(Locale.GERMANY, fDEDictionary);
-		fEngine.registerDictionary(fGlobalDictionary);
-	}
-
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-
-		fUSDictionary.unload();
-		fUKDictionary.unload();
-		fDEDictionary.unload();
-		fGlobalDictionary.unload();
-
-		fEngine.unregisterDictionary(fUSDictionary);
-		fEngine.unregisterDictionary(fUKDictionary);
-		fEngine.unregisterDictionary(fDEDictionary);
-		fEngine.unregisterDictionary(fGlobalDictionary);
-	}
-
-	public void testAvailableLocales() {
-		final Set result= SpellCheckEngine.getAvailableLocales();
-		assertTrue(result.size() >= 0);
-	}
-
-	public void testDefaultLocale() {
-		assertTrue(SpellCheckEngine.getDefaultLocale().equals(Locale.getDefault()));
-	}
-
-	public void testDefaultSpellChecker() {
-
-		fEngine.unregisterDictionary(fUSDictionary);
-
-		final ISpellChecker checker= fEngine.createSpellChecker(SpellCheckEngine.getDefaultLocale(), fPreferences);
-		assertNotNull(checker);
-
-		assertFalse(checker.isCorrect(TRUCK));
-		assertFalse(checker.isCorrect(LORRY));
-		assertFalse(checker.isCorrect(LASTWAGEN));
-		assertTrue(checker.isCorrect(GLOBAL));
-		fEngine.registerDictionary(Locale.US, fUSDictionary);
-
-		assertFalse(checker.isCorrect(TRUCK));
-		fUSDictionary.addWord(TRUCK);
-
-		assertFalse(checker.isCorrect(LORRY));
-		assertFalse(checker.isCorrect(LASTWAGEN));
-		assertTrue(checker.isCorrect(GLOBAL));
-	}
-
-	public void testDESpellChecker() {
-
-		final ISpellChecker checker= fEngine.createSpellChecker(Locale.GERMANY, fPreferences);
-		assertNotNull(checker);
-
-		assertFalse(checker.isCorrect(TRUCK));
-		assertTrue(checker.isCorrect(GLOBAL));
-		assertFalse(checker.isCorrect(LORRY));
-		assertTrue(checker.isCorrect(LASTWAGEN));
-
-		assertTrue(fDEDictionary.isLoaded());
-		assertTrue(fGlobalDictionary.isLoaded());
-	}
-
-	public void testIgnoredWord() {
-
-		final ISpellChecker checker= fEngine.createSpellChecker(Locale.US, fPreferences);
-		assertNotNull(checker);
-
-		assertFalse(checker.isCorrect(LORRY));
-		checker.ignoreWord(LORRY);
-		assertTrue(checker.isCorrect(LORRY));
-		checker.checkWord(LORRY);
-		assertFalse(checker.isCorrect(LORRY));
-	}
-
-	public void testUKSpellChecker() {
-
-		final ISpellChecker checker= fEngine.createSpellChecker(Locale.UK, fPreferences);
-		assertNotNull(checker);
-
-		assertFalse(checker.isCorrect(TRUCK));
-		assertTrue(checker.isCorrect(GLOBAL));
-		assertTrue(checker.isCorrect(LORRY));
-		assertFalse(checker.isCorrect(LASTWAGEN));
-
-		assertTrue(fUKDictionary.isLoaded());
-		assertTrue(fGlobalDictionary.isLoaded());
-	}
-
-	public void testUnknownSpellChecker() {
-
-		final ISpellChecker checker= fEngine.createSpellChecker(Locale.CHINA, fPreferences);
-		assertNull(checker);
-	}
-
-	public void testUSSpellChecker() {
-
-		final ISpellChecker checker= fEngine.createSpellChecker(Locale.US, fPreferences);
-		assertNotNull(checker);
-
-		assertTrue(checker.isCorrect(TRUCK));
-		assertTrue(checker.isCorrect(GLOBAL));
-		assertFalse(checker.isCorrect(LORRY));
-		assertFalse(checker.isCorrect(LASTWAGEN));
-
-		assertTrue(fUSDictionary.isLoaded());
-		assertTrue(fGlobalDictionary.isLoaded());
-	}
-
-	public void testWordProposals() {
-
-		final ISpellChecker checker= fEngine.createSpellChecker(Locale.US, fPreferences);
-		assertNotNull(checker);
-
-		fUSDictionary.addWord(SENTENCESTART);
-
-		Set proposals= checker.getProposals(SENTENCESTART, true);
-		assertTrue(proposals.size() >= 1);
-
-		assertTrue(contains(proposals, SENTENCESTART));
-		assertFalse(contains(proposals, SENTENCECONTENT));
-
-		proposals= checker.getProposals(SENTENCECONTENT, true);
-		assertTrue(proposals.size() >= 1);
-
-		assertTrue(contains(proposals, SENTENCESTART));
-		assertFalse(contains(proposals, SENTENCECONTENT));
-
-		proposals= checker.getProposals(SENTENCECONTENT, false);
-		assertTrue(proposals.size() >= 1);
-
-		assertTrue(contains(proposals, SENTENCESTART));
-		assertFalse(contains(proposals, SENTENCECONTENT));
-		assertTrue(((RankedWordProposal) proposals.iterator().next()).getRank() == - DefaultPhoneticDistanceAlgorithm.COST_CASE);
-
-		fDEDictionary.addWord(SENTENCESTART);
-
-		proposals= checker.getProposals(SENTENCESTART, false);
-		assertTrue(proposals.size() >= 1);
-		assertTrue(((RankedWordProposal) proposals.iterator().next()).getRank() == 0);
-
-		proposals= checker.getProposals(SENTENCESTART, true);
-		assertTrue(proposals.size() >= 1);
-		assertTrue(((RankedWordProposal) proposals.iterator().next()).getRank() == 0);
-
-		proposals= checker.getProposals(SENTENCECONTENT, true);
-		assertTrue(proposals.size() >= 1);
-		assertTrue(((RankedWordProposal) proposals.iterator().next()).getRank() == - DefaultPhoneticDistanceAlgorithm.COST_CASE);
-
-		proposals= checker.getProposals(SENTENCECONTENT, false);
-		assertTrue(proposals.size() >= 1);
-		assertTrue(((RankedWordProposal) proposals.iterator().next()).getRank() == - DefaultPhoneticDistanceAlgorithm.COST_CASE);
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/spelling/SpellingTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/spelling/SpellingTestSuite.java
deleted file mode 100644
index b4b7e8b..0000000
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/spelling/SpellingTestSuite.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.text.tests.spelling;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Test Suite org.eclipse.jdt.text.tests.spelling.
- * 
- * @since 3.0
- */
-public class SpellingTestSuite {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite org.eclipse.jdt.text.tests.spelling"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTest(SpellCheckEngineTestCase.suite());
-		//$JUnit-END$
-		return suite;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/test.xml b/org.eclipse.jdt.text.tests/test.xml
deleted file mode 100644
index 1bd6701..0000000
--- a/org.eclipse.jdt.text.tests/test.xml
+++ /dev/null

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jdt.text.tests"/>
-  <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="jdt-text-folder" 
-              value="${eclipse-home}/jdt_text_folder"/>
-    <delete dir="${jdt-text-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-text-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.text.tests.JdtTextTestSuite"/>
-    </ant>
-  </target>
-
-  <!-- This target defines the performance tests that need to be run. -->
-  <target name="performance-suite">
-    <property name="jdt-text-performance-folder" 
-              value="${eclipse-home}/jdt_text_performance_folder"/>
-    <delete dir="${jdt-text-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-text-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.text.tests.performance.PerformanceTestSuite"/>
-    </ant>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-text-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.text.tests.performance.OpenJavaEditorTest"/>
-    </ant>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-text-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.text.tests.performance.OpenTextEditorTest"/>
-    </ant>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-text-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.text.tests.performance.EventDrivenTestSuite"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-  <!-- This target runs the performance test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="performance" depends="init,performance-suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/org.eclipse.jdt.text.tests/testResources/folderLinkTarget1/.project b/org.eclipse.jdt.text.tests/testResources/folderLinkTarget1/.project
deleted file mode 100644
index 0075097..0000000
--- a/org.eclipse.jdt.text.tests/testResources/folderLinkTarget1/.project
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>P2</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.text.tests/testResources/folderLinkTarget1/test1/test2/C.java b/org.eclipse.jdt.text.tests/testResources/folderLinkTarget1/test1/test2/C.java
deleted file mode 100644
index 0d31a80..0000000
--- a/org.eclipse.jdt.text.tests/testResources/folderLinkTarget1/test1/test2/C.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package test1.test2;
-
-public class C {
-	
-	public C() {
-		// comment
-	}
-	
-	public int getCount() {
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.text.tests/testResources/org.eclipse.swt-R3_0.zip b/org.eclipse.jdt.text.tests/testResources/org.eclipse.swt-R3_0.zip
deleted file mode 100644
index 3fe5680..0000000
--- a/org.eclipse.jdt.text.tests/testResources/org.eclipse.swt-R3_0.zip
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/SHTest.java b/org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/SHTest.java
deleted file mode 100644
index 2de0fa3..0000000
--- a/org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/SHTest.java
+++ /dev/null

@@ -1,38 +0,0 @@
-import test.ExternalClass;
-
-abstract class SHTest {
-	int field;
-	static int staticField;
-	final int finalField= 0;
-	static final int staticFinalField= 0;
-	void method(int param) {
-		int local= param + 1;
-		local++;
-		staticMethod();
-		abstractMethod();
-		toString();
-		for (int local2= 0; local2 < 10; local2++);
-		try {} catch (Exception param2) {
-			local= param2.hashCode();
-			param2= null;
-		}
-	}
-	static void staticMethod() {}
-	abstract void abstractMethod();
-	/** @deprecated */
-	int deprecatedField;
-	/** @deprecated */
-	ExternalClass deprecatedMethod() {
-		deprecatedField++;
-		deprecatedMethod();
-		return (InnerClass) null;
-	}
-	/** @deprecated */
-	class InnerClass extends ExternalClass {
-		SHTest parent= SHTest.this;
-		int parentField= SHTest.this.field;
-		int parentStaticField= SHTest.staticField;
-		int parentFinalField= SHTest.this.finalField;
-		int parentStaticFinalField= SHTest.staticFinalField;
-	}
-}

diff --git a/org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/test/ExternalClass.java b/org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/test/ExternalClass.java
deleted file mode 100644
index e0a9793..0000000
--- a/org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/test/ExternalClass.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package test;
-
-/** @deprecated */
-public class ExternalClass {
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/.classpath b/org.eclipse.jdt.ui.examples.javafamily/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.ui.examples.javafamily/.cvsignore b/org.eclipse.jdt.ui.examples.javafamily/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.jdt.ui.examples.javafamily/.project b/org.eclipse.jdt.ui.examples.javafamily/.project
deleted file mode 100644
index eb3644a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/.project
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.ui.examples.javafamily</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.core.variables</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.debug</project>
-		<project>org.eclipse.jdt.debug.ui</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.jdt.ui</project>
-		<project>org.eclipse.jface</project>
-		<project>org.eclipse.jface.text</project>
-		<project>org.eclipse.search</project>
-		<project>org.eclipse.text</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.editors</project>
-		<project>org.eclipse.ui.ide</project>
-		<project>org.eclipse.ui.workbench.texteditor</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.ui.examples.javafamily/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.ui.examples.javafamily/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7eb9e09..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Fri Aug 27 08:42:49 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.jdt.ui.examples.javafamily/ReleaseNotes.html b/org.eclipse.jdt.ui.examples.javafamily/ReleaseNotes.html
deleted file mode 100644
index ff7b094..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/ReleaseNotes.html
+++ /dev/null

@@ -1,306 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>Javafamily Release Notes</title></head><body>
-<h1 style="text-align: left;">Release Notes</h1>
-October 6, 2003<br>
-<br>
-The javafamily plug-in is a collection of prototypes that illustrate how
-the existing (mostly Java) infrastructure can be extended to support
-Java-like languages like JSP. Since this is a first cut, the project
-still contains a number of workarounds and duplications. However, it is
-our ultimate goal to eliminate all of these in order to make
-supporting Java-like languages smooth and simple.<br>
-<br>
-This initial release contains:<br>
-<ul>
-  <li>a JSP editor with reconciling,<br>
-  </li>
-  <li>a JSP aware Java search,<br>
-  </li>
-  <li>a JSP aware Rename Type refactoring that uses the new Refactoring Participants.</li>
-  <li>a Tomcat launcher and JSP source locator<br>
-  </li>
-</ul>
-In addition this document contains a collection of findings we made
-while developing the various pieces.<br>
-<h2>Known issues and limitations:</h2>
-<ul>
-  <li>Currently the JSP index isn't persisted and automatic indexing of JSP files is not enabled.
-So if you want to try the Rename Type refactoring or the JSP/Java search, you'll need to turn on
-JSP indexing via Window > Preferences > Java > JavaFamily Example > Start JSP indexing.
-Without this a JSP/Java search or a Rename Type refactoring
-will not find Java types in non-Java resources.</li>
-<li>
-JSP Search works only for types (because JSP indexing is only done for types).
-</li>
-</ul>
-<h2>Reconciling Steps</h2>
-Findings while developing the JSP Editor:<br>
-<ul>
-  <li>JSR-045 specifies a line-oriented mapping between several input
-files
-(translated-source) and one output file (translated-source or
-final-source). The output file can either be the final-source or
-multiple output files (translated-source) can serve as input for a
-next mapping (e.g. MyCustomFormat -&gt; JSP -&gt; Java). Each step
-(language-translator) produces a SMAP file (.smap). The mapping cannot
-be used to exactly map positions inside a line.</li>
-  <li>The compiler aborts compilation if it hits some severe errors.
-Because a JSP line sequence is not necessarily the same as in the
-intermediate Java file it might happen that the compiler stops very
-early on an error that corresponds to a JSP line which is at the very
-end of the file.<br>
-  </li>
-  <li>An annotation position reported on the Java file can correspond to<br>
-  </li>
-  <ul>
-    <li>an annotation in the JSP file with adapted offset and length</li>
-    <li>several annotation in the JSP file either distributed in the
-same Java partition or over several partitions</li>
-    <li>no annotation at all, e.g. if the error is caused by the
-translator or by a wrong Java build path</li>
-  </ul>
-  <li>A JSP file can <span style="font-style: italic;">include</span>
-other JSP files. If an SMAP based approach is used and one of the
-included
-JSP files is opened in the editor then we need to find the correct SMAP
-file.</li>
-  <li>For
-most of the tags in the JSP file it is not possible to
-provide a generic parsing and mapping. This has to be defined for each
-tag. The generated Java code and the mapping are tightly coupled and
-should be kept in a single class that we call tag handler. A tag
-handler might handle more than one tag. </li>
-  <li>Special tags are needed to handle non-tagged sections like HTML
-in a JSP file.<br>
-  </li>
-  <li>The default implementation of the tag handler must be extensible
-in order to allow tag lib providers to extend the handler.</li>
-  <li>Even if we decide to use an existing translator we will have to
-provide tag handlers that can map positions in a translated line back
-to the position in the corresponding source line.</li>
-  <li>Unless we don't build a fully generic editor which can handle
-several file types (e.g. XML, Java and JSP) there's no need to have
-global tag handler factory which manages different languages.</li>
-  <li>Currently only the source line is passed to the tag handler. If
-JSP
-allows that tag (lib) attributes span multiple lines then we must
-change the interface and pass sourceLineStart and sourceLineEnd.<br>
-  </li>
-</ul>
-<h2>Towards Language Neutral Search<br>
-</h2>
-We tried to reuse the Java indexing/searching infrastructure from
-jdt.core for
-non-Java JSP files. This was easily possible for the indexing side,
-because that part makes almost no assumptions about was is being
-indexed. On the other hand, searching was more challenging because the
-search infrastructure makes hardwired assumptions about the type of
-files referenced from the index. So if a file doesn't have the .java
-extensions it is assumed to be a .class file without further checking
-of its extension. As a consequence it was not possible to get *.jsp
-files from a search because the search engine would treat them as class
-files and would run in a NPE.<br>
-<br>
-To solve this issue we created a new package
-"org.eclipse.core.indexsearch" as a starting point for an indexed
-search component. The package provides a minimal but sufficient API for
-indexing/searching non-Java files and uses the existing mechanisms from
-jdt.core as far as possible.<br>
-<br>
-As a first use case for this indexed search we combined the Type Rename
-refactoring participants
-with a JSP search engine based on "org.eclipse.core.indexsearch" and a
-simple JSP parser (org.eclipse.jsp.AbstractJspParser). With this you
-can rename Java types and
-automatically rename all occurrences of the Java type in JSP tags as
-well.<br>
-<br>
-In a second use case&nbsp; we created a new Java/JSP Search page that
-combines the existing Java search with the JSP search. As a result you
-can search for a Java type and can find occurrences not only in Java
-source but in JSP tags as well. The current implementation copies some
-of the classes from "org.eclipse.jdt.internal.ui.search" in order to be
-able to show non-Java files in the Java search result viewer. However,
-the ultimate goal would be to provide a new extension point for Java
-search that would allow for plugging in arbitrary "search
-participants".<br>
-Please note: it is not possible to automatically have
-every Java search return JSP search results as well, because some
-places in Eclipse assume that the search results only contain Java
-source, and they would fail miserably when confronted with non-Java
-files, e.g. JSP files.<br>
-<br>
-<span style="font-weight: bold;">Design considerations for an indexed
-search component:</span><br>
-<ul>
-  <li>language independence</li>
-  <li>a single index and a single indexer thread for all languages</li>
-  <li>minimal API surface area</li>
-  <li>flexible queries</li>
-  <li>background indexing and searching</li>
-  <li>not tied to IResources</li>
-</ul>
-<h3>The API</h3>
-<h4>Search Engine: class <code>SearchEngine</code></h4>
-<ul>
-  <li>API entry point</li>
-  <li>combines indexing API with searching API</li>
-  <li>manages concurrency issues between indexing access and searching</li>
-  <li>indexing based on the JobManager (current impl. delegates to
-jdt.core
-IndexManager)</li>
-  <li>index requests are added as AddFileToIndex subclasses (like today)</li>
-  <li>lifecycle issues: loading/saving index</li>
-  <li>no notion of "Scope"; scope can be introduced as an
-implementation
-detail of the IIndexQuery</li>
-</ul>
-&nbsp; <code>/**<br>
-&nbsp; * Perform the given query against the index
-and return results via the resultCollector.<br>
-&nbsp; */<br>
-&nbsp;public void <span style="font-weight: bold;">search</span>(IIndexQuery
-search,
-ISearchResultCollector resultCollector,<br>
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
-IProgressMonitor progressMonitor, int waitingPolicy);<br>
-</code><br>
-<h4>Search query: interface <code>IIndexQuery</code></h4>
-An IIndexQuery is used to perform a query against the searching
-framework.<br>
-<pre>/**<br>&nbsp;* Compute the list of paths which are keying index files and add them to the given list.<br>&nbsp;*/<br>void <span style="font-weight: bold;">computePathsKeyingIndexFiles</span>(ArrayList requiredIndexKeys);<br></pre>
-<pre>/**<br>&nbsp;* Perform the query on the given index and adds the paths of all found documents to the given collector.<br> */<br>void <span style="font-weight: bold;">findIndexMatches</span>(IIndex index, PathCollector collector, IProgressMonitor progressMonitor) throws IOException;<br><br>/**<br>&nbsp;* Locate all matches of this query in the given file candidate and return them via the resultcollector. <br>&nbsp;*/<br>void <span style="font-weight: bold;">locateMatches</span>(IFile candidate, ISearchResultCollector resultCollector);</pre>
-<h4>Search results: interface <code>ISearchResultCollector</code></h4>
-<ul>
-  <li>search results reported via ISearchResultCollector</li>
-</ul>
-<code>/**<br>
-&nbsp;* Accepts the given search result.<br>
-&nbsp;*<br>
-&nbsp;* @param resource the resource in which the
-match has been found<br>
-&nbsp;* @param start the start position of the
-match, -1 if it is unknown<br>
-&nbsp;* @param length the length of the match<br>
-&nbsp;* @exception CoreException if this collector
-had a problem accepting the search result<br>
-&nbsp;*/<br>
-public void <span style="font-weight: bold;">accept</span>(IResource
-resource, int start,
-int length) throws CoreException;<br>
-</code>
-<h3>Open Issues</h3>
-<ul>
-  <li>the PathCollector API has Java-specific methods which are not used</li>
-  <li>Transparent search in WorkingCopies/Buffers: whenever a file
-resource in opened in an Editor, search should transparently search in
-the buffer and not in the underlying resource. Two options to make
-buffers available to SearchEngine:</li>
-  <ul>
-    <li>&nbsp; as argument to search(...) method</li>
-    <li>&nbsp; whenever buffer is created or deleted it is registered
-with the SearchEngine</li>
-  </ul>
-  <li>No common abstraction for the "content" being indexed:<br>
-In the API from above "content" is represented as an IFile in
-locateMatches(...) and an IResource in
-ISearchResultCollector.accept(...). However, to transparently deal with
-"buffers" there seems to be a need for a more abstract interface for
-content access.</li>
-</ul>
-<h2><br>
-  Debugging a JSP</h2>
-<p>This section describes how to launch a Tomcat server and debug a JSP and associated 
-  Java code being developed in a workspace.</p>
-<h3>Tomcat and Project Configuration</h3>
-<p>JSP debugging with the javafamily plug-in requires that you have a local installation 
-  of Tomcat, version 5.0.2 or higher. Tomcat can be configured to locate a web 
-  application in an arbitrary loation. Thus, a web application (JSPs and Java 
-  code) can be developed in an Eclipse workspace, and Tomcat can be configured 
-  to locate the web application in the associated location in the file system.</p>
-<p>A project structure conforming to that of an expanded WAR (Web application 
-  ARchive) is required. Thus, you must create a Java project that contains the 
-  following directory structure.</p>
-<ul>
-  <li><code>root-web-app-folder</code> 
-    <ul>
-      <li><code>WEB-INF</code> 
-        <ul>
-          <li><code>classes</code></li>
-          <li><code>lib</code></li>
-        </ul>
-      </li>
-    </ul>
-  </li>
-</ul>
-<p>A root container is used to store a <code>WEB-INF</code> folder, which contains 
-  a <code>web.xml</code> file describing the web application. Note that the root 
-  container may be a Java project itself. The <code>classes</code> folder contains 
-  any required class files (i.e. client code that is not part of the standard 
-  class libraries, or common libraries shipped with Tomcat). Thus, your Java project 
-  must be configured to have an output location pointing to the <code>classes</code> 
-  folder. Similarly, the <code>lib</code> folder contains any required jars. JSPs 
-  should be developed in the web application's root folder.</p>
-<p>To configure Tomcat to find the web application, a context entry is added to 
-  Tomcat's <code>server.xml</code> configuration file (found in the <code>/conf</code> 
-  directory of your Tomcat installation), for each external web application being 
-  developed. Following is an example extract of context entries for the default 
-  context (identified by the empty <code>path</code> attribute), and a sample 
-  web application being developed in an Eclipse workspace (in this case, rooted 
-  at <code>d:\testspaces\test-space\JSPs\webapps\myWebApp</code>).</p>
-<pre>&lt;Context path="" docBase="ROOT" debug="0"/&gt;
-&lt;Context path="/myWebApp" docBase="d:\testspaces\test-space\JSPs\webapps\myWebApp" debug="0"/&gt;</pre>
-<p>The corresponding Java project is "<code>JSPs</code>", containing 
-  the folder "<code>webapps</code>", etc. The project may also contain 
-  Java source code (for example, in a "<code>src</code>" folder), and 
-  the output location is set to "<code>JSPs\webapps\myWebApp\WEB-INF\classes</code>". 
-  JSPs are created in the "<code>myWebApp</code>" folder.</p>
-<p><b>Update</b>: The tomcat 5.0 documentation specifies that &quot;<i>it is NOT
-  recommended to place &lt;Context&gt; elements directly in the server.xml file</i>&quot;.
-  Instead, create a new file <code>myWebApp.xml</code> in the folder <code>$CATALINA_HOME/conf/Catalina/localhost</code>
-  with the following content:</p>
-<pre>&lt;Context path="/myWebApp" docBase="d:\testspaces\test-space\JSPs\webapps\myWebApp" debug="0"/&gt;</pre>  
-<h3>Example JSP Project</h3>
-<p>An example JSP project is included in the <code>exampleJspProject.zip</code> 
-  file, found in the <code>stuff</code> folder of the <code>javafamily</code> 
-  plug-in. It demonstrates the directory structure and includes a simple JSP and 
-  associated Java class.</p>
-<h3>Setting a Breakpoint in a JSP</h3>
-<p>To create a breakpoint in a JSP, double click in the JSP edtior ruler on the 
-  line where you want the breakpoint. The breakpoint will appear in the <b>Breakpoints</b> 
-  view as well as the editor's vertical ruler. Breakpoints can also be placed 
-  in Java source code.</p>
-<h3>Launching Tomcat</h3>
-<p>To debug a JSP, Tomcat must be launched in debug mode. This can be done with 
-  a "Tomcat Server" launch configuration.</p>
-<p>To create a Tomcat launch configuration for a web application in the workspace, 
-  open the launch configuration dialog, and create a new "Tomcat Server" 
-  launch configuration. You will notice an error message indicating that the Tomcat 
-  install directory or "${catalina_home}" does not exist. To solve this 
-  problem, set the value of the <code>${catalina_home}</code> string variable 
-  in the <b>Run/Debug </b>&gt; <b>String Substitution</b> preference page to the location 
-  of your Tomcat installation. For example, "<code>d:\jakarta-tomcat-5.0.2</code>".</p>
-<p>On the Tomcat tab, also provide the location of your web application - for 
-  example "<code>JSPs\webapps\myWebApp</code>". This can also be done 
-  by pressing the <b>Browse</b> button and selecting the associated web application 
-  root folder in the workspace.</p>
-<p>Now you can launch Tomcat by pressing the <b>Debug</b> button.<br>
-</p>
-<h3>Summary to Debug a JSP</h3>
-<p>The following steps must be performed to debug a JSP</p>
-<ul>
-  <li>Install Tomcat 5.0.2 or higher</li>
-  <li>Set the value of <code>${catalina_home}</code> (<b>Run/Debug</b> &gt; <b>String 
-    Substitution</b> preference page) to point to the Tomcat installation</li>
-  <li>Create a project (web app) in your workspace in the expanded WAR format</li>
-  <li>Ensure the output location of the project is the <code>WEB-INF/classes</code> 
-    folder</li>
-  <li>Configure Tomcat to locate the web app by adding a context entry in the 
-    <code>server.xml</code> file</li>
-  <li>Code JSPs in the web app's root folder</li>
-  <li>Create a Tomcate Server launch configuration that includes the web app location 
-    (located on the "Tomcat" tab of the launch config)</li>
-</ul>
-<pre>&nbsp; </pre>
-</body></html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.examples.javafamily/about.html b/org.eclipse.jdt.ui.examples.javafamily/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.examples.javafamily/build.properties b/org.eclipse.jdt.ui.examples.javafamily/build.properties
deleted file mode 100644
index db4596c..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.javafamily.jar = src/
-bin.includes = plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties,\
-               *.jar,\
-               ReleaseNotes.html,\
-               stuff/
-src.includes = about.html
-source.javafamily.jar = src/

diff --git a/org.eclipse.jdt.ui.examples.javafamily/icons/full/clcl16/search_sortmatch.gif b/org.eclipse.jdt.ui.examples.javafamily/icons/full/clcl16/search_sortmatch.gif
deleted file mode 100644
index 9ed470d..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/icons/full/clcl16/search_sortmatch.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/brkp_obj.gif b/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/brkp_obj.gif
deleted file mode 100644
index 06d0079..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/brkp_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsearch_obj.gif b/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsearch_obj.gif
deleted file mode 100644
index ee75bdb..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsearch_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsp_obj.gif b/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsp_obj.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/jsp_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/tomcat_obj.gif b/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/tomcat_obj.gif
deleted file mode 100644
index 3f18c55..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/icons/full/obj16/tomcat_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.javafamily/plugin.properties b/org.eclipse.jdt.ui.examples.javafamily/plugin.properties
deleted file mode 100644
index 6a6c7de..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/plugin.properties
+++ /dev/null

@@ -1,64 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName= Java Development Tools JavaFamily Example
-providerName= Eclipse.org
-
-##########################################################################
-# Java Search
-##########################################################################
-JavaSearchPage.label= Java/JSP Search
-openJavaSearchPageAction.label= &Java...
-ElementNameSorter.label= &Name
-ElementNameSorter.tooltip= Sort the view by Java Element Name
-ParentNameSorter.label= &Parent Name
-ParentNameSorter.tooltip= Sort the view by Java Element Parent Name
-PathNameSorter.label= P&ath
-PathNameSorter.tooltip= Sort the view by Resource Path
-PositionSorter.label= &Line number
-PositionSorter.tooltip= Sort the view by location
-
-# Action sets
-JavaSearchActionSet.label= Java Search
-JavaSearchActionSet.description= Action set containing search related Java actions
-
-# Menus
-searchMenu.label= Se&arch
-OccurrencesInFile.label=Occurrences in File
-declarationsSubMenu.label= Dec&larations
-referencesSubMenu.label= R&eferences
-implementorsSubMenu.label= &Implementors
-readAccessSubMenu.label= &Read Access
-writeAccessSubMenu.label= &Write Access
-
-ReferencesInWorkspace.label= &Workspace
-DeclarationsInWorkspace.label= &Workspace
-
-InWorkspace.label= &Workspace
-InHierarchy.label= &Hierarchy
-InWorkingSet.label= Working &Set...
-
-##########################################################################
-# JSP Editor
-##########################################################################
-jspEditorName= JSP Editor
-
-##########################################################################
-# Tomcat Launching
-##########################################################################
-tomcatLaunchConfigurationTypeName= Tomcat Server
-catalinaHomeDescription= Root Tomcat installation directory 
-TomcatSourceLocatorName= Tomcat Source Locator
-
-##########################################################################
-# Preference Page
-##########################################################################
-JavaFamilyExamplePreferencePage.name= JavaFamily Example

diff --git a/org.eclipse.jdt.ui.examples.javafamily/plugin.xml b/org.eclipse.jdt.ui.examples.javafamily/plugin.xml
deleted file mode 100644
index c8fba94..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/plugin.xml
+++ /dev/null

@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-	id="org.eclipse.jdt.ui.examples.javafamily"
-	name="%pluginName"
-	version="3.0.0"
-	provider-name="%providerName"
-	class="org.eclipse.jsp.JspUIPlugin">
-
-	<runtime>
-		<library name="javafamily.jar"/>
-	</runtime>
-      
-	<requires>
-		<import plugin="org.eclipse.core.resources"/>
-		<import plugin="org.eclipse.core.variables"/>
-		<import plugin="org.eclipse.jface"/>
-		<import plugin="org.eclipse.ui"/>
-		<import plugin="org.eclipse.text"/>
-		<import plugin="org.eclipse.jface.text"/>
-		<import plugin="org.eclipse.ui.workbench.texteditor"/>
-		<import plugin="org.eclipse.ui.editors"/>
-		<import plugin="org.eclipse.ui.ide"/>
-		<import plugin="org.eclipse.search"/>
-		<import plugin="org.eclipse.jdt.core"/>
-		<import plugin="org.eclipse.jdt.ui"/>
-		<import plugin="org.eclipse.debug.core"/>
-		<import plugin="org.eclipse.debug.ui"/>
-		<import plugin="org.eclipse.jdt.debug"/>
-		<import plugin="org.eclipse.jdt.launching"/>
-		<import plugin="org.eclipse.jdt.debug.ui"/>
-		<import plugin="org.eclipse.core.runtime.compatibility"/>
-	    <import plugin="org.eclipse.ltk.core.refactoring"/>
-	</requires>
-
-	<!-- =========================================================================== -->
-	<!-- Refactoring Participant                                                     -->
-	<!-- =========================================================================== -->
-	<extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-	  <renameParticipant
-	  	id="org.eclipse.jsp.renameParticipant.IType"
-	  	name="org.eclipse.jsp.renameParticipant.IType"
-	  	class="org.eclipse.jsp.RenameTypeParticipant">
-	  	<enablement>
-	  	  <with variable="affectedNatures">
-	  	    <iterate operator="or">
-	  	      <equals value="org.eclipse.jdt.core.javanature"/>
-	  	    </iterate>
-	  	  </with>
-	  	  <with variable="element">
-		  	 <instanceof value="org.eclipse.jdt.core.IType"/>
-	  	  </with>
-	  	</enablement>
-	  </renameParticipant>
-	</extension>
-	
-	<!-- =========================================================================== -->
-	<!-- Java Search Page                                                            -->
-	<!-- =========================================================================== -->
-	<extension point="org.eclipse.search.searchPages">
-	   <page id="org.eclipse.jdt.ui.JavaSearchPage2"
-	         icon="icons/full/obj16/jsearch_obj.gif"
-	         label="%JavaSearchPage.label"
-			 sizeHint="460,160"
-			 extensions="java:90, jav:90"
-			 showScopeSection="true"
-			 class="org.eclipse.jdt.internal.ui.search2.JavaSearchPage2">
-	   </page>
-	</extension>
-	
-	<extension point="org.eclipse.search.searchResultSorters">
-		<sorter
-			id="org.eclipse.search.internal.ui.ElementNameSorter"
-			pageId="org.eclipse.jdt.ui.JavaSearchPage2"
-			label="%ElementNameSorter.label"
-			tooltip="%ElementNameSorter.tooltip"
-			icon="icons/full/clcl16/search_sortmatch.gif"
-			class="org.eclipse.jdt.internal.ui.search.ElementNameSorter">
-		</sorter>
-		<sorter
-			id="org.eclipse.search.internal.ui.ParentNameSorter"
-			pageId="org.eclipse.jdt.ui.JavaSearchPage2"
-			label="%ParentNameSorter.label"
-			tooltip="%ParentNameSorter.tooltip"
-			icon="icons/full/clcl16/search_sortmatch.gif"
-			class="org.eclipse.jdt.internal.ui.search.ParentNameSorter">
-		</sorter>
-		<sorter
-			id="org.eclipse.search.internal.ui.PathNameSorter"
-			pageId="org.eclipse.jdt.ui.JavaSearchPage2"
-			label="%PathNameSorter.label"
-			tooltip="%PathNameSorter.tooltip"
-			icon="icons/full/clcl16/search_sortmatch.gif"
-			class="org.eclipse.jdt.internal.ui.search.PathNameSorter">
-		</sorter>
-			<sorter
-			id="org.eclipse.search.internal.ui.MatchPositionSorter"
-			pageId="org.eclipse.jdt.ui.JavaFileSearch2"
-			label="%PositionSorter.label"
-			tooltip="%PositionSorter.tooltip"
-			icon="icons/full/clcl16/search_sortmatch.gif"
-			class="org.eclipse.jdt.internal.ui.search.MatchPositionSorter">
-		</sorter>
-		
-	</extension>
-
-	<!-- =========================================================================== -->
-	<!-- JSP Editor                                                                  -->
-	<!-- =========================================================================== -->
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            id="org.eclipse.jdt.ui.examples.JSPEditor"
-            name="%jspEditorName"
-            extensions="jsp"
-            icon="icons/full/obj16/jsp_obj.gif"
-            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
-            class="org.eclipse.jdt.internal.ui.examples.jspeditor.JspEditor"
-            default="true">
-      </editor>
-   </extension>
-   
-	<!-- =========================================================================== -->
-	<!-- Tomcat Launcnhing                                                              -->
-	<!-- =========================================================================== -->
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="%tomcatLaunchConfigurationTypeName"
-            delegate="org.eclipse.jsp.launching.TomcatLaunchDelegate"
-            modes="run, debug"
-            id="org.eclipse.jsp.TomcatConfigurationType"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="org.eclipse.jsp.TomcatConfigurationType"
-            class="org.eclipse.jsp.launching.TomcatTabGroup"
-            id="org.eclipse.jsp.TomcatTabGroup">
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/full/obj16/tomcat_obj.gif"
-            configTypeID="org.eclipse.jsp.TomcatConfigurationType"
-            id="org.eclipse.jsp.image.Tomcat">
-      </launchConfigurationTypeImage>
-   </extension>
-   <extension
-         point="org.eclipse.core.variables.valueVariables">
-      <variable
-            name="catalina_home"
-            description="%catalinaHomeDescription">
-      </variable>
-   </extension>   
-   <extension point="org.eclipse.jdt.launching.classpathProviders">
-   		<classpathProvider
-   			id="org.eclipse.jsp.tomcatClasspathProvider"
-   			class="org.eclipse.jsp.launching.TomcatClasspathProvider">
-   		</classpathProvider>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.editorActions">
-      <editorContribution
-            targetID="org.eclipse.jdt.ui.examples.JSPEditor"
-            id="org.eclipse.jsp.BreakpointRulerActions">
-         <action
-               label="%Dummy.label"
-               class="org.eclipse.jsp.launching.ToggleJspBreakpointRulerActionDelegate"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.jsp.actions.ToggleJspBreakpointAction">
-         </action>
-      </editorContribution>
-   </extension>
-   
-   	<extension 
-		point="org.eclipse.ui.ide.markerImageProviders">
-		<imageprovider
-			id="org.eclipse.jsp.breakpointMarkerProvider"
-			markertype="org.eclipse.jdt.debug.javaStratumLineBreakpointMarker"
-			icon="icons/full/obj16/brkp_obj.gif">
-		</imageprovider>
-	</extension>
-   
-   	<extension
-		point="org.eclipse.ui.preferencePages">
-		<page name="%JavaFamilyExamplePreferencePage.name"
-			id="org.eclipse.jsp.JavaFamilyExamplePreferencePage"
-			class="org.eclipse.jsp.JavaFamilyExamplePreferencePage"
-			category= "org.eclipse.jdt.ui.preferences.JavaBasePreferencePage">
-		</page>	
-	</extension>
-      
-</plugin>

diff --git a/org.eclipse.jdt.ui.examples.javafamily/sample/Date2.java b/org.eclipse.jdt.ui.examples.javafamily/sample/Date2.java
deleted file mode 100644
index abd3330..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/sample/Date2.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*
- * Created on May 26, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-
-/**
- * @author weinand
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class Date2 {
-	
-	public int getHours() {
-		return 8;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/sample/easy.jsp b/org.eclipse.jdt.ui.examples.javafamily/sample/easy.jsp
deleted file mode 100644
index a8a0ac3..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/sample/easy.jsp
+++ /dev/null

@@ -1,29 +0,0 @@
-<%@ page contentType="text/html" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<html>
-  <head>
-    <title>JSP is Easy</title>
-  </head>
-  <body bgcolor="white">
-  <jsp:useBean id="clock" class="Date2" />
- 
-  <%! int globalCounter= 0; %> 
- 
-    <h1>JSP is as easy as ...</h1>
-
-    <%-- Calculate the sum of 1 + 2 + 3 dynamically --%>
-    1 + 2 + 3 = <c:out value="${1 + 2 + 3}" />
-    
-    <% int i= 4;
-       i= i+1; %>
-       
-	<% if (clock.getHours() < 12) { %>
-		Good morning!
-	<% } else if (clock.getHours() < 17) { %>
-		Good day!
-	<% } else { %>
-		Good evening!
-	<% } %>
- 
-  </body>
-</html>

diff --git a/org.eclipse.jdt.ui.examples.javafamily/scripts/exportplugin.xml b/org.eclipse.jdt.ui.examples.javafamily/scripts/exportplugin.xml
deleted file mode 100644
index 56ebfa5..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/scripts/exportplugin.xml
+++ /dev/null

@@ -1,31 +0,0 @@
-<project name="org.eclipse.jdt.ui.examples.javafamily" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.jdt.ui.examples.javafamily" />
-		<property name="version"  value="_3.0.0" />
-		<property name="dest"  value="${destdir}/${plugin}${version}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<jar 
-			jarfile="${dest}/javafamily.jar"
-			basedir="bin"
-		/>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<copy todir="${dest}/icons">
-			<fileset dir="icons" />
-		</copy>
-		<zip zipfile="${dest}/javafamilysrc.zip">
-		    <fileset dir="src" />
-  		</zip>				
-	</target>
-</project>

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndex.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndex.java
deleted file mode 100644
index c916900..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndex.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import java.util.HashSet;
-
-public interface IIndex {
-
-	void addRef(String word, String path);
-	
-	void remove(String path);
-	
-	void queryPrefix(HashSet result, String prefix);
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexQuery.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexQuery.java
deleted file mode 100644
index 3860b33..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexQuery.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * An IndeyQuery is used to perform a query against the indexing framework.
- */
-public interface IIndexQuery {
-
-	/**
-	 * Compute the list of paths which are keying index files and add them to the given list.
-	 */
-	void computePathsKeyingIndexFiles(ArrayList requiredIndexKeys);
-	
-	/**
-	 * Perform the query on the given index and adds the paths of all found documents to the given collector.
-	 */
-	void findIndexMatches(IIndex index, HashSet collector, IProgressMonitor progressMonitor) throws IOException;
-
-	/**
-	 * Locate all matches of this query in the given file candidate and return them via the resultcollector. 
-	 */
-	void locateMatches(IFile candidate, ISearchResultCollector resultCollector);
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexer.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexer.java
deleted file mode 100644
index c9fd26b..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/IIndexer.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import java.io.IOException;
-
-public interface IIndexer {
-
-	void index(IIndex index) throws IOException;
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/ISearchResultCollector.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/ISearchResultCollector.java
deleted file mode 100644
index 231919d..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/ISearchResultCollector.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * A <code>ISearchResultCollector</code> collects search results from a <code>search</code>
- * query to a <code>SearchEngine</code>. Clients must implement this interface and pass
- * an instance to the <code>search(...)</code> methods.
- * <p>
- * The order of the results is unspecified. Clients must not rely on this order to display results, 
- * but they should sort these results.
- * <p>
- * Clients may implement this interface.
- * </p>
- *
- * @see SearchEngine#search
- */
-public interface ISearchResultCollector {
-	
-	/**
-	 * Accepts the given search result.
-	 *
-	 * @param resource the resource in which the match has been found
-	 * @param start the start position of the match, -1 if it is unknown
-	 * @param length the length of the match
-	 * @exception CoreException if this collector had a problem accepting the search result
-	 */
-	public void accept(IResource resource, int start, int length) throws CoreException;
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java
deleted file mode 100644
index d81151b..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/core/indexsearch/SearchEngine.java
+++ /dev/null

@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.indexsearch;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-/**
- * A <code>SearchEngine</code> searches for java elements following a search pattern.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- */
-public class SearchEngine {
-	
-	static class MyIndex implements IIndex {
-		
-		private HashMap fMap= new HashMap();
-		
-		public void addRef(String word, String path) {
-			System.err.println("Index.add: " + path + " " + word); //$NON-NLS-1$ //$NON-NLS-2$
-			HashMap words= (HashMap) fMap.get(path);
-			if (words == null) {
-				words= new HashMap();
-				fMap.put(path, words);
-			}
-			words.put(word, word);
-		}
-		
-		public void remove(String path) {
-			System.err.println("Index.remove: " + path); //$NON-NLS-1$
-			fMap.remove(path);
-		}
-		
-		public void queryPrefix(HashSet results, String w) {
-			Iterator iter= fMap.keySet().iterator();
-			while (iter.hasNext()) {
-				String path= (String) iter.next();
-				HashMap words= (HashMap) fMap.get(path);
-				if (words.containsKey(w))
-					results.add(path);
-			}
-		}
-	}
-		
-	/* Waiting policies */
-	/**
-	 * The search operation throws an <code>org.eclipse.core.runtime.OperationCanceledException</code>
-	 * if the underlying indexer has not finished indexing the workspace.
-	 */
-	public static int CANCEL_IF_NOT_READY_TO_SEARCH = 0;
-	/**
-	 * The search operation waits for the underlying indexer to finish indexing 
-	 * the workspace before starting the search.
-	 */
-	public static int WAIT_UNTIL_READY_TO_SEARCH = 1;
-
-	
-	private static SearchEngine fgSearchEngine;
-	
-	private HashMap fIndexes= new HashMap();
-		
-	private SearchEngine() {
-	}
-	
-	/**
-	 * 
-	 * @return
-	 */
-	public static SearchEngine getSearchEngine() {
-		if (fgSearchEngine == null)
-			fgSearchEngine= new SearchEngine();
-		return fgSearchEngine;
-	}
-		
-	/**
-	 * Trigger removal of a resource to an index
-	 * Note: the actual operation is performed in background
-	 */
-	public void remove(String resourceName, IPath indexedContainer) {
-		IIndex index= getIndex(indexedContainer, false);
-		if (index != null)
-			index.remove(resourceName);
-	}
-	
-	public void add(IPath indexedContainer, IIndexer indexer) {
-		IIndex index= getIndex(indexedContainer, true);
-		try {
-			indexer.index(index);
-		} catch (IOException e) {
-		}
-	}
-
-	/**
-	 * Returns the files that correspond to the paths that have been collected.
-	 * TODO_SEARCH
-	 */
-	private IFile[] getFiles(HashSet pc, IWorkspace workspace) {
-		IFile[] result= new IFile[pc.size()];
-		int i = 0;
-		for (Iterator iter= pc.iterator(); iter.hasNext();) {
-			String resourcePath= (String)iter.next();
-			IPath path= new Path(resourcePath);
-			result[i++]= workspace.getRoot().getFile(path);
-		}
-		return result;
-	}
-	
-	/**
-	 * Perform the given query against the index and return results via the resultCollector.
-	 */
-	public void search(IIndexQuery search, ISearchResultCollector resultCollector,
-						IProgressMonitor progressMonitor, int waitingPolicy) {
-				
-		HashSet pathCollector= new HashSet();
-		IProgressMonitor pm= progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 5);
-		execute(search, pathCollector, pm);
-		
-		/* TODO_SEARCH */
-		IFile[] files= getFiles(pathCollector, ResourcesPlugin.getWorkspace());
-		for (int i= 0; i < files.length; i++) {
-			IFile file= files[i];
-			search.locateMatches(file, resultCollector);
-		}
-	}
-
-	public IIndex getIndex(IPath indexPath, boolean create) {
-		IIndex ix= (IIndex) fIndexes.get(indexPath);
-		if (create && ix == null) {
-			ix= new MyIndex();
-			fIndexes.put(indexPath, ix);
-		}
-		return ix;
-	}
-	
-	private boolean execute(IIndexQuery search, HashSet pathCollector, IProgressMonitor progressMonitor) {
-
-		if (progressMonitor != null && progressMonitor.isCanceled())
-			throw new OperationCanceledException();
-		boolean isComplete= true;
-		IIndex[] searchIndexes= getIndexes(search);
-		try {
-			int max= searchIndexes.length;
-			if (progressMonitor != null) {
-				progressMonitor.beginTask("", max); //$NON-NLS-1$
-			}
-			for (int i = 0; i < max; i++) {
-				isComplete &= search(search, searchIndexes[i], pathCollector, progressMonitor);
-				if (progressMonitor != null) {
-					if (progressMonitor.isCanceled()) {
-						throw new OperationCanceledException();
-					} else {
-						progressMonitor.worked(1);
-					}
-				}
-			}
-			return isComplete;
-		} finally {
-			if (progressMonitor != null) {
-				progressMonitor.done();
-			}
-		}
-	}
-	
-	private IIndex[] getIndexes(IIndexQuery search) {
-		IPath[] fIndexKeys= null; // cache of the keys for looking index up
-		if (fIndexKeys == null) {
-			ArrayList requiredIndexKeys= new ArrayList();
-			search.computePathsKeyingIndexFiles(requiredIndexKeys);
-			fIndexKeys= new IPath[requiredIndexKeys.size()];
-			requiredIndexKeys.toArray(fIndexKeys);
-		}
-		// acquire the in-memory indexes on the fly
-		int length = fIndexKeys.length;
-		IIndex[] indexes = new IIndex[length];
-		int count = 0;
-		for (int i = 0; i < length; i++){
-			// may trigger some index recreation work
-			IIndex index = getIndex(fIndexKeys[i], false);
-			if (index != null) indexes[count++] = index; // only consider indexes which are ready yet
-		}
-		if (count != length) {
-			System.arraycopy(indexes, 0, indexes= new IIndex[count], 0, count);
-		}
-		return indexes;
-	}
-
-	private boolean search(IIndexQuery search, IIndex index, HashSet pathCollector, IProgressMonitor progressMonitor) {
-
-		if (progressMonitor != null && progressMonitor.isCanceled())
-			throw new OperationCanceledException();
-
-		if (index == null)
-			return true;
-		try {
-			search.findIndexMatches(index, pathCollector, progressMonitor);
-			return true;
-		} catch (IOException e) {
-			return false;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationAdapter.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationAdapter.java
deleted file mode 100644
index 8a053aa..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationAdapter.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.reconciler.IReconcileResult;
-import org.eclipse.jface.text.source.Annotation;
-
-
-/**
- * Adapts a temporary or persitent annotation to a reconcile result.
- * 
- * @since 3.0
- */
-public abstract class AnnotationAdapter implements IReconcileResult {
-
-	/**
-	 * Creates and returns the annotation adapted by this adapter.
-	 * 
-	 * @return an annotation (can be temporary or persistent)
-	 */
-	public abstract Annotation createAnnotation();
-	
-	/**
-	 * The position of the annotation adapted by this adapter.
-	 * 
-	 * @return the position
-	 */
-	public abstract Position getPosition();
-
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationTextHover.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationTextHover.java
deleted file mode 100644
index 82d59ce..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/AnnotationTextHover.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-
-/**
- * A simple text hover to show annotation information.
- * 
- * @since 3.0
- */
-public class AnnotationTextHover implements ITextHover {
-
-	/** This hover's annotation model */
-	private IAnnotationModel fModel;
-
-	/**
-	 * Creates a new annotation hover.
-	 * 
-	 * @param model this hover's annotation model
-	 */
-	public AnnotationTextHover(IAnnotationModel model)  {
-		Assert.isNotNull(model);
-		fModel= model;
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
-	 */
-	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
-		
-		Iterator e= fModel.getAnnotationIterator();
-		while (e.hasNext()) {
-			Annotation a= (Annotation) e.next();
-			Position p= fModel.getPosition(a);
-			if (p != null && p.overlapsWith(hoverRegion.getOffset(), hoverRegion.getLength())) {
-				String msg= a.getText();
-				if (msg != null && msg.trim().length() > 0)
-					return msg;
-			}
-		}
-		
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
-	 */
-	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
-		/*
-		 * XXX: If this is too slow then we might return new Region(offset, 0);
-		 */ 
-		Iterator e= fModel.getAnnotationIterator();
-		while (e.hasNext()) {
-			Annotation a= (Annotation) e.next();
-			Position p= fModel.getPosition(a);
-			if (p != null && p.overlapsWith(offset, 0)) {
-				String msg= a.getText();
-				if (msg != null && msg.trim().length() > 0)
-					return new Region(p.offset, p.length);
-			}
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DefaultAnnotationHover.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DefaultAnnotationHover.java
deleted file mode 100644
index d873966..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DefaultAnnotationHover.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-
-
-/**
- * Determines all annotations for the given line, collects,
- * concatenates, and formats their messages.
- * 
- * @since 3.0
- */
-public class DefaultAnnotationHover implements IAnnotationHover {
-
-	/**
-	 * Returns the distance to the ruler line. 
-	 */
-	protected int compareRulerLine(Position position, IDocument document, int line) {
-	
-		if (position.getOffset() > -1 && position.getLength() > -1) {
-			try {
-				int annotationLine= document.getLineOfOffset(position.getOffset());
-				if (line == annotationLine)
-					return 1;
-				if (annotationLine <= line && line <= document.getLineOfOffset(position.getOffset() + position.getLength()))
-					return 2;
-			} catch (BadLocationException x) {
-				// ignored
-			}
-		}
-	
-		return 0;
-	}
-
-	/**
-	 * Selects a set of annotations from the two lists. By default, it just returns
-	 * the set of exact matches.
-	 */
-	protected List select(List exactMatch, List including) {
-		return exactMatch;
-	}
-
-	/**
-	 * Returns annotations for the ruler's line of activity.
-	 */
-	protected List getAnnotationsForLine(ISourceViewer viewer, int line) {
-	
-		IDocument document= viewer.getDocument();
-		IAnnotationModel model= viewer.getAnnotationModel();
-	
-		if (model == null)
-			return null;
-		
-		List exact= new ArrayList();
-		List including= new ArrayList();
-	
-		Iterator e= model.getAnnotationIterator();
-		HashMap messagesAtPosition= new HashMap();
-		while (e.hasNext()) {
-			Object o= e.next();
-
-			if (o instanceof Annotation) {
-			
-				Annotation a= (Annotation)o;
-				
-				Position position= model.getPosition(a);
-				if (position == null)
-					continue;
-
-				if (isDuplicateAnnotation(messagesAtPosition, position, a.getText()))
-					continue;
-
-				switch (compareRulerLine(position, document, line)) {
-					case 1:
-						exact.add(a);
-						break;
-					case 2:
-						including.add(a);
-						break;
-				}
-			}
-		}
-	
-		return select(exact, including);
-	}
-
-	private boolean isDuplicateAnnotation(Map messagesAtPosition, Position position, String message) {
-		if (messagesAtPosition.containsKey(position)) {
-			Object value= messagesAtPosition.get(position);
-			if (message.equals(value))
-				return true;
-
-			if (value instanceof List) {
-				List messages= (List)value;
-				if  (messages.contains(message))
-					return true;
-				else
-					messages.add(message);
-			} else {
-				ArrayList messages= new ArrayList();
-				messages.add(value);
-				messages.add(message);
-				messagesAtPosition.put(position, messages);
-			}
-		} else
-			messagesAtPosition.put(position, message);
-		return false;
-	}
-	
-	/*
-	 * @see IVerticalRulerHover#getHoverInfo(ISourceViewer, int)
-	 */
-	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
-		List annotations= getAnnotationsForLine(sourceViewer, lineNumber);
-		if (annotations != null) {
-		
-			if (annotations.size() == 1) {
-			
-				// optimization
-				Annotation annotation= (Annotation) annotations.get(0);
-				String message= annotation.getText();
-				if (message != null && message.trim().length() > 0)
-					return formatSingleMessage(message);
-				
-			} else {
-				
-				List messages= new ArrayList();
-			
-				Iterator e= annotations.iterator();
-				while (e.hasNext()) {
-					Annotation annotation= (Annotation) e.next();
-					String message= annotation.getText();
-					if (message != null && message.trim().length() > 0)
-						messages.add(message.trim());
-				}
-			
-				if (messages.size() == 1)
-					return formatSingleMessage((String) messages.get(0));
-				
-				if (messages.size() > 1)
-					return formatMultipleMessages(messages);
-			}
-		}
-	
-		return null;
-	}
-
-	private String formatSingleMessage(String message) {
-		return message;
-	}
-
-	private String formatMultipleMessages(List messages) {
-		StringBuffer buffer= new StringBuffer();
-		Iterator e= messages.iterator();
-		while (e.hasNext())  {
-			buffer.append("- "); //$NON-NLS-1$
-			buffer.append((String) e.next());
-			buffer.append('\n');
-		}
-		return buffer.toString();
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DocumentAdapter.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DocumentAdapter.java
deleted file mode 100644
index dfb0a5e..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/DocumentAdapter.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.reconciler.IReconcilableModel;
-
-/**
- * Adapts an <code>IDocument</code> to a <code>IReconcilableModel</code>.
- *
- * @since 3.0
- */
-public class DocumentAdapter implements IReconcilableModel {
-
-	private IDocument fDocument;
-
-	/**
-	 * Creates a text model adapter for the given document.
-	 * 
-	 * @param document
-	 */
-	public DocumentAdapter(IDocument document) {
-		fDocument= document;
-	}
-
-	/**
-	 * Returns this model's document.
-	 *
-	 * @return the model's input document
-	 */
-	public IDocument getDocument() {
-		return fDocument;
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JavaReconcileStep.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JavaReconcileStep.java
deleted file mode 100644
index 657a89a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JavaReconcileStep.java
+++ /dev/null

@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.reconciler.AbstractReconcileStep;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcilableModel;
-import org.eclipse.jface.text.reconciler.IReconcileResult;
-import org.eclipse.jface.text.reconciler.IReconcileStep;
-import org.eclipse.jface.text.source.Annotation;
-
-import org.eclipse.ui.editors.text.EditorsUI;
-
-import org.eclipse.ui.texteditor.AnnotationTypeLookup;
-
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IProblemRequestor;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.WorkingCopyOwner;
-import org.eclipse.jdt.core.compiler.IProblem;
-
-import org.eclipse.jdt.internal.core.BufferManager;
-
-
-/**
- * This reconcile step has a Java source document as 
- * input model and maintains a Java working copy as its model.
- * <p>
- * FIXME: We do not destroy the temporary working copy at the end.
- *         There are two ways to fix this:
- *         1. destroy it after each reconcile call ==> no internal model anylonger
- * 		   2. add life-cycle to reconcile steps (at least dispose/destroy)
- * </p>
- * @since 3.0
- */
-public class JavaReconcileStep extends AbstractReconcileStep {
-
-	private AnnotationTypeLookup fAnnotationTypeLookup= EditorsUI.getAnnotationTypeLookup();
-	
-	private static class TemporaryWorkingCopyOwner extends WorkingCopyOwner  {
-
-
-		/*
-		 * @see org.eclipse.jdt.core.WorkingCopyOwner#createBuffer(org.eclipse.jdt.core.ICompilationUnit)
-		 */
-		public IBuffer createBuffer(ICompilationUnit workingCopy) {
-			// FIXME: Don't know how to get a buffer without using internal API.
-			return new BufferManager().createBuffer(workingCopy);
-		}
-	}
-
-	private class ProblemAdapter extends AnnotationAdapter  {
-		
-		private IProblem fProblem;
-		private Position fPosition;
-		
-		ProblemAdapter(IProblem problem)  {
-			fProblem= problem;
-		}
-
-		public Position getPosition()  {
-			if (fPosition == null)
-				fPosition= createPositionFromProblem();
-			return fPosition;
-		}
-
-		public Annotation createAnnotation() {
-			int start= fProblem.getSourceStart();
-			if (start < 0)
-				return null;
-				
-			int length= fProblem.getSourceEnd() - fProblem.getSourceStart() + 1;
-			if (length < 0)
-				return null;
-
-			int type= IMarker.SEVERITY_INFO;
-			if (fProblem.isError())
-				type= IMarker.SEVERITY_ERROR;
-			else if (fProblem.isWarning())
-				type= IMarker.SEVERITY_WARNING;
-				
-			return new Annotation(fAnnotationTypeLookup.getAnnotationType(IMarker.PROBLEM, type), false, fProblem.getMessage());
-		}
-		
-		private Position createPositionFromProblem() {
-			int start= fProblem.getSourceStart();
-			if (start < 0)
-				return null;
-				
-			int length= fProblem.getSourceEnd() - fProblem.getSourceStart() + 1;
-			if (length < 0)
-				return null;
-				
-			return new Position(start, length);
-		}
-	}
-
-	private class ProblemRequestor implements IProblemRequestor  {
-		
-		private List fCollectedProblems;
-		private boolean fIsActive= false;
-		private boolean fIsRunning= false;
-	
-		/*
-		 * @see IProblemRequestor#beginReporting()
-		 */
-		public void beginReporting() {
-			fIsRunning= true;
-			fCollectedProblems= new ArrayList();
-		}
-		
-		/*
-		 * @see IProblemRequestor#acceptProblem(IProblem)
-		 */
-		public void acceptProblem(IProblem problem) {
-			if (isActive())
-				fCollectedProblems.add(problem);
-		}
-	
-		/*
-		 * @see IProblemRequestor#endReporting()
-		 */
-		public void endReporting() {
-			fIsRunning= false;
-
-// WAS:
-//			if (!isActive())
-//				return;
-//				
-//			if (isCanceled())
-//				return;
-		}
-		
-		public IReconcileResult[] getReconcileResult() {
-			Assert.isTrue(!fIsRunning);
-
-			int size= fCollectedProblems.size();
-			IReconcileResult[] result= new IReconcileResult[size];
-
-			for (int i= 0; i < size; i++)
-				result[i]= new ProblemAdapter((IProblem)fCollectedProblems.get(i));
-			
-			return result;
-		}
-		
-		/*
-		 * @see IProblemRequestor#isActive()
-		 */
-		public boolean isActive() {
-			return fIsActive && fCollectedProblems != null && !isCanceled();
-		}
-		
-		/**
-		 * Sets the active state of this problem requestor.
-		 * 
-		 * @param isActive the state of this problem requestor
-		 */
-		public void setIsActive(boolean isActive) {
-			if (fIsActive != isActive) {
-				fIsActive= isActive;
-				if (fIsActive)
-					startCollectingProblems();
-				else
-					stopCollectingProblems();
-			}
-		}
-
-		/**
-		 * Tells this annotation model to collect temporary problems from now on.
-		 */
-		private void startCollectingProblems() {
-			fCollectedProblems= new ArrayList();
-		}
-
-		/**
-		 * Tells this annotation model to no longer collect temporary problems.
-		 */
-		private void stopCollectingProblems() {
-			// empty implementation
-		}
-	}
-
-	/**
-	 * Adapts an <code>ICompilationUnit</code> to the <code>ITextModel</code> interface.
-	 */
-	class CompilationUnitAdapter implements IReconcilableModel {
-		
-		private ICompilationUnit fCompilationUnit;
-		
-		CompilationUnitAdapter(ICompilationUnit cu) {
-			fCompilationUnit= cu;
-		}
-		
-		private ICompilationUnit getCompilationUnit() {
-			return fCompilationUnit;
-		}
-	}
-
-	private CompilationUnitAdapter fWorkingCopy;
-	private ProblemRequestor fProblemRequestor;
-	private WorkingCopyOwner fTemporaryWorkingCopyOwner;
-
-	/**
-	 * Creates the last reconcile step of the pipe.
-	 */
-	public JavaReconcileStep(IFile jspFile) {
-		Assert.isNotNull(jspFile);
-		fTemporaryWorkingCopyOwner= new TemporaryWorkingCopyOwner();
-		try {
-			fWorkingCopy= new CompilationUnitAdapter(createTemporaryWorkingCopy(jspFile));
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Creates an intermediate reconcile step which adds
-	 * the given step to the pipe.
-	 */
-	public JavaReconcileStep(IReconcileStep step, IFile jspFile) {
-		super(step);
-		Assert.isNotNull(jspFile);
-		fTemporaryWorkingCopyOwner= new TemporaryWorkingCopyOwner();
-		try {
-			fWorkingCopy= new CompilationUnitAdapter(createTemporaryWorkingCopy(jspFile));
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/*
-	 * @see AbstractReconcileStep#reconcileModel(DirtyRegion, IRegion)
-	 */
-	protected IReconcileResult[] reconcileModel(DirtyRegion dirtyRegion, IRegion subRegion) {
-		Assert.isTrue(getInputModel() instanceof DocumentAdapter, "wrong model"); //$NON-NLS-1$
-
-		ICompilationUnit cu= fWorkingCopy.getCompilationUnit(); 
-		// Cannot reconcile if CU could not be built
-		if (cu == null)
-			return null;
-
-		System.out.println("reconciling java model..."); //$NON-NLS-1$
-		
-		IBuffer buffer;
-		try {
-			buffer= cu.getBuffer();
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			buffer= null;
-		}
-		
-		if (buffer != null)
-			buffer.setContents(((DocumentAdapter)getInputModel()).getDocument().get());
-
-		try {
-			synchronized (cu) {
-				fProblemRequestor.setIsActive(true);
-				cu.reconcile(true, getProgressMonitor());
-			}
-		} catch (JavaModelException ex) {
-			ex.printStackTrace();
-		} finally  {
-			fProblemRequestor.setIsActive(false);
-		}
-
-		return fProblemRequestor.getReconcileResult();
-	}
-
-	/*
-	 * @see AbstractReconcileStep#getModel()
-	 */
-	public IReconcilableModel getModel() {
-		return fWorkingCopy;
-	}
-	
-	/*
-	 * @see org.eclipse.jdt.internal.corext.util.WorkingCopyUtil#getNewWorkingCopy
-	 */
-	private ICompilationUnit createTemporaryWorkingCopy(IFile jspFile) throws JavaModelException {
-
-		IContainer parent= jspFile.getParent();
-		IPackageFragment packageFragment= null;
-		IJavaElement je= JavaCore.create(parent);
-		
-		if (je == null || !je.exists())
-			return null;
-
-		switch (je.getElementType()) {
-			case IJavaElement.PACKAGE_FRAGMENT:
-				je= je.getParent();
-				// fall through
-
-			case IJavaElement.PACKAGE_FRAGMENT_ROOT:
-				IPackageFragmentRoot packageFragmentRoot= (IPackageFragmentRoot)je;
-				packageFragment= packageFragmentRoot.getPackageFragment(IPackageFragmentRoot.DEFAULT_PACKAGEROOT_PATH);
-				break;
-
-			case IJavaElement.JAVA_PROJECT:
-				IJavaProject jProject= (IJavaProject)je;
-	
-				if (!jProject.exists())  {
-					System.out.println("Abort reconciling: cannot create working copy: JSP is not in a Java project"); //$NON-NLS-1$
-					return null;
-				}
-					
-				packageFragmentRoot= null;
-				IPackageFragmentRoot[] packageFragmentRoots= jProject.getPackageFragmentRoots();
-				int i= 0;
-				while (i < packageFragmentRoots.length) {
-					if (!packageFragmentRoots[i].isArchive() && !packageFragmentRoots[i].isExternal()) {
-						packageFragmentRoot= packageFragmentRoots[i];
-						break;
-					}
-					i++;
-				}
-				if (packageFragmentRoot == null) {
-					System.out.println("Abort reconciling: cannot create working copy: JSP is not in a Java project with source package fragment root"); //$NON-NLS-1$
-					return null;
-				}
-				packageFragment= packageFragmentRoot.getPackageFragment(IPackageFragmentRoot.DEFAULT_PACKAGEROOT_PATH);
-				break;
-
-			default :
-				return null;
-		}
-		
-		fProblemRequestor= new ProblemRequestor();
-		
-		return packageFragment.getCompilationUnit("Demo.java").getWorkingCopy(fTemporaryWorkingCopyOwner, fProblemRequestor, getProgressMonitor()); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java
deleted file mode 100644
index 9d70e6c..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaReconcileStep.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.reconciler.AbstractReconcileStep;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcileStep;
-import org.eclipse.jface.text.reconciler.IReconcileResult;
-import org.eclipse.jface.text.reconciler.IReconcilableModel;
-import org.eclipse.jface.text.source.translation.ITranslator;
-
-import org.eclipse.jsp.JspTranslator;
-
-/**
- * This reconcile step has a JSP source document as 
- * input model and maintains a document that contains the Java
- * source.
- *
- * @since 3.0
- */
-public class Jsp2JavaReconcileStep extends AbstractReconcileStep {
-	
-	private DocumentAdapter fModel;
-	private ITranslator fJspTranslator;
-
-	/**
-	 * Creates the last reconcile step of the pipe.
-	 */
-	public Jsp2JavaReconcileStep() {
-		initialize();
-	}
-
-	/**
-	 * Creates an intermediate reconcile step which adds
-	 * the given step to the pipe.
-	 */
-	public Jsp2JavaReconcileStep(IReconcileStep step) {
-		super(step);
-		initialize();
-	}
-	
-	protected void initialize()  {
-		fJspTranslator= new JspTranslator();
-		fJspTranslator.setTagHandlerFactory(new Jsp2JavaTagHandlerFactory());
-	}
-
-	/*
-	 * @see AbstractReconcileStep#reconcileModel(DirtyRegion, IRegion)
-	 */
-	protected IReconcileResult[] reconcileModel(DirtyRegion dirtyRegion, IRegion subRegion) {
-		Assert.isTrue(getInputModel() instanceof DocumentAdapter, "wrong model"); //$NON-NLS-1$
-
-		System.out.println("reconciling jsp2java..."); //$NON-NLS-1$
-		
-		Reader reader= new StringReader(((DocumentAdapter)fInputModel).getDocument().get());
-		try {
-			String javaSource= fJspTranslator.translate(reader, "Demo"); //$NON-NLS-1$
-			fModel= new DocumentAdapter(new Document(javaSource));
-		} catch (IOException e) {
-			e.printStackTrace();
-			return null;
-		}
-
-		// This reconcile step does not create own results
-		return null;
-	}
-
-	/*
-	 * @see AbstractReconcileStep#getModel()
-	 */
-	public IReconcilableModel getModel() {
-		return fModel;
-	}
-
-	/*
-	 * @see AbstractReconcileStep#convertToInputModel(IReconcileResult[])
-	 */
-	protected IReconcileResult[] convertToInputModel(IReconcileResult[] inputResults) {
-
-		if (inputResults == null)
-			return null;
-
-		// the "only" thing we need to do is to adapt the positions
-		int[] smap= fJspTranslator.getLineMapping();
-
-		for (int i= 0; i < inputResults.length; i++) {				
-		
-			if (isCanceled())
-				return null;
-
-			if (!(inputResults[i] instanceof AnnotationAdapter))
-				continue;
-				
-			AnnotationAdapter result= (AnnotationAdapter)inputResults[i];
-			Position pos= result.getPosition();
-			int javaLine;
-			try {
-				javaLine= fModel.getDocument().getLineOfOffset(pos.offset);
-				
-				// Adjust offset to be relative to line beginning
-				pos.offset -= fModel.getDocument().getLineOffset(javaLine);
-				int relativeLineOffsetInJava= pos.offset;
-
-				int jspLine= smap[javaLine + 1]; // document is 0-based, smap is 1-based
-				
-				// Add Jsp line offset
-				pos.offset += ((DocumentAdapter)getInputModel()).getDocument().getLineOffset(jspLine-1); // document is 0-based, smap is 1-based
-				
-				String jspLineStr= ((DocumentAdapter)getInputModel()).getDocument().get(((DocumentAdapter)getInputModel()).getDocument().getLineOffset(jspLine-1), ((DocumentAdapter)getInputModel()).getDocument().getLineLength(jspLine-1));
-
-				// XXX: Once partitioner is in place the partition can be used to ease section detection
-				int offsetInLine= fJspTranslator.backTranslateOffsetInLine(jspLineStr, null, relativeLineOffsetInJava, null);
-				if (offsetInLine > 0)
-					pos.offset += offsetInLine;
-
-			} catch (BadLocationException e) {
-				e.printStackTrace();
-			}
-		}
-		return inputResults;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java
deleted file mode 100644
index 9827bef..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.source.translation.ITagHandler;
-import org.eclipse.jface.text.source.translation.ITranslatorResultCollector;
-
-/**
- * 
- * @since 3.0
- */
-public class Jsp2JavaTagHandler implements ITagHandler {
-
-	private boolean fInUseBean;
-	private boolean fInTagLib;
-	private String fTagLibValue;
-	private String fClass;
-	private String fId;
-	private String fSource;
-	private boolean fInDeclaration;
-	private boolean fInJavaSection;
-	
-
-	/*
-	 * @see org.eclipse.jface.text.source.ITagHandler#canHandleTag(java.lang.String)
-	 */
-	public boolean canHandleTag(String tag) {
-		return true;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.ITagHandler#canHandleText(java.lang.String)
-	 */
-	public boolean canHandleText(String text) {
-		return true;
-	}
-
-	public void reset(String startTag)  {
-		fInUseBean= "jsp:useBean".equals(startTag); //$NON-NLS-1$
-		fInTagLib= "c:out".equals(startTag); //$NON-NLS-1$
-		fInJavaSection= "<%".equals(startTag); //$NON-NLS-1$
-		fInDeclaration= "<%!".equals(startTag); //$NON-NLS-1$
-	}
-	/*
-	 * @see org.eclipse.jface.text.source.ITagHandler#addAttribute(java.lang.String, java.lang.String)
-	 */
-	public void addAttribute(String name, String value, int sourceLineNumber) {
-		if (fInUseBean) {
-			if ("id".equals(name)) //$NON-NLS-1$
-				fId= value;
-			else if ("class".equals(name)) //$NON-NLS-1$
-				fClass= value;
-		}
-		if (fInTagLib) {
-			fTagLibValue= value;
-		}
-		if ("source".equals(name)) //$NON-NLS-1$
-			fSource= value;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.ITagHandler#backTranslateOffsetInLine(java.lang.String, int)
-	 */
-	public int backTranslateOffsetInLine(String originalLine, String translatedLine, int offsetInTranslatedLine) {
-		int javaPartitionStart= 0;
-		if (originalLine.indexOf("<%") != -1) //$NON-NLS-1$
-			javaPartitionStart= handleJavaSection(originalLine, offsetInTranslatedLine);
-		else if (originalLine.indexOf("<jsp:useBean id=\"") != -1)  { //$NON-NLS-1$
-			javaPartitionStart= handleUseBeanTag(originalLine, offsetInTranslatedLine);
-		} else if (originalLine.indexOf("<c:out value=\"${") != -1)  { //$NON-NLS-1$
-			javaPartitionStart= handleTagLib(originalLine, offsetInTranslatedLine);
-		}
-		return javaPartitionStart;
-	}
-
-	private int handleJavaSection(String jspLineStr, int relativeLineOffsetInJava)  {
-		return jspLineStr.indexOf("<%") + 3; //$NON-NLS-1$
-	}
-
-	private int handleTagLib(String jspLineStr, int relativeLineOffsetInJava)  {
-		int javaFileOffset= "System.out.println(".length(); //$NON-NLS-1$
-		return jspLineStr.indexOf("<c:out value=\"${") + 16 - javaFileOffset; //$NON-NLS-1$
-	}
-	
-	/*
-	 * This is a good example where the relative line offset in the Java
-	 * document cannot be directly mapped back to Jsp document.
-	 */
-	private int handleUseBeanTag(String jspLineStr, int relativeLineOffsetInJava)  {
-
-		int javaPartitionStart;
-
-		int variableNameStart= jspLineStr.indexOf("<jsp:useBean id=\"") + 17; //$NON-NLS-1$
-		int variableNameLength= Math.max(0, jspLineStr.indexOf('"', variableNameStart) - variableNameStart);
-
-		int typeStart= jspLineStr.indexOf("class=\"") + 7; //$NON-NLS-1$
-		int typeLength= Math.max(0, jspLineStr.indexOf('"', typeStart) - typeStart);
-					
-		if (relativeLineOffsetInJava < typeLength)  {
-			javaPartitionStart= typeStart;
-		} else if (relativeLineOffsetInJava < typeLength + variableNameLength)
-			javaPartitionStart= variableNameStart;
-		else
-			javaPartitionStart= typeStart;
-
-		// start relative to Jsp line start
-		return javaPartitionStart - relativeLineOffsetInJava;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.ITagHandler#processEndTag(ITranslatorResultCollector, int)
-	 */
-	public void processEndTag(ITranslatorResultCollector resultCollector, int sourceLineNumber) throws IOException {
-		Assert.isTrue(resultCollector instanceof JspTranslatorResultCollector);
-
-		JspTranslatorResultCollector jspResultCollector= (JspTranslatorResultCollector)resultCollector;
-		
-		if (fInUseBean) {
-			if (fId != null && fClass != null) {
-				jspResultCollector.appendLocalDeclaration(fClass + " " + fId + "= new " + fClass + "();\n", sourceLineNumber); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				fId= fClass= null;
-			}
-			fInUseBean= false;
-		}
-		if (fInTagLib && fTagLibValue != null) {
-			jspResultCollector.appendContent("System.out.println(" + fTagLibValue.substring(2, fTagLibValue.length() - 1) + ");\n", sourceLineNumber);   //$NON-NLS-1$ //$NON-NLS-2$
-			fTagLibValue= null;
-			fInTagLib= false;
-		}
-		if (fInJavaSection)  {
-			int i= 0;
-			StringBuffer out= new StringBuffer();
-			while (i < fSource.length()) {
-				char c= fSource.charAt(i++);
-				if (c == '\n') {
-					jspResultCollector.appendContent(out.toString() + "\n", sourceLineNumber++); //$NON-NLS-1$
-					out.setLength(0);
-				} else {
-					out.append(c);	
-				}
-			}
-			if (out.length() > 0)  {
-				jspResultCollector.appendContent(out.toString() + "\n", sourceLineNumber); //$NON-NLS-1$
-			}
-		}
-		if (fInDeclaration)  {
-			int i= 0;
-			StringBuffer out= new StringBuffer();
-			while (i < fSource.length()) {
-				char c= fSource.charAt(i++);
-				if (c == '\n') {
-					jspResultCollector.appendDeclaration(out.toString() + "\n", sourceLineNumber++); //$NON-NLS-1$
-					out.setLength(0);
-				} else {
-					out.append(c);	
-				}
-			}
-			if (out.length() > 0)  {
-				jspResultCollector.appendDeclaration(out.toString() + "\n", sourceLineNumber); //$NON-NLS-1$
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandlerFactory.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandlerFactory.java
deleted file mode 100644
index 45f2ad2..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandlerFactory.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.jface.text.source.translation.ITagHandler;
-import org.eclipse.jface.text.source.translation.ITagHandlerFactory;
-
-/**
- * First cut of JSP to Java tag handler factory.
- * Only one handler is used to do the job.
- * 
- * @since 3.0
- */
-public class Jsp2JavaTagHandlerFactory implements ITagHandlerFactory {
-	
-	private ITagHandler fTagHandler= new Jsp2JavaTagHandler();
-
-	/*
-	 * @see org.eclipse.jface.text.source.IHandlerFactory#getHandler(java.lang.String)
-	 */
-	public ITagHandler getHandler(String tag) {
-		fTagHandler.reset(tag);
-		return fTagHandler;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.IHandlerFactory#findHandler(java.lang.String)
-	 */
-	public ITagHandler findHandler(String text) {
-		return fTagHandler;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspEditor.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspEditor.java
deleted file mode 100644
index 5a5f001..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspEditor.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.jface.text.source.IAnnotationAccess;
-
-import org.eclipse.ui.editors.text.FileDocumentProvider;
-import org.eclipse.ui.editors.text.TextEditor;
-
-import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
-
-
-/**
- * A simple JSP Editor.
- * 
- * @since 3.0
- */
-public class JspEditor extends TextEditor {
-
-	/**
-	 * Creates a new JSP editor.
-	 */
-	public JspEditor() {
-		super();
-		setSourceViewerConfiguration(new JspSourceViewerConfiguration(this));
-		setDocumentProvider(new FileDocumentProvider());
-		
-		
-		/*
-		 * FIXME:
-		 * This would be the right thing to do. Currently
-		 * we share the preferences with the text editor.
-		 */
-//		setPreferenceStore(JspUIPlugin.getDefault().getPreferenceStore());
-	}
-
-	/*
-	 * @see TextEditor#createAnnotationAccess()
-	 */
-	protected IAnnotationAccess createAnnotationAccess() {
-		return new DefaultMarkerAnnotationAccess();
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java
deleted file mode 100644
index 5fea16f..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspReconcilingStrategy.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcileStep;
-import org.eclipse.jface.text.reconciler.IReconcileResult;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Reconciling strategy for Java parts in JSP files.
- *
- * @since 3.0
- */
-public class JspReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension {
-
-	private IReconcileStep fFirstStep;
-	private ITextEditor fTextEditor;
-	private IProgressMonitor fProgressMonitor;
-	
-	public JspReconcilingStrategy(ISourceViewer sourceViewer, ITextEditor textEditor) {
-		fTextEditor= textEditor;
-		IReconcileStep javaReconcileStep= new JavaReconcileStep(getFile());
-		fFirstStep= new Jsp2JavaReconcileStep(javaReconcileStep);
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#setDocument(org.eclipse.jface.text.IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		fFirstStep.setInputModel(new DocumentAdapter(document));
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion, org.eclipse.jface.text.IRegion)
-	 */
-	public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
-		removeTemporaryAnnotations();
-		process(fFirstStep.reconcile(dirtyRegion, subRegion));
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion)
-	 */
-	public void reconcile(IRegion partition) {
-		removeTemporaryAnnotations();
-		process(fFirstStep.reconcile(partition));
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void setProgressMonitor(IProgressMonitor monitor) {
-		fFirstStep.setProgressMonitor(monitor);
-		fProgressMonitor= monitor;
-		
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#initialReconcile()
-	 */
-	public void initialReconcile() {
-		fFirstStep.reconcile(null);
-		
-	}
-
-	private void process(final IReconcileResult[] results) {
-		
-		if (results == null)
-			return;
-
-		IRunnableWithProgress runnable= new WorkspaceModifyOperation(null) 	 {
-			/*
-			 * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-			 */
-			protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-				for (int i= 0; i < results.length; i++) {				
-
-					if (fProgressMonitor != null && fProgressMonitor.isCanceled())
-						return;
-		
-					if (!(results[i] instanceof AnnotationAdapter))
-						continue;
-				
-					AnnotationAdapter result= (AnnotationAdapter)results[i];
-					Position pos= result.getPosition();
-					
-					Annotation annotation= result.createAnnotation();
-					getAnnotationModel().addAnnotation(annotation, pos);
-				}
-			}
-		};
-		try {
-			runnable.run(null);
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private IAnnotationModel getAnnotationModel()  {
-		return fTextEditor.getDocumentProvider().getAnnotationModel(fTextEditor.getEditorInput());
-	}
-
-	/*
-	 * XXX: A "real" implementation must be smarter
-	 * 		i.e. don't remove and add the annotations
-	 * 		which are the same.
-	 */	
-	private void removeTemporaryAnnotations() {
-		Iterator iter= getAnnotationModel().getAnnotationIterator();
-		while (iter.hasNext())  {
-			Object annotation= iter.next();
-			if (annotation instanceof Annotation)  {
-				Annotation extension= (Annotation)annotation;
-					if (!extension.isPersistent())
-						getAnnotationModel().removeAnnotation((Annotation)annotation);
-			}
-		}
-	}
-
-	private IFile getFile() {
-		IEditorInput input= fTextEditor.getEditorInput();
-		if (!(input instanceof IFileEditorInput))
-			return null;
-		
-		return ((IFileEditorInput)input).getFile();			
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspSourceViewerConfiguration.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspSourceViewerConfiguration.java
deleted file mode 100644
index 36c000b..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspSourceViewerConfiguration.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.reconciler.MonoReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-
-import org.eclipse.ui.texteditor.ITextEditor;
-
-
-/**
- * Configuration information for a simple JSP source viewer.
- * 
- * @since 3.0
- */
-public class JspSourceViewerConfiguration extends SourceViewerConfiguration {
-
-	private ITextEditor fTextEditor;
-
-	/**
-	 * Creates a new JSP source viewer configuration that behaves
-	 * according to the specification of this class' methods.
-	 */
-	public JspSourceViewerConfiguration(ITextEditor textEditor) {
-		fTextEditor= textEditor;
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer)
-	 */
-	public IReconciler getReconciler(ISourceViewer sourceViewer) {
-		IReconcilingStrategy reconcilingStrategy= new JspReconcilingStrategy(sourceViewer, fTextEditor);
-		MonoReconciler reconciler= new MonoReconciler(reconcilingStrategy, false);
-		reconciler.setProgressMonitor(new NullProgressMonitor());		
-		reconciler.setDelay(500);
-		return reconciler;
-	}
-
-	/*
-	 * @see SourceViewerConfiguration#getAnnotationHover(ISourceViewer)
-	 */
-	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
-		return new DefaultAnnotationHover();
-	}
-
-	/*
-	 * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String)
-	 */
-	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
-		return new AnnotationTextHover(fTextEditor.getDocumentProvider().getAnnotationModel(fTextEditor.getEditorInput()));
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspTranslatorResultCollector.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspTranslatorResultCollector.java
deleted file mode 100644
index 1831bb6..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/JspTranslatorResultCollector.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.ui.examples.jspeditor;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.source.translation.ITranslatorResultCollector;
-
-/**
- * Collects the result for the JspTranslator.
- * 
- * @since 3.0
- */
-public class JspTranslatorResultCollector implements ITranslatorResultCollector {
-
-	private StringBuffer fDeclarations= new StringBuffer();
-	private StringBuffer fContent= new StringBuffer();
-	private StringBuffer fLocalDeclarations= new StringBuffer();
-	
-	private ArrayList fContentLines= new ArrayList();
-	private ArrayList fDeclarationLines= new ArrayList();
-	private ArrayList fLocalDeclarationLines= new ArrayList();
-
-	/**
-	 * @param declarations
-	 * @param localDeclarations
-	 * @param content
-	 * @param declarationLines
-	 * @param localDeclarationLines
-	 * @param contentLines
-	 */
-	public JspTranslatorResultCollector(StringBuffer declarations, StringBuffer localDeclarations, StringBuffer content, ArrayList declarationLines, ArrayList localDeclarationLines, ArrayList contentLines) {
-		fDeclarations= declarations;
-		fLocalDeclarations= localDeclarations;
-		fContent= content;
-		fDeclarationLines= declarationLines;
-		fLocalDeclarationLines= localDeclarationLines;
-		fContentLines= contentLines;
-	}
-
-	// XXX: In the real world we would need to pass a list of line numbers
-	public void appendDeclaration(String string, int lineNumber)  {
-		fDeclarations.append(string);
-		fDeclarationLines.add(new Integer(lineNumber));
-	}
-
-	// XXX: In the real world we would need to pass a list of line numbers
-	public void appendLocalDeclaration(String string, int lineNumber)  {
-		fLocalDeclarations.append(string);
-		fLocalDeclarationLines.add(new Integer(lineNumber));
-	}
-
-	// XXX: In the real world we would need to pass a list of line numbers
-	public void appendContent(String string, int lineNumber)  {
-		fContent.append(string);
-		fContentLines.add(new Integer(lineNumber));
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchOperation.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchOperation.java
deleted file mode 100644
index 0955b93..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchOperation.java
+++ /dev/null

@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.search2;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jsp.*;
-import org.eclipse.jsp.JspTypeQuery;
-
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchResultCollector;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-import org.eclipse.jdt.ui.JavaUI;
-
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.search.PrettySignature;
-import org.eclipse.jdt.internal.ui.search.SearchMessages;
-
-
-public class JavaSearchOperation extends WorkspaceModifyOperation {
-	
-	private IWorkspace fWorkspace;
-	private IJavaElement fElementPattern;
-	private int fLimitTo;
-	private String fStringPattern;
-	private boolean fIsCaseSensitive;
-	private int fSearchFor;
-	private IJavaSearchScope fScope;
-	private String fScopeDescription;
-	private JavaSearchResultCollector fCollector;
-	
-	protected JavaSearchOperation(
-				IWorkspace workspace,
-				int limitTo,
-				IJavaSearchScope scope,
-				String scopeDescription,
-				JavaSearchResultCollector collector) {
-		super(null);
-		fWorkspace= workspace;
-		fLimitTo= limitTo;
-		fScope= scope;
-		fScopeDescription= scopeDescription;
-		fCollector= collector;
-		fCollector.setOperation(this);
-	}
-	
-	public JavaSearchOperation(
-				IWorkspace workspace,
-				IJavaElement pattern,
-				int limitTo,
-				IJavaSearchScope scope,
-				String scopeDescription,
-				JavaSearchResultCollector collector) {
-		this(workspace, limitTo, scope, scopeDescription, collector);
-		fElementPattern= pattern;
-	}
-	
-	public JavaSearchOperation(
-				IWorkspace workspace,
-				String pattern,
-				boolean caseSensitive,
-				int searchFor, 
-				int limitTo,
-				IJavaSearchScope scope,
-				String scopeDescription,
-				JavaSearchResultCollector collector) {
-		this(workspace, limitTo, scope, scopeDescription, collector);
-		fStringPattern= pattern;
-		fIsCaseSensitive= caseSensitive;
-		fSearchFor= searchFor;
-	}
-	
-	protected void execute(IProgressMonitor monitor) throws CoreException {
-		fCollector.setProgressMonitor(monitor);
-		
-		// A hack to temporarily disable the aboutToStart and done methods
-		IJavaSearchResultCollector collector= new IJavaSearchResultCollector() {
-			public void aboutToStart() {
-				// empty implementation
-			}
-			public void accept(IResource resource, int start, int end, IJavaElement enclosingElement, int accuracy) throws CoreException {
-				fCollector.accept(resource, start, end, enclosingElement, accuracy);
-			}
-			public void done() {
-				// empty implementation
-			}
-			public IProgressMonitor getProgressMonitor() {
-				return fCollector.getProgressMonitor();
-			}
-		};
-		
-		fCollector.aboutToStart();
-
-		// Also search working copies
-		SearchEngine engine= new SearchEngine(JavaUI.getSharedWorkingCopiesOnClasspath());
-		
-		if (fElementPattern != null)
-			engine.search(fWorkspace, fElementPattern, fLimitTo, fScope, collector);
-		else
-			engine.search(fWorkspace, SearchEngine.createSearchPattern(fStringPattern, fSearchFor, fLimitTo, fIsCaseSensitive), fScope, collector);
-
-		if (fElementPattern instanceof IType)
-			JspSearchEngine.search(collector, new JspTypeQuery((IType)fElementPattern), monitor);
-			
-		fCollector.done();
-	}
-
-	String getSingularLabel() {
-		String desc= null;
-		if (fElementPattern != null) {
-			if (fLimitTo == IJavaSearchConstants.REFERENCES
-			&& fElementPattern.getElementType() == IJavaElement.METHOD)
-				desc= PrettySignature.getUnqualifiedMethodSignature((IMethod)fElementPattern);
-			else
-				desc= fElementPattern.getElementName();
-			if ("".equals(desc) && fElementPattern.getElementType() == IJavaElement.PACKAGE_FRAGMENT) //$NON-NLS-1$
-				desc= SearchMessages.getString("JavaSearchOperation.default_package"); //$NON-NLS-1$
-		}
-		else
-			desc= fStringPattern;
-
-		String[] args= new String[] {desc, fScopeDescription}; //$NON-NLS-1$
-		switch (fLimitTo) {
-			case IJavaSearchConstants.IMPLEMENTORS:
-				return SearchMessages.getFormattedString("JavaSearchOperation.singularImplementorsPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.DECLARATIONS:
-				return SearchMessages.getFormattedString("JavaSearchOperation.singularDeclarationsPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.REFERENCES:
-				return SearchMessages.getFormattedString("JavaSearchOperation.singularReferencesPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.ALL_OCCURRENCES:
-				return SearchMessages.getFormattedString("JavaSearchOperation.singularOccurrencesPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.READ_ACCESSES:
-				return SearchMessages.getFormattedString("JavaSearchOperation.singularReadReferencesPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.WRITE_ACCESSES:
-				return SearchMessages.getFormattedString("JavaSearchOperation.singularWriteReferencesPostfix", args); //$NON-NLS-1$
-			default:
-				return SearchMessages.getFormattedString("JavaSearchOperation.singularOccurrencesPostfix", args); //$NON-NLS-1$;
-		}
-	}
-
-	String getPluralLabelPattern() {
-		String desc= null;
-		if (fElementPattern != null) {
-			if (fLimitTo == IJavaSearchConstants.REFERENCES
-			&& fElementPattern.getElementType() == IJavaElement.METHOD)
-				desc= PrettySignature.getUnqualifiedMethodSignature((IMethod)fElementPattern);
-			else
-				desc= fElementPattern.getElementName();
-			if ("".equals(desc) && fElementPattern.getElementType() == IJavaElement.PACKAGE_FRAGMENT) //$NON-NLS-1$
-				desc= SearchMessages.getString("JavaSearchOperation.default_package"); //$NON-NLS-1$
-		}
-		else
-			desc= fStringPattern;
-
-		String[] args= new String[] {desc, "{0}", fScopeDescription}; //$NON-NLS-1$
-		switch (fLimitTo) {
-			case IJavaSearchConstants.IMPLEMENTORS:
-				return SearchMessages.getFormattedString("JavaSearchOperation.pluralImplementorsPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.DECLARATIONS:
-				return SearchMessages.getFormattedString("JavaSearchOperation.pluralDeclarationsPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.REFERENCES:
-				return SearchMessages.getFormattedString("JavaSearchOperation.pluralReferencesPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.ALL_OCCURRENCES:
-				return SearchMessages.getFormattedString("JavaSearchOperation.pluralOccurrencesPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.READ_ACCESSES:
-				return SearchMessages.getFormattedString("JavaSearchOperation.pluralReadReferencesPostfix", args); //$NON-NLS-1$
-			case IJavaSearchConstants.WRITE_ACCESSES:
-				return SearchMessages.getFormattedString("JavaSearchOperation.pluralWriteReferencesPostfix", args); //$NON-NLS-1$
-			default:
-				return SearchMessages.getFormattedString("JavaSearchOperation.pluralOccurrencesPostfix", args); //$NON-NLS-1$;
-		}
-	}
-	
-	ImageDescriptor getImageDescriptor() {
-		if (fLimitTo == IJavaSearchConstants.IMPLEMENTORS || fLimitTo == IJavaSearchConstants.DECLARATIONS)
-			return JavaPluginImages.DESC_OBJS_SEARCH_DECL;
-		else
-			return JavaPluginImages.DESC_OBJS_SEARCH_REF;
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchPage2.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchPage2.java
deleted file mode 100644
index 781a7f5..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchPage2.java
+++ /dev/null

@@ -1,736 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.search2;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.jface.text.ITextSelection;
-
-import org.eclipse.jsp.JspUIPlugin;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-import org.eclipse.search.ui.ISearchPage;
-import org.eclipse.search.ui.ISearchPageContainer;
-import org.eclipse.search.ui.ISearchResultViewEntry;
-import org.eclipse.search.ui.SearchUI;
-
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-
-import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
-import org.eclipse.jdt.internal.ui.browsing.LogicalPackage;
-import org.eclipse.jdt.internal.ui.search.JavaSearchScopeFactory;
-import org.eclipse.jdt.internal.ui.search.PrettySignature;
-import org.eclipse.jdt.internal.ui.search.SearchMessages;
-import org.eclipse.jdt.internal.ui.search.SearchUtil;
-import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.jdt.internal.ui.util.RowLayouter;
-
-public class JavaSearchPage2 extends DialogPage implements ISearchPage, IJavaSearchConstants {
-
-	public static final String EXTENSION_POINT_ID= "org.eclipse.jdt.ui.JavaSearchPage"; //$NON-NLS-1$
-
-	// Dialog store id constants
-	private final static String PAGE_NAME= "JavaSearchPage"; //$NON-NLS-1$
-	private final static String STORE_CASE_SENSITIVE= PAGE_NAME + "CASE_SENSITIVE"; //$NON-NLS-1$
-
-
-	private static List fgPreviousSearchPatterns= new ArrayList(20);
-
-	private SearchPatternData fInitialData;
-	private IStructuredSelection fStructuredSelection;
-	private IJavaElement fJavaElement;
-	private boolean fFirstTime= true;
-	private IDialogSettings fDialogSettings;
-	private boolean fIsCaseSensitive;
-	
-	private Combo fPattern;
-	private ISearchPageContainer fContainer;
-	private Button fCaseSensitive;
-	
-	private Button[] fSearchFor;
-	private String[] fSearchForText= {
-		SearchMessages.getString("SearchPage.searchFor.type"), //$NON-NLS-1$
-		SearchMessages.getString("SearchPage.searchFor.method"), //$NON-NLS-1$
-		SearchMessages.getString("SearchPage.searchFor.package"), //$NON-NLS-1$
-		SearchMessages.getString("SearchPage.searchFor.constructor"), //$NON-NLS-1$
-		SearchMessages.getString("SearchPage.searchFor.field")}; //$NON-NLS-1$
-
-	private Button[] fLimitTo;
-	private String[] fLimitToText= {
-		SearchMessages.getString("SearchPage.limitTo.declarations"), //$NON-NLS-1$
-		SearchMessages.getString("SearchPage.limitTo.implementors"), //$NON-NLS-1$
-		SearchMessages.getString("SearchPage.limitTo.references"), //$NON-NLS-1$
-		SearchMessages.getString("SearchPage.limitTo.allOccurrences"), //$NON-NLS-1$
-		SearchMessages.getString("SearchPage.limitTo.readReferences"), //$NON-NLS-1$		
-		SearchMessages.getString("SearchPage.limitTo.writeReferences")}; //$NON-NLS-1$
-
-
-	private static class SearchPatternData {
-		int			searchFor;
-		int			limitTo;
-		String			pattern;
-		boolean		isCaseSensitive;
-		IJavaElement	javaElement;
-		int			scope;
-		IWorkingSet[]	 	workingSets;
-		
-		public SearchPatternData(int s, int l, boolean i, String p, IJavaElement element) {
-			this(s, l, p, i, element, ISearchPageContainer.WORKSPACE_SCOPE, null);
-		}
-		
-		public SearchPatternData(int s, int l, String p, boolean i, IJavaElement element, int scope0, IWorkingSet[] workingSets0) {
-			searchFor= s;
-			limitTo= l;
-			pattern= p;
-			isCaseSensitive= i;
-			javaElement= element;
-			this.scope= scope0;
-			this.workingSets= workingSets0;
-		}
-	}
-
-	//---- Action Handling ------------------------------------------------
-	
-	public boolean performAction() {
-		SearchUI.activateSearchResultView();
-
-		SearchPatternData data= getPatternData();
-		IWorkspace workspace= JavaPlugin.getWorkspace();
-
-		// Setup search scope
-		IJavaSearchScope scope= null;
-		String scopeDescription= ""; //$NON-NLS-1$
-		switch (getContainer().getSelectedScope()) {
-			case ISearchPageContainer.WORKSPACE_SCOPE:
-				scopeDescription= SearchMessages.getString("WorkspaceScope"); //$NON-NLS-1$
-				scope= SearchEngine.createWorkspaceScope();
-				break;
-			case ISearchPageContainer.SELECTION_SCOPE:
-				scopeDescription= SearchMessages.getString("SelectionScope"); //$NON-NLS-1$
-				scope= JavaSearchScopeFactory.getInstance().createJavaSearchScope(fStructuredSelection, true);
-				break;
-			case ISearchPageContainer.WORKING_SET_SCOPE:
-				IWorkingSet[] workingSets= getContainer().getSelectedWorkingSets();
-				// should not happen - just to be sure
-				if (workingSets == null || workingSets.length < 1)
-					return false;
-				scopeDescription= SearchMessages.getFormattedString("WorkingSetScope", SearchUtil.toString(workingSets)); //$NON-NLS-1$
-				scope= JavaSearchScopeFactory.getInstance().createJavaSearchScope(getContainer().getSelectedWorkingSets(), true);
-				SearchUtil.updateLRUWorkingSets(getContainer().getSelectedWorkingSets());
-		}		
-		
-		JavaSearchResultCollector collector= new JavaSearchResultCollector();
-		JavaSearchOperation op= null;
-		if (data.javaElement != null && getPattern().equals(fInitialData.pattern)) {
-			op= new JavaSearchOperation(workspace, data.javaElement, data.limitTo, scope, scopeDescription, collector);
-			if (data.limitTo == IJavaSearchConstants.REFERENCES)
-				SearchUtil.warnIfBinaryConstant(data.javaElement, getShell());
-		} else {
-			data.javaElement= null;
-			op= new JavaSearchOperation(workspace, data.pattern, data.isCaseSensitive, data.searchFor, data.limitTo, scope, scopeDescription, collector);
-		}
-		Shell shell= getControl().getShell();
-		try {
-			getContainer().getRunnableContext().run(true, true, op);
-		} catch (InvocationTargetException ex) {
-			ExceptionHandler.handle(ex, shell, SearchMessages.getString("Search.Error.search.title"), SearchMessages.getString("Search.Error.search.message")); //$NON-NLS-2$ //$NON-NLS-1$
-			return false;
-		} catch (InterruptedException ex) {
-			return false;
-		}
-		return true;
-	}
-	
-	private int getLimitTo() {
-		for (int i= 0; i < fLimitTo.length; i++) {
-			if (fLimitTo[i].getSelection())
-				return i;
-		}
-		return -1;
-	}
-
-	private void setLimitTo(int searchFor) {
-		fLimitTo[DECLARATIONS].setEnabled(true);
-		fLimitTo[IMPLEMENTORS].setEnabled(false);
-		fLimitTo[REFERENCES].setEnabled(true);			
-		fLimitTo[ALL_OCCURRENCES].setEnabled(true);
-		fLimitTo[READ_ACCESSES].setEnabled(false);
-		fLimitTo[WRITE_ACCESSES].setEnabled(false);
-		
-		if (!(searchFor == TYPE || searchFor == INTERFACE) && fLimitTo[IMPLEMENTORS].getSelection()) {
-			fLimitTo[IMPLEMENTORS].setSelection(false);
-			fLimitTo[REFERENCES].setSelection(true);
-		}
-
-		if (!(searchFor == FIELD) && (getLimitTo() == READ_ACCESSES || getLimitTo() == WRITE_ACCESSES)) {
-			fLimitTo[getLimitTo()].setSelection(false);
-			fLimitTo[REFERENCES].setSelection(true);
-		}
-
-		switch (searchFor) {
-			case TYPE:
-			case INTERFACE:
-				fLimitTo[IMPLEMENTORS].setEnabled(true);
-				break;
-			case FIELD:
-				fLimitTo[READ_ACCESSES].setEnabled(true);
-				fLimitTo[WRITE_ACCESSES].setEnabled(true);
-				break;
-			default :
-				break;
-		}
-	}
-
-	private String[] getPreviousSearchPatterns() {
-		// Search results are not persistent
-		int patternCount= fgPreviousSearchPatterns.size();
-		String [] patterns= new String[patternCount];
-		for (int i= 0; i < patternCount; i++)
-			patterns[i]= ((SearchPatternData) fgPreviousSearchPatterns.get(patternCount - 1 - i)).pattern;
-		return patterns;
-	}
-	
-	private int getSearchFor() {
-		for (int i= 0; i < fSearchFor.length; i++) {
-			if (fSearchFor[i].getSelection())
-				return i;
-		}
-		Assert.isTrue(false, "shouldNeverHappen"); //$NON-NLS-1$
-		return -1;
-	}
-	
-	private String getPattern() {
-		return fPattern.getText();
-	}
-
-	/**
-	 * Return search pattern data and update previous searches.
-	 * An existing entry will be updated.
-	 */
-	private SearchPatternData getPatternData() {
-		String pattern= getPattern();
-		SearchPatternData match= null;
-		int i= 0;
-		int size= fgPreviousSearchPatterns.size();
-		while (match == null && i < size) {
-			match= (SearchPatternData) fgPreviousSearchPatterns.get(i);
-			i++;
-			if (!pattern.equals(match.pattern))
-				match= null;
-		}
-		if (match == null) {
-			match= new SearchPatternData(
-							getSearchFor(),
-							getLimitTo(),
-							pattern,
-							fCaseSensitive.getSelection(),
-							fJavaElement,
-							getContainer().getSelectedScope(),
-							getContainer().getSelectedWorkingSets());
-			fgPreviousSearchPatterns.add(match);
-		}
-		else {
-			match.searchFor= getSearchFor();
-			match.limitTo= getLimitTo();
-			match.isCaseSensitive= fCaseSensitive.getSelection();
-			match.javaElement= fJavaElement;
-			match.scope= getContainer().getSelectedScope();
-			match.workingSets= getContainer().getSelectedWorkingSets();
-		}
-		return match;
-	}
-
-	/*
-	 * Implements method from IDialogPage
-	 */
-	public void setVisible(boolean visible) {
-		if (visible && fPattern != null) {
-			if (fFirstTime) {
-				fFirstTime= false;
-				// Set item and text here to prevent page from resizing
-				fPattern.setItems(getPreviousSearchPatterns());
-				initSelections();
-			}
-			fPattern.setFocus();
-			getContainer().setPerformActionEnabled(fPattern.getText().length() > 0);
-		}
-		super.setVisible(visible);
-	}
-	
-	public boolean isValid() {
-		return true;
-	}
-
-	//---- Widget creation ------------------------------------------------
-
-	/**
-	 * Creates the page's content.
-	 */
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-		readConfiguration();
-		
-		GridData gd;
-		Composite result= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout(2, false);
-		layout.horizontalSpacing= 10;
-		result.setLayout(layout);
-		result.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		RowLayouter layouter= new RowLayouter(layout.numColumns);
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.FILL;
-		gd.verticalAlignment= GridData.VERTICAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_FILL;
-	
-		layouter.setDefaultGridData(gd, 0);
-		layouter.setDefaultGridData(gd, 1);
-		layouter.setDefaultSpan();
-
-		layouter.perform(createExpression(result));
-		layouter.perform(createSearchFor(result), createLimitTo(result), -1);
-		
-		SelectionAdapter javaElementInitializer= new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if (getSearchFor() == fInitialData.searchFor)
-					fJavaElement= fInitialData.javaElement;
-				else
-					fJavaElement= null;
-				setLimitTo(getSearchFor());
-				updateCaseSensitiveCheckbox();
-			}
-		};
-
-		fSearchFor[TYPE].addSelectionListener(javaElementInitializer);
-		fSearchFor[METHOD].addSelectionListener(javaElementInitializer);
-		fSearchFor[FIELD].addSelectionListener(javaElementInitializer);
-		fSearchFor[CONSTRUCTOR].addSelectionListener(javaElementInitializer);
-		fSearchFor[PACKAGE].addSelectionListener(javaElementInitializer);
-
-		setControl(result);
-
-		Dialog.applyDialogFont(result);
-		WorkbenchHelp.setHelp(result, IJavaHelpContextIds.JAVA_SEARCH_PAGE);	
-	}
-
-	private Control createExpression(Composite parent) {
-		Composite result= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout(2, false);
-		result.setLayout(layout);
-		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		gd.horizontalSpan= 2;
-		gd.horizontalIndent= 0;
-		result.setLayoutData(gd);
-
-		// Pattern text + info
-		Label label= new Label(result, SWT.LEFT);
-		label.setText(SearchMessages.getString("SearchPage.expression.label")); //$NON-NLS-1$
-		gd= new GridData(GridData.BEGINNING);
-		gd.horizontalSpan= 2;
-//		gd.horizontalIndent= -gd.horizontalIndent;
-		label.setLayoutData(gd);
-
-		// Pattern combo
-		fPattern= new Combo(result, SWT.SINGLE | SWT.BORDER);
-		fPattern.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handlePatternSelected();
-			}
-		});
-		fPattern.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				getContainer().setPerformActionEnabled(getPattern().length() > 0);
-				updateCaseSensitiveCheckbox();
-			}
-		});
-		gd= new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		gd.horizontalIndent= -gd.horizontalIndent;
-		fPattern.setLayoutData(gd);
-
-
-		// Ignore case checkbox		
-		fCaseSensitive= new Button(result, SWT.CHECK);
-		fCaseSensitive.setText(SearchMessages.getString("SearchPage.expression.caseSensitive")); //$NON-NLS-1$
-		gd= new GridData();
-		fCaseSensitive.setLayoutData(gd);
-		fCaseSensitive.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fIsCaseSensitive= fCaseSensitive.getSelection();
-				writeConfiguration();
-			}
-		});
-		
-		return result;
-	}
-
-	private void updateCaseSensitiveCheckbox() {
-		if (fInitialData != null && getPattern().equals(fInitialData.pattern) && fJavaElement != null) {
-			fCaseSensitive.setEnabled(false);
-			fCaseSensitive.setSelection(true);
-		}
-		else {
-			fCaseSensitive.setEnabled(true);
-			fCaseSensitive.setSelection(fIsCaseSensitive);
-		}
-	}
-
-	private void handlePatternSelected() {
-		if (fPattern.getSelectionIndex() < 0)
-			return;
-		int index= fgPreviousSearchPatterns.size() - 1 - fPattern.getSelectionIndex();
-		fInitialData= (SearchPatternData) fgPreviousSearchPatterns.get(index);
-		for (int i= 0; i < fSearchFor.length; i++)
-			fSearchFor[i].setSelection(false);
-		for (int i= 0; i < fLimitTo.length; i++)
-			fLimitTo[i].setSelection(false);
-		fSearchFor[fInitialData.searchFor].setSelection(true);
-		setLimitTo(fInitialData.searchFor);
-		fLimitTo[fInitialData.limitTo].setSelection(true);
-
-		fPattern.setText(fInitialData.pattern);
-		fIsCaseSensitive= fInitialData.isCaseSensitive;
-		fJavaElement= fInitialData.javaElement;
-		fCaseSensitive.setEnabled(fJavaElement == null);
-		fCaseSensitive.setSelection(fInitialData.isCaseSensitive);
-
-		if (fInitialData.workingSets != null)
-			getContainer().setSelectedWorkingSets(fInitialData.workingSets);
-		else
-			getContainer().setSelectedScope(fInitialData.scope);
-	}
-
-	private Control createSearchFor(Composite parent) {
-		Group result= new Group(parent, SWT.NONE);
-		result.setText(SearchMessages.getString("SearchPage.searchFor.label")); //$NON-NLS-1$
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 3;
-		result.setLayout(layout);
-
-		fSearchFor= new Button[fSearchForText.length];
-		for (int i= 0; i < fSearchForText.length; i++) {
-			Button button= new Button(result, SWT.RADIO);
-			button.setText(fSearchForText[i]);
-			fSearchFor[i]= button;
-		}
-
-		// Fill with dummy radio buttons
-		Button filler= new Button(result, SWT.RADIO);
-		filler.setVisible(false);
-		filler= new Button(result, SWT.RADIO);
-		filler.setVisible(false);
-
-		return result;		
-	}
-	
-	private Control createLimitTo(Composite parent) {
-		Group result= new Group(parent, SWT.NONE);
-		result.setText(SearchMessages.getString("SearchPage.limitTo.label")); //$NON-NLS-1$
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		result.setLayout(layout);
-
-		fLimitTo= new Button[fLimitToText.length];
-		for (int i= 0; i < fLimitToText.length; i++) {
-			Button button= new Button(result, SWT.RADIO);
-			button.setText(fLimitToText[i]);
-			fLimitTo[i]= button;
-		}
-		return result;		
-	}	
-	
-	private void initSelections() {
-		fStructuredSelection= asStructuredSelection();
-		fInitialData= tryStructuredSelection(fStructuredSelection);
-		if (fInitialData == null)
-			fInitialData= trySimpleTextSelection(getContainer().getSelection());
-		if (fInitialData == null)
-			fInitialData= getDefaultInitValues();
-
-		fJavaElement= fInitialData.javaElement;
-		fCaseSensitive.setSelection(fInitialData.isCaseSensitive);
-		fCaseSensitive.setEnabled(fInitialData.javaElement == null);
-		fSearchFor[fInitialData.searchFor].setSelection(true);
-		setLimitTo(fInitialData.searchFor);
-		fLimitTo[fInitialData.limitTo].setSelection(true);		
-		fPattern.setText(fInitialData.pattern);
-	}
-
-	private SearchPatternData tryStructuredSelection(IStructuredSelection selection) {
-		if (selection == null || selection.size() > 1)
-			return null;
-
-		Object o= selection.getFirstElement();
-		if (o instanceof IJavaElement) {
-			return determineInitValuesFrom((IJavaElement)o);
-		} else if (o instanceof ISearchResultViewEntry) {
-			IJavaElement element= SearchUtil.getJavaElement(((ISearchResultViewEntry)o).getSelectedMarker());
-			return determineInitValuesFrom(element);
-		} else if (o instanceof LogicalPackage) {
-			LogicalPackage lp= (LogicalPackage)o;
-			return new SearchPatternData(PACKAGE, REFERENCES, fIsCaseSensitive, lp.getElementName(), null);
-		} else if (o instanceof IAdaptable) {
-			IJavaElement element= (IJavaElement)((IAdaptable)o).getAdapter(IJavaElement.class);
-			if (element != null) {
-				return determineInitValuesFrom(element);
-			} else {
-				IWorkbenchAdapter adapter= (IWorkbenchAdapter)((IAdaptable)o).getAdapter(IWorkbenchAdapter.class);
-				if (adapter != null)
-					return new SearchPatternData(TYPE, REFERENCES, fIsCaseSensitive, adapter.getLabel(o), null);
-			}
-		}
-		return null;
-	}
-
-	private SearchPatternData determineInitValuesFrom(IJavaElement element) {
-		if (element == null)
-			return null;
-		int searchFor= UNKNOWN;
-		int limitTo= UNKNOWN;
-		String pattern= null; 
-		switch (element.getElementType()) {
-			case IJavaElement.PACKAGE_FRAGMENT:
-				searchFor= PACKAGE;
-				limitTo= REFERENCES;
-				pattern= element.getElementName();
-				break;
-			case IJavaElement.PACKAGE_FRAGMENT_ROOT:
-				searchFor= PACKAGE;
-				limitTo= REFERENCES;
-				pattern= element.getElementName();
-				break;
-			case IJavaElement.PACKAGE_DECLARATION:
-				searchFor= PACKAGE;
-				limitTo= REFERENCES;
-				pattern= element.getElementName();
-				break;
-			case IJavaElement.IMPORT_DECLARATION:
-				pattern= element.getElementName();
-				IImportDeclaration declaration= (IImportDeclaration)element;
-				if (declaration.isOnDemand()) {
-					searchFor= PACKAGE;
-					int index= pattern.lastIndexOf('.');
-					pattern= pattern.substring(0, index);
-				} else {
-					searchFor= TYPE;
-				}
-				limitTo= DECLARATIONS;
-				break;
-			case IJavaElement.TYPE:
-				searchFor= TYPE;
-				limitTo= REFERENCES;
-				pattern= JavaModelUtil.getFullyQualifiedName((IType)element);
-				break;
-			case IJavaElement.COMPILATION_UNIT:
-				ICompilationUnit cu= (ICompilationUnit)element;
-				String mainTypeName= element.getElementName().substring(0, element.getElementName().indexOf(".")); //$NON-NLS-1$
-				IType mainType= cu.getType(mainTypeName);
-				mainTypeName= JavaModelUtil.getTypeQualifiedName(mainType);
-				try {					
-					mainType= JavaModelUtil.findTypeInCompilationUnit(cu, mainTypeName);
-					if (mainType == null) {
-						// fetch type which is declared first in the file
-						IType[] types= cu.getTypes();
-						if (types.length > 0)
-							mainType= types[0];
-						else
-							break;
-					}
-				} catch (JavaModelException ex) {
-					ExceptionHandler.handle(ex, SearchMessages.getString("Search.Error.javaElementAccess.title"), SearchMessages.getString("Search.Error.javaElementAccess.message")); //$NON-NLS-2$ //$NON-NLS-1$
-					break;
-				}
-				searchFor= TYPE;
-				element= mainType;
-				limitTo= REFERENCES;
-				pattern= JavaModelUtil.getFullyQualifiedName(mainType);
-				break;
-			case IJavaElement.CLASS_FILE:
-				IClassFile cf= (IClassFile)element;
-				try {					
-					mainType= cf.getType();
-				} catch (JavaModelException ex) {
-					ExceptionHandler.handle(ex, SearchMessages.getString("Search.Error.javaElementAccess.title"), SearchMessages.getString("Search.Error.javaElementAccess.message")); //$NON-NLS-2$ //$NON-NLS-1$
-					break;
-				}
-				if (mainType == null)
-					break;
-				element= mainType;
-				searchFor= TYPE;
-				limitTo= REFERENCES;
-				pattern= JavaModelUtil.getFullyQualifiedName(mainType);
-				break;
-			case IJavaElement.FIELD:
-				searchFor= FIELD;
-				limitTo= REFERENCES;
-				IType type= ((IField)element).getDeclaringType();
-				StringBuffer buffer= new StringBuffer();
-				buffer.append(JavaModelUtil.getFullyQualifiedName(type));
-				buffer.append('.');
-				buffer.append(element.getElementName());
-				pattern= buffer.toString();
-				break;
-			case IJavaElement.METHOD:
-				searchFor= METHOD;
-				try {
-					IMethod method= (IMethod)element;
-					if (method.isConstructor())
-						searchFor= CONSTRUCTOR;
-				} catch (JavaModelException ex) {
-					ExceptionHandler.handle(ex, SearchMessages.getString("Search.Error.javaElementAccess.title"), SearchMessages.getString("Search.Error.javaElementAccess.message")); //$NON-NLS-2$ //$NON-NLS-1$
-					break;
-				}		
-				limitTo= REFERENCES;
-				pattern= PrettySignature.getMethodSignature((IMethod)element);
-				break;
-		}
-		if (searchFor != UNKNOWN && limitTo != UNKNOWN && pattern != null)
-			return new SearchPatternData(searchFor, limitTo, true, pattern, element);
-			
-		return null;	
-	}
-	
-	private SearchPatternData trySimpleTextSelection(ISelection selection) {
-		SearchPatternData result= null;
-		if (selection instanceof ITextSelection) {
-			BufferedReader reader= new BufferedReader(new StringReader(((ITextSelection)selection).getText()));
-			String text;
-			try {
-				text= reader.readLine();
-				if (text == null)
-					text= ""; //$NON-NLS-1$
-			} catch (IOException ex) {
-				text= ""; //$NON-NLS-1$
-			}
-			result= new SearchPatternData(TYPE, REFERENCES, fIsCaseSensitive, text, null);
-		}
-		return result;
-	}
-	
-	private SearchPatternData getDefaultInitValues() {
-		return new SearchPatternData(TYPE, REFERENCES, fIsCaseSensitive, "", null); //$NON-NLS-1$
-	}	
-
-	/*
-	 * Implements method from ISearchPage
-	 */
-	public void setContainer(ISearchPageContainer container) {
-		fContainer= container;
-	}
-	
-	/**
-	 * Returns the search page's container.
-	 */
-	private ISearchPageContainer getContainer() {
-		return fContainer;
-	}
-	
-	/**
-	 * Returns the structured selection from the selection.
-	 */
-	private IStructuredSelection asStructuredSelection() {
-		IWorkbenchWindow wbWindow= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (wbWindow != null) {
-			IWorkbenchPage page= wbWindow.getActivePage();
-			if (page != null) {
-				IWorkbenchPart part= page.getActivePart();
-				if (part != null)
-					try {
-						return SelectionConverter.getStructuredSelection(part);
-					} catch (JavaModelException ex) {
-						JspUIPlugin.log("internal error", ex); //$NON-NLS-1$
-					}
-			}
-		}
-		return StructuredSelection.EMPTY;
-	}
-	
-	//--------------- Configuration handling --------------
-	
-	/**
-	 * Returns the page settings for this Java search page.
-	 * 
-	 * @return the page settings to be used
-	 */
-	private IDialogSettings getDialogSettings() {
-		IDialogSettings settings= JavaPlugin.getDefault().getDialogSettings();
-		fDialogSettings= settings.getSection(PAGE_NAME);
-		if (fDialogSettings == null)
-			fDialogSettings= settings.addNewSection(PAGE_NAME);
-		return fDialogSettings;
-	}
-	
-	/**
-	 * Initializes itself from the stored page settings.
-	 */
-	private void readConfiguration() {
-		IDialogSettings s= getDialogSettings();
-		fIsCaseSensitive= s.getBoolean(STORE_CASE_SENSITIVE);
-	}
-	
-	/**
-	 * Stores it current configuration in the dialog store.
-	 */
-	private void writeConfiguration() {
-		IDialogSettings s= getDialogSettings();
-		s.put(STORE_CASE_SENSITIVE, fIsCaseSensitive);
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchResultCollector.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchResultCollector.java
deleted file mode 100644
index aa1bbc5..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/JavaSearchResultCollector.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.search2;
-
-import java.text.MessageFormat;
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.actions.ActionGroup;
-
-import org.eclipse.search.ui.IActionGroupFactory;
-import org.eclipse.search.ui.ISearchResultView;
-import org.eclipse.search.ui.SearchUI;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.IJavaSearchResultCollector;
-
-import org.eclipse.jdt.ui.JavaUI;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.internal.ui.dialogs.OptionalMessageDialog;
-import org.eclipse.jdt.internal.ui.search.GotoMarkerAction;
-import org.eclipse.jdt.internal.ui.search.GroupByKeyComputer;
-import org.eclipse.jdt.internal.ui.search.IJavaSearchUIConstants;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResultLabelProvider;
-import org.eclipse.jdt.internal.ui.search.SearchMessages;
-
-
-public class JavaSearchResultCollector implements IJavaSearchResultCollector {
-
-	private static final String MATCH= SearchMessages.getString("SearchResultCollector.match"); //$NON-NLS-1$
-	private static final String MATCHES= SearchMessages.getString("SearchResultCollector.matches"); //$NON-NLS-1$
-	private static final String DONE= SearchMessages.getString("SearchResultCollector.done"); //$NON-NLS-1$
-	private static final String SEARCHING= SearchMessages.getString("SearchResultCollector.searching"); //$NON-NLS-1$
-	private static final Boolean POTENTIAL_MATCH_VALUE= new Boolean(true);
-	private static final String POTENTIAL_MATCH_DIALOG_ID= "Search.PotentialMatchDialog"; //$NON-NLS-1$
-	
-	private IProgressMonitor fMonitor;
-	private ISearchResultView fView;
-	private JavaSearchOperation fOperation;
-	private int fMatchCount= 0;
-	private int fPotentialMatchCount= 0;
-	private long fLastUpdateTime;
-	private Integer[] fMessageFormatArgs= new Integer[1];
-	
-	private class ActionGroupFactory implements IActionGroupFactory {
-		public ActionGroup createActionGroup(ISearchResultView part) {
-			return new SearchViewActionGroup(part);
-		}
-	}
-	
-	public JavaSearchResultCollector() {
-		// This ensures that the image class is loaded correctly
-		JavaPlugin.getDefault().getImageRegistry();
-	}
-
-	/**
-	 * @see IJavaSearchResultCollector#aboutToStart().
-	 */
-	public void aboutToStart() {
-		fPotentialMatchCount= 0;
-		fView= SearchUI.getSearchResultView();
-		fMatchCount= 0;
-		fLastUpdateTime= 0;
-		if (fView != null) {
-			fView.searchStarted(
-				new ActionGroupFactory(),
-				fOperation.getSingularLabel(),
-				fOperation.getPluralLabelPattern(),
-				fOperation.getImageDescriptor(),
-				JavaSearchPage2.EXTENSION_POINT_ID,
-				new JavaSearchResultLabelProvider(),
-				new GotoMarkerAction(),
-				new GroupByKeyComputer(),
-				fOperation);
-		}
-		if (!getProgressMonitor().isCanceled())
-			getProgressMonitor().subTask(SEARCHING);
-	}
-	
-	/**
-	 * @see IJavaSearchResultCollector#accept
-	 */
-	public void accept(IResource resource, int start, int end, IJavaElement enclosingElement, int accuracy) throws CoreException {
-
-		if (enclosingElement == null) {	// non-Java match
-			IMarker marker= resource.createMarker(SearchUI.SEARCH_MARKER);
-			
-			String description= resource.getFullPath().lastSegment();
-			if (description == null)
-				description= "";  //$NON-NLS-1$
-			
-			HashMap attributes= new HashMap(3);
-			attributes.put(IMarker.CHAR_START, new Integer(Math.max(start, 0)));
-			attributes.put(IMarker.CHAR_END, new Integer(Math.max(end, 0)));
-			marker.setAttributes(attributes);
-			
-			fView.addMatch(description, resource, resource, marker);
-			fMatchCount++;
-			
-			if (!getProgressMonitor().isCanceled() && System.currentTimeMillis() - fLastUpdateTime > 1000) {
-				getProgressMonitor().subTask(getFormattedMatchesString(fMatchCount));
-				fLastUpdateTime= System.currentTimeMillis();
-			}
-			
-			return;
-		}
-
-		if (accuracy == POTENTIAL_MATCH && SearchUI.arePotentialMatchesIgnored())
-			return;
-		
-		IMarker marker= resource.createMarker(SearchUI.SEARCH_MARKER);
-		HashMap attributes;
-		Object groupKey= enclosingElement;
-		attributes= new HashMap(7);
-		if (accuracy == POTENTIAL_MATCH) {
-			fPotentialMatchCount++;
-			attributes.put(SearchUI.POTENTIAL_MATCH, POTENTIAL_MATCH_VALUE);
-			if (groupKey == null)
-				groupKey= "?:null"; //$NON-NLS-1$
-			else
-				groupKey= "?:" + enclosingElement.getHandleIdentifier(); //$NON-NLS-1$
-		}			
-		ICompilationUnit cu= SearchUtil.findCompilationUnit(enclosingElement);
-		if (cu != null && cu.isWorkingCopy())
-			attributes.put(IJavaSearchUIConstants.ATT_IS_WORKING_COPY, new Boolean(true)); //$NON-NLS-1$
-			
-		JavaCore.addJavaElementMarkerAttributes(attributes, enclosingElement);
-		attributes.put(IJavaSearchUIConstants.ATT_JE_HANDLE_ID, enclosingElement.getHandleIdentifier());
-		attributes.put(IMarker.CHAR_START, new Integer(Math.max(start, 0)));
-		attributes.put(IMarker.CHAR_END, new Integer(Math.max(end, 0)));
-		if (enclosingElement instanceof IMember && ((IMember)enclosingElement).isBinary())
-			attributes.put(IWorkbenchPage.EDITOR_ID_ATTR, JavaUI.ID_CF_EDITOR);
-		else
-			attributes.put(IWorkbenchPage.EDITOR_ID_ATTR, JavaUI.ID_CU_EDITOR);
-		marker.setAttributes(attributes);
-
-		fView.addMatch(enclosingElement.getElementName(), groupKey, resource, marker);
-		fMatchCount++;
-		if (!getProgressMonitor().isCanceled() && System.currentTimeMillis() - fLastUpdateTime > 1000) {
-			getProgressMonitor().subTask(getFormattedMatchesString(fMatchCount));
-			fLastUpdateTime= System.currentTimeMillis();
-		}
-	}
-	
-	/**
-	 * @see IJavaSearchResultCollector#done().
-	 */
-	public void done() {
-		if (!getProgressMonitor().isCanceled()) {
-			String matchesString= getFormattedMatchesString(fMatchCount);
-			getProgressMonitor().setTaskName(MessageFormat.format(DONE, new String[]{matchesString}));
-		}
-
-		if (fView != null) {
-			if (fPotentialMatchCount > 0)
-				explainPotentialMatch(fPotentialMatchCount);
-			fView.searchFinished();
-		}
-
-		// Cut no longer unused references because the collector might be re-used
-		fView= null;
-		fMonitor= null;
-	}
-
-	private void explainPotentialMatch(final int potentialMatchCount) {
-		// Make sure we are doing it in the right thread.
-		final Shell shell= fView.getSite().getShell();
-		final String title;
-		if (potentialMatchCount == 1)
-			title= new String(SearchMessages.getString("Search.potentialMatchDialog.title.foundPotentialMatch")); //$NON-NLS-1$
-		else
-			title= new String(SearchMessages.getFormattedString("Search.potentialMatchDialog.title.foundPotentialMatches", "" + potentialMatchCount)); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		shell.getDisplay().syncExec(new Runnable() {
-			public void run() {
-				OptionalMessageDialog.open(
-					POTENTIAL_MATCH_DIALOG_ID, //$NON-NLS-1$,
-					shell,
-					title,
-					null,
-					SearchMessages.getString("Search.potentialMatchDialog.message"), //$NON-NLS-1$,
-					MessageDialog.INFORMATION,
-					new String[] { IDialogConstants.OK_LABEL },
-					0);
-			}
-		});
-	}
-	
-	/*
-	 * @see IJavaSearchResultCollector#getProgressMonitor().
-	 */
-	public IProgressMonitor getProgressMonitor() {
-		return fMonitor;
-	}
-	
-	void setProgressMonitor(IProgressMonitor pm) {
-		fMonitor= pm;
-	}	
-	
-	void setOperation(JavaSearchOperation operation) {
-		fOperation= operation;
-	}
-	
-	private String getFormattedMatchesString(int count) {
-		if (fMatchCount == 1)
-			return MATCH;
-		fMessageFormatArgs[0]= new Integer(count);
-		return MessageFormat.format(MATCHES, fMessageFormatArgs);
-
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchMessages.properties b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchMessages.properties
deleted file mode 100644
index 8f5d952..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchMessages.properties
+++ /dev/null

@@ -1,162 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-group.search=S&earch
-group.declarations= Dec&larations
-group.references= Re&ferences
-group.readReferences= &Read Access
-group.writeReferences= &Write Access
-group.implementors= &Implementors
-
-Search.Error.search.title=Search Error
-Search.Error.search.message=An error occurred during the search operation
-
-Search.Error.javaElementAccess.title=Search Error
-Search.Error.javaElementAccess.message=An error occurred while accessing a Java element
-
-Search.Error.markerAttributeAccess.title=Search Error
-Search.Error.markerAttributeAccess.message=An error occurred while accessing a marker attribute
-
-Search.Error.createJavaElement.title=Search Error
-Search.Error.createJavaElement.message=An error occurred while creating a Java element
-
-Search.Error.openEditor.title=Search Error
-Search.Error.openEditor.message=Could not open the editor
-
-Search.Error.codeResolve= Code resolve error
-
-Search.Error.setDescription.title=Search Error
-Search.Error.setDescription.message=Cannot save workspace description
-
-SearchElementSelectionDialog.title=Search
-SearchElementSelectionDialog.message=Select the element to search for.
-
-SearchResultCollector.match= 1 match
-SearchResultCollector.matches= {0} matches
-SearchResultCollector.done= Search done: {0}.
-SearchResultCollector.searching= Searching...
-
-Search.potentialMatchDialog.title.foundPotentialMatch= Search: Found 1 Inexact Match
-Search.potentialMatchDialog.title.foundPotentialMatches= Search: Found {0} Inexact Matches
-Search.potentialMatchDialog.message= Inexact matches were found and will be displayed with a different\nforeground color. This can be configured on the Search preference page.
-
-SearchPage.searchFor.label= Search For
-SearchPage.searchFor.type= &Type
-SearchPage.searchFor.method= &Method
-SearchPage.searchFor.field= &Field
-SearchPage.searchFor.package= &Package
-SearchPage.searchFor.constructor= Co&nstructor
-
-SearchPage.limitTo.label= Limit To
-SearchPage.limitTo.declarations= Dec&larations
-SearchPage.limitTo.implementors= &Implementors
-SearchPage.limitTo.references= &References
-SearchPage.limitTo.allOccurrences= All &Occurrences
-SearchPage.limitTo.readReferences= Read A&ccess
-SearchPage.limitTo.writeReferences= Writ&e Access
-
-SearchPage.expression.label= Se&arch string (* = any string, ? = any character):
-SearchPage.expression.caseSensitive= Case sens&itive
-
-# Concatenate two working set names e.g. "Source, Lib"
-SearchUtil.workingSetConcatenation= {0}, {1}
-
-Search.FindDeclarationAction.label= &Workspace
-Search.FindDeclarationAction.tooltip= Search for Declarations of the Selected Element in the Workspace
-
-Search.FindDeclarationsInWorkingSetAction.label= Working &Set...
-Search.FindDeclarationsInWorkingSetAction.tooltip= Search for Declarations of the Selected Element in a Working Set
-
-Search.FindHierarchyDeclarationsAction.label= &Hierarchy
-Search.FindHierarchyDeclarationsAction.tooltip= Search for Declarations of the Selected Element in its Hierarchy
-
-Search.FindImplementorsAction.label= &Workspace
-Search.FindImplementorsAction.tooltip= Search for Implementors of the Selected Interface
-
-Search.FindImplementorsInWorkingSetAction.label= Working &Set...
-Search.FindImplementorsInWorkingSetAction.tooltip= Search for Implementors of the Selected Interface in a Working Set
-
-Search.FindReferencesAction.label= &Workspace
-Search.FindReferencesAction.tooltip= Search for References to the Selected Element in the Workspace
-
-Search.FindReferencesAction.BinPrimConstWarnDialog.title= Search for References to a Binary Constant
-Search.FindReferencesAction.BinPrimConstWarnDialog.message= Matches to this constant will only be discovered in source files and binary files where the constant value is not inlined.
-
-Search.FindReferencesInWorkingSetAction.label= Working &Set...
-Search.FindReferencesInWorkingSetAction.tooltip= Search for References to the Selected Element in a Working Set
-
-Search.FindHierarchyReferencesAction.label= &Hierarchy
-Search.FindHierarchyReferencesAction.tooltip= Search for References of the Selected Element in its Hierarchy
-
-Search.FindReadReferencesAction.label= &Workspace
-Search.FindReadReferencesAction.tooltip= Search for Read References to the Selected Element in the Workspace
-
-Search.FindReadReferencesInWorkingSetAction.label= Working &Set...
-Search.FindReadReferencesInWorkingSetAction.tooltip= Search for Read References to the Selected Element in a Working Set
-
-Search.FindReadReferencesInHierarchyAction.label= &Hierarchy
-Search.FindReadReferencesInHierarchyAction.tooltip= Search for Read References of the Selected Element in its Hierarchy
-
-Search.FindWriteReferencesAction.label= &Workspace
-Search.FindWriteReferencesAction.tooltip= Search for Write References to the Selected Element in the Workspace
-
-Search.FindWriteReferencesInWorkingSetAction.label= Working &Set...
-Search.FindWriteReferencesInWorkingSetAction.tooltip= Search for Write References to the Selected Element in a Working Set
-
-Search.FindWriteReferencesInHierarchyAction.label= &Hierarchy
-Search.FindWriteReferencesInHierarchyAction.tooltip= Search for Write References of the Selected Element in its Hierarchy
-
-Search.FindOccurrencesInFile.label= Occurre&nces in File
-Search.FindOccurrencesInFile.tooltip= Find occurrences of selected element in the editor
-
-FindOccurrencesEngine.noSource.text= No source available. To perform this operation you need to attach source.
-FindOccurrencesEngine.noJavaElement.text= Cannot search for the current selection. Please select a valid Java element name.
-FindOccurrencesEngine.cannotParse.text= Cannot analyze the compilation unit or class file. 
-
-
-JavaSearchOperation.default_package=(default package)
-
-# The first argument will be replaced by the pattern and the second by the scope
-JavaSearchOperation.singularDeclarationsPostfix={0} - 1 Declaration in {1}
-JavaSearchOperation.singularReferencesPostfix={0} - 1 Reference in {1}
-JavaSearchOperation.singularReadReferencesPostfix={0} - 1 Read Reference in {1}
-JavaSearchOperation.singularWriteReferencesPostfix={0} - 1 Write Reference in {1}
-JavaSearchOperation.singularImplementorsPostfix={0} - 1 Implementor in {1}
-JavaSearchOperation.singularOccurrencesPostfix={0} - 1 Occurrence in {1}
-
-# The first argument will be replaced by the pattern, the second by the count and the last by the scope
-JavaSearchOperation.pluralDeclarationsPostfix={0} - {1} Declarations in {2}
-JavaSearchOperation.pluralReferencesPostfix={0} - {1} References in {2}
-JavaSearchOperation.pluralReadReferencesPostfix={0} - {1} Read References in {2}
-JavaSearchOperation.pluralWriteReferencesPostfix={0} - {1} Write References in {2}
-JavaSearchOperation.pluralImplementorsPostfix={0} - {1} Implementors in {2}
-JavaSearchOperation.pluralOccurrencesPostfix={0} - {1} Occurrences in {2}
-
-# The first argument will be replaced by the element name and the second one by the file name
-JavaSearchInFile.singularPostfix={0} - 1 Occurrence in {1}
-# The first argument will be replaced by the element name, the second by the count and the last by the file name
-JavaSearchInFile.pluralPostfix={0} - {1} Occurrences in {2}
-
-JavaElementAction.typeSelectionDialog.title=Search
-JavaElementAction.typeSelectionDialog.message=&Select the type to search:
-JavaElementAction.error.open.message=An exception occurred while opening the type.
-
-JavaElementAction.operationUnavailable.title= Operation Unavailable
-JavaElementAction.operationUnavailable.generic= The operation is unavailable on the current selection. Please select a valid Java element name.
-JavaElementAction.operationUnavailable.field= The operation is unavailable on the current selection. Please select the name of a field.
-JavaElementAction.operationUnavailable.interface= The operation is unavailable on the current selection. Please select the name of an interface.
-
-JavaSearchResultLabelProvider.potentialMatch= \ (inexact)
-
-WorkspaceScope= Workspace
-WorkingSetScope= Working Set - {0}
-SelectionScope= Selection
-HierarchyScope= Hierarchy - {0}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchUtil.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchUtil.java
deleted file mode 100644
index 53104ac..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchUtil.java
+++ /dev/null

@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.search2;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.search.ui.ISearchResultViewEntry;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.dialogs.OptionalMessageDialog;
-import org.eclipse.jdt.internal.ui.search.IJavaSearchUIConstants;
-import org.eclipse.jdt.internal.ui.search.LRUWorkingSetsList;
-import org.eclipse.jdt.internal.ui.search.SearchMessages;
-import org.eclipse.jdt.internal.ui.search.WorkingSetComparator;
-import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
-
-/**
- * This class contains some utility methods for J Search.
- */
-/**
- * This class contains some utility methods for J Search.
- */
-public class SearchUtil {
-
-	// LRU working sets
-	public static int LRU_WORKINGSET_LIST_SIZE= 3;
-	private static LRUWorkingSetsList fgLRUWorkingSets;
-
-	// Settings store
-	private static final String DIALOG_SETTINGS_KEY= "JavaElementSearchActions"; //$NON-NLS-1$
-	private static final String STORE_LRU_WORKING_SET_NAMES= "lastUsedWorkingSetNames"; //$NON-NLS-1$
-	
-	private static IDialogSettings fgSettingsStore;
-
-	private static final String BIN_PRIM_CONST_WARN_DIALOG_ID= "BinaryPrimitiveConstantWarningDialog"; //$NON-NLS-1$
-
-
-	public static IJavaElement getJavaElement(IMarker marker) {
-		if (marker == null || !marker.exists())
-			return null;
-		try {
-			String handleId= (String)marker.getAttribute(IJavaSearchUIConstants.ATT_JE_HANDLE_ID);
-			IJavaElement je= JavaCore.create(handleId);
-			if (je == null)
-				return null;
-
-			if (!marker.getAttribute(IJavaSearchUIConstants.ATT_IS_WORKING_COPY, false)) {
-				if (je.exists())
-					return je;
-			}
-			
-			ICompilationUnit cu= (ICompilationUnit) je.getAncestor(IJavaElement.COMPILATION_UNIT);
-			if (cu == null) {
-				return je;
-			}
-			if (!cu.exists()) {
-				IResource res= marker.getResource();
-				if (res instanceof IFile) {
-					cu= JavaCore.createCompilationUnitFrom((IFile) res);
-					if (cu == null) {
-						return je;
-					}
-					
-				}
-			}
-			
-			if (!JavaPlugin.USE_WORKING_COPY_OWNERS) {
-				IJavaElement wcElem= JavaModelUtil.toWorkingCopy(je);
-				if (wcElem.exists()) {
-					return wcElem;
-				}
-			}
-
-			if (!je.exists()) {
-				IJavaElement[] jElements= cu.findElements(je);
-				if (jElements == null || jElements.length == 0)
-					je= cu.getElementAt(marker.getAttribute(IMarker.CHAR_START, 0));
-				else
-					je= jElements[0];
-			}
-			return je;
-		} catch (JavaModelException ex) {
-			if (!ex.isDoesNotExist())
-				ExceptionHandler.handle(ex, SearchMessages.getString("Search.Error.createJavaElement.title"), SearchMessages.getString("Search.Error.createJavaElement.message")); //$NON-NLS-2$ //$NON-NLS-1$
-			return null;
-		} catch (CoreException ex) {
-			ExceptionHandler.handle(ex, SearchMessages.getString("Search.Error.createJavaElement.title"), SearchMessages.getString("Search.Error.createJavaElement.message")); //$NON-NLS-2$ //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	public static IJavaElement getJavaElement(Object entry) {
-		if (entry != null && isISearchResultViewEntry(entry))
-			return getJavaElement((ISearchResultViewEntry)entry);
-		return null;
-	}
-
-	public static IResource getResource(Object entry) {
-		if (entry != null && isISearchResultViewEntry(entry))
-			return ((ISearchResultViewEntry)entry).getResource();
-		return null;
-	}
-
-	public static IJavaElement getJavaElement(ISearchResultViewEntry entry) {
-		if (entry != null)
-			return getJavaElement(entry.getSelectedMarker());
-		return null;
-	}
-
-	public static boolean isSearchPlugInActivated() {
-		return Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.search").isPluginActivated(); //$NON-NLS-1$
-	}
-
-	public static boolean isISearchResultViewEntry(Object object) {
-		return object != null && isSearchPlugInActivated() && (object instanceof ISearchResultViewEntry);
-	}
-	
-	/**
-	 * Returns the compilation unit for the given java element.
-	 * 
-	 * @param	element the java element whose compilation unit is searched for
-	 * @return	the compilation unit of the given java element
-	 */
-	static ICompilationUnit findCompilationUnit(IJavaElement element) {
-		if (element == null)
-			return null;
-		return (ICompilationUnit) element.getAncestor(IJavaElement.COMPILATION_UNIT);
-	}
-
-	/*
-	 * Copied from JavaModelUtil and patched to allow members which do not exist.
-	 * The only case where this is a problem is for methods which have same name and
-	 * paramters as a constructor. The constructor will win in such a situation.
-	 * 
-	 * @see JavaModelUtil#findMemberInCompilationUnit(ICompilationUnit, IMember)
-	 */		
-	public static IMember findInCompilationUnit(ICompilationUnit cu, IMember member) throws JavaModelException {
-		if (member.getElementType() == IJavaElement.TYPE) {
-			return JavaModelUtil.findTypeInCompilationUnit(cu, JavaModelUtil.getTypeQualifiedName((IType)member));
-		} else {
-			IType declaringType= JavaModelUtil.findTypeInCompilationUnit(cu, JavaModelUtil.getTypeQualifiedName(member.getDeclaringType()));
-			if (declaringType != null) {
-				IMember result= null;
-				switch (member.getElementType()) {
-				case IJavaElement.FIELD:
-					result= declaringType.getField(member.getElementName());
-					break;
-				case IJavaElement.METHOD:
-					IMethod meth= (IMethod) member;
-					// XXX: Begin patch ---------------------
-					boolean isConstructor;
-					if (meth.exists())
-						isConstructor= meth.isConstructor();
-					else
-						isConstructor= declaringType.getElementName().equals(meth.getElementName());
-					// XXX: End patch -----------------------
-					result= JavaModelUtil.findMethod(meth.getElementName(), meth.getParameterTypes(), isConstructor, declaringType);
-					break;
-				case IJavaElement.INITIALIZER:
-					result= declaringType.getInitializer(1);
-					break;					
-				}
-				if (result != null && result.exists()) {
-					return result;
-				}
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * XXX: Unchanged copy from JavaModelUtil
-	 */
-	public static IJavaElement findInCompilationUnit(ICompilationUnit cu, IJavaElement element) throws JavaModelException {
-		
-		if (element instanceof IMember)
-			return findInCompilationUnit(cu, (IMember)element);
-		
-		int type= element.getElementType();
-		switch (type) {
-			case IJavaElement.IMPORT_CONTAINER:
-				return cu.getImportContainer();
-			
-			case IJavaElement.PACKAGE_DECLARATION:
-				return find(cu.getPackageDeclarations(), element.getElementName());
-			
-			case IJavaElement.IMPORT_DECLARATION:
-				return find(cu.getImports(), element.getElementName());
-			
-			case IJavaElement.COMPILATION_UNIT:
-				return cu;
-		}
-		
-		return null;
-	}
-	
-	/*
-	 * XXX: Unchanged copy from JavaModelUtil
-	 */
-	private static IJavaElement find(IJavaElement[] elements, String name) {
-		if (elements == null || name == null)
-			return null;
-			
-		for (int i= 0; i < elements.length; i++) {
-			if (name.equals(elements[i].getElementName()))
-				return elements[i];
-		}
-		
-		return null;
-	}
-
-	public static String toString(IWorkingSet[] workingSets) {
-		Arrays.sort(workingSets, new WorkingSetComparator());
-		String result= ""; //$NON-NLS-1$
-		if (workingSets != null && workingSets.length > 0) {
-			boolean firstFound= false;
-			for (int i= 0; i < workingSets.length; i++) {
-				String workingSetName= workingSets[i].getName();
-				if (firstFound)
-					result= SearchMessages.getFormattedString("SearchUtil.workingSetConcatenation", new String[] {result, workingSetName}); //$NON-NLS-1$
-				else {
-					result= workingSetName;
-					firstFound= true;
-				}
-			}
-		}
-		return result;
-	}
-
-	// ---------- LRU working set handling ----------
-
-	/**
-	 * Updates the LRU list of working sets.
-	 * 
-	 * @param workingSets	the workings sets to be added to the LRU list
-	 */
-	public static void updateLRUWorkingSets(IWorkingSet[] workingSets) {
-		if (workingSets == null || workingSets.length < 1)
-			return;
-		
-		getLRUWorkingSets().add(workingSets);
-		saveState();
-	}
-
-	private static void saveState() {
-		IWorkingSet[] workingSets;
-		Iterator iter= fgLRUWorkingSets.iterator();
-		int i= 0;
-		while (iter.hasNext()) {
-			workingSets= (IWorkingSet[])iter.next();
-			String[] names= new String[workingSets.length];
-			for (int j= 0; j < workingSets.length; j++)
-				names[j]= workingSets[j].getName();
-			fgSettingsStore.put(STORE_LRU_WORKING_SET_NAMES + i, names);
-			i++;
-		}
-	}
-
-	public static LRUWorkingSetsList getLRUWorkingSets() {
-		if (fgLRUWorkingSets == null) {
-			restoreState();
-		}
-		return fgLRUWorkingSets;
-	}
-
-	static void restoreState() {
-		fgLRUWorkingSets= new LRUWorkingSetsList(LRU_WORKINGSET_LIST_SIZE);
-		fgSettingsStore= JavaPlugin.getDefault().getDialogSettings().getSection(DIALOG_SETTINGS_KEY);
-		if (fgSettingsStore == null)
-			fgSettingsStore= JavaPlugin.getDefault().getDialogSettings().addNewSection(DIALOG_SETTINGS_KEY);
-		
-		boolean foundLRU= false;
-		for (int i= LRU_WORKINGSET_LIST_SIZE - 1; i >= 0; i--) {
-			String[] lruWorkingSetNames= fgSettingsStore.getArray(STORE_LRU_WORKING_SET_NAMES + i);
-			if (lruWorkingSetNames != null) {
-				Set workingSets= new HashSet(2);
-				for (int j= 0; j < lruWorkingSetNames.length; j++) {
-					IWorkingSet workingSet= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(lruWorkingSetNames[j]);
-					if (workingSet != null) {
-						workingSets.add(workingSet);
-					}
-				}
-				foundLRU= true;
-				if (!workingSets.isEmpty())
-					fgLRUWorkingSets.add((IWorkingSet[])workingSets.toArray(new IWorkingSet[workingSets.size()]));
-			}
-		}
-		if (!foundLRU)
-			// try old preference format
-			restoreFromOldFormat();
-	}
-
-	private static void restoreFromOldFormat() {
-		fgLRUWorkingSets= new LRUWorkingSetsList(LRU_WORKINGSET_LIST_SIZE);
-		fgSettingsStore= JavaPlugin.getDefault().getDialogSettings().getSection(DIALOG_SETTINGS_KEY);
-		if (fgSettingsStore == null)
-			fgSettingsStore= JavaPlugin.getDefault().getDialogSettings().addNewSection(DIALOG_SETTINGS_KEY);
-
-		boolean foundLRU= false;
-		String[] lruWorkingSetNames= fgSettingsStore.getArray(STORE_LRU_WORKING_SET_NAMES);
-		if (lruWorkingSetNames != null) {
-			for (int i= lruWorkingSetNames.length - 1; i >= 0; i--) {
-				IWorkingSet workingSet= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(lruWorkingSetNames[i]);
-				if (workingSet != null) {
-					foundLRU= true;
-					fgLRUWorkingSets.add(new IWorkingSet[]{workingSet});
-				}
-			}
-		}
-		if (foundLRU)
-			// save in new format
-			saveState();
-	}
-
-	public static void warnIfBinaryConstant(IJavaElement element, Shell shell) {
-		if (isBinaryPrimitveConstantOrString(element))
-			OptionalMessageDialog.open(
-				BIN_PRIM_CONST_WARN_DIALOG_ID,
-				shell,
-				SearchMessages.getString("Search.FindReferencesAction.BinPrimConstWarnDialog.title"), //$NON-NLS-1$
-				null,
-				SearchMessages.getString("Search.FindReferencesAction.BinPrimConstWarnDialog.message"), //$NON-NLS-1$
-				MessageDialog.INFORMATION,
-				new String[] { IDialogConstants.OK_LABEL },
-				0);
-	}
-	
-	private static boolean isBinaryPrimitveConstantOrString(IJavaElement element) {
-		if (element != null && element.getElementType() == IJavaElement.FIELD) {
-			IField field= (IField)element;
-			int flags;
-			try {
-				flags= field.getFlags();
-			} catch (JavaModelException ex) {
-				return false;
-			}
-			return field.isBinary() && Flags.isStatic(flags) && Flags.isFinal(flags) && isPrimitiveOrString(field);
-		}
-		return false;
-	}
-
-	private static boolean isPrimitiveOrString(IField field) {
-		String fieldType;
-		try {
-			fieldType= field.getTypeSignature();
-		} catch (JavaModelException ex) {
-			return false;
-		}
-		char first= fieldType.charAt(0);
-		return (first != Signature.C_RESOLVED && first != Signature.C_UNRESOLVED && first != Signature.C_ARRAY)
-			|| (first == Signature.C_RESOLVED && fieldType.substring(1, fieldType.length() - 1).equals(String.class.getName()));
-	}
-	
-	public static String getProjectScopeDescription(IType type) {
-		IJavaProject project= type.getJavaProject();
-		if (project != null)
-			return SearchMessages.getFormattedString("ProjectScope", project.getElementName()); //$NON-NLS-1$
-		else 
-			return SearchMessages.getFormattedString("ProjectScope", ""); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewActionGroup.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewActionGroup.java
deleted file mode 100644
index 82ace6c..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewActionGroup.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.search2;
-
-import org.eclipse.jface.util.Assert;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.actions.ActionGroup;
-
-import org.eclipse.jdt.ui.actions.JavaSearchActionGroup;
-import org.eclipse.jdt.ui.actions.NavigateActionGroup;
-
-import org.eclipse.jdt.internal.ui.actions.CompositeActionGroup;
-
-class SearchViewActionGroup extends CompositeActionGroup {
-
-	public SearchViewActionGroup(IViewPart part) {
-		Assert.isNotNull(part);
-		setGroups(new ActionGroup[] {
-			new JavaSearchActionGroup(part),
-			new NavigateActionGroup(new SearchViewAdapter(new SearchViewSiteAdapter(part.getSite())))});
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewAdapter.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewAdapter.java
deleted file mode 100644
index 3777971..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewAdapter.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.search2;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This class adapts a Search view to return an adapted Search view site.
- * 
- * @see org.eclipse.jdt.internal.ui.search.SearchViewSiteAdapter
- * @since 2.1
- */
-class SearchViewAdapter implements IViewPart {
-	
-	private IWorkbenchPartSite fSite;
-
-	/**
-	 * Constructor for SearchViewAdapter.
-	 */
-	public SearchViewAdapter(IWorkbenchPartSite site) {
-		fSite= site;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#getSite()
-	 */
-	public IWorkbenchPartSite getSite() {
-		return fSite;
-	}
-
-	// --------- only empty stubs below ---------
-
-	/*
-	 * @see org.eclipse.ui.IViewPart#getViewSite()
-	 */
-	public IViewSite getViewSite() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IViewPart#init(IViewSite)
-	 */
-	public void init(IViewSite site) throws PartInitException {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.ui.IViewPart#saveState(IMemento)
-	 */
-	public void saveState(IMemento memento) {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#addPropertyListener(IPropertyListener)
-	 */
-	public void addPropertyListener(IPropertyListener listener) {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#getTitle()
-	 */
-	public String getTitle() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#getTitleImage()
-	 */
-	public Image getTitleImage() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#getTitleToolTip()
-	 */
-	public String getTitleToolTip() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#removePropertyListener(IPropertyListener)
-	 */
-	public void removePropertyListener(IPropertyListener listener) {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewSiteAdapter.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewSiteAdapter.java
deleted file mode 100644
index 9ae3195..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/search2/SearchViewSiteAdapter.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.search2;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.PlatformObject;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.ui.IKeyBindingService;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.IWorkbenchWindow;
-
-import org.eclipse.search.ui.ISearchResultViewEntry;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.search.IJavaSearchUIConstants;
-import org.eclipse.jdt.internal.ui.search.SearchMessages;
-import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.jdt.internal.ui.util.SelectionUtil;
-
-/**
- * This class adapts a Search view site.
- * It converts selection of Search view entries to
- * be a selection of Java elements.
- * 
- * @since 2.0
- */
-class SearchViewSiteAdapter extends PlatformObject implements IWorkbenchPartSite {
-	
-	private ISelectionProvider fProvider;
-	private IWorkbenchSite fSite;
-	
-	private ISelectionChangedListener fListener;
-
-	public SearchViewSiteAdapter(IWorkbenchSite site){
-		fSite= site;
-		setSelectionProvider(site.getSelectionProvider());
-	}
-	
-	public IWorkbenchPage getPage() {
-		return fSite.getPage();
-	}
-
-	public ISelectionProvider getSelectionProvider() {
-		return fProvider;
-	}
-
-	public Shell getShell() {
-		return JavaPlugin.getActiveWorkbenchShell();
-	}
-
-	public IWorkbenchWindow getWorkbenchWindow() {
-		return fSite.getWorkbenchWindow();
-	}
-	
-	public void setSelectionProvider(final ISelectionProvider provider) {
-		Assert.isNotNull(provider);
-		fProvider= 
-			new ISelectionProvider() {
-				public void addSelectionChangedListener(final ISelectionChangedListener listener) {
-					fListener=
-						new ISelectionChangedListener() {
-							public void selectionChanged(SelectionChangedEvent event) {
-								listener.selectionChanged(new SelectionChangedEvent(fProvider, convertSelection(event.getSelection())));
-							}
-						};
-					provider.addSelectionChangedListener(fListener);
-				}
-				public ISelection getSelection() {
-					return convertSelection(provider.getSelection());
-				}
-				public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-					provider.removeSelectionChangedListener(fListener);
-				}
-				public void setSelection(ISelection selection) {
-					// empty implementation
-				}
-			};
-	}
-
-	private ISelection convertSelection(ISelection selection) {
-		Object element= SelectionUtil.getSingleElement(selection);
-		if (element instanceof ISearchResultViewEntry) {
-			IMarker marker= ((ISearchResultViewEntry)element).getSelectedMarker();
-			if (marker != null && marker.exists())
-				try {
-					IJavaElement je= JavaCore.create((String) marker.getAttribute(IJavaSearchUIConstants.ATT_JE_HANDLE_ID));
-					if (je != null)
-						return new StructuredSelection(je);
-				} catch (CoreException ex) {
-					ExceptionHandler.log(ex, SearchMessages.getString("Search.Error.createJavaElement.message")); //$NON-NLS-1$
-				}
-		}
-		return StructuredSelection.EMPTY;		
-	}
-	
-	// --------- only empty stubs below ---------
-		
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPartSite#getId()
-	 */
-	public String getId() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPartSite#getKeyBindingService()
-	 */
-	public IKeyBindingService getKeyBindingService() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPartSite#getPluginId()
-	 */
-	public String getPluginId() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPartSite#getRegisteredName()
-	 */
-	public String getRegisteredName() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPartSite#registerContextMenu(MenuManager, ISelectionProvider)
-	 */
-	public void registerContextMenu(MenuManager menuManager, ISelectionProvider selectionProvider) {
-		// empty implementation
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPartSite#registerContextMenu(String, MenuManager, ISelectionProvider)
-	 */
-	public void registerContextMenu(String menuId, MenuManager menuManager, ISelectionProvider selectionProvider) {
-		// empty implementation
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandler.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandler.java
deleted file mode 100644
index ea70b96..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandler.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-import java.io.IOException;
-
-
-/**
- * A tag handler is responsible to
- * - handle the attributes for the tags it supports
- * - translate the tag sequence including attributes to another language
- * - back-translate relative line offsets.
- * <p>
- * Tag handlers are used by translators via tag handler factories. The factory
- * can either return a new tag or one that already has some attributes. </p>
- * 
- * @see org.eclipse.jface.text.source.translation.ITranslator
- * @see org.eclipse.jface.text.source.translation.ITagHandlerFactory
- * @since 3.0
- */
-public interface ITagHandler {
-	
-	/**
-	 * Tells whether this handler can handle the given tag.
-	 * 
-	 * @param tag the tag to check
-	 * @return <code>true</code> if this handler handles the given tag
-	 */
-	boolean canHandleTag(String tag);
-	
-	/**
-	 * Tells whether this handler can handle the given text. Most
-	 * likely the handler will check if the text contains a tag
-	 * that he can handle.
-	 * 
-	 * @param text the text to check
-	 * @return <code>true</code> if this handler handles the given text
-	 */
-	boolean canHandleText(String text);
-	
-	/**
-	 * Adds an attribute to this tag handler.
-	 * 
-	 * @param name				the name of the attribute
-	 * @param value			the attribute value
-	 * @param sourceLineNumber the line number of the attribute in the source or <code>-1</code> if unknown
-	 */
-	void addAttribute(String name, String value, int sourceLineNumber);
-	
-	/**
-	 * Resets this handler and sets the current tag to the given tag.
-	 * A handler can handle more than one tag but only one tag at a time.
-	 * <p>
-	 * Resetting the handler clears the attributes.</p>
-	 * 
-	 * @param tag the tag to check
-	 */
-	void reset(String tag);
-	
-	/**
-	 * Writes the tag and line mapping information to the 
-	 * given translator result collector.
-	 * 
-	 * @param resultCollector the translator's result collector
-	 * @param sourceLineNumber the line number of the attribute in the source or <code>-1</code> if unknown
-	 * @throws IOException
-	 */
-	void processEndTag(ITranslatorResultCollector resultCollector, int sourceLineNumber) throws IOException;
-	
-	/**
-	 * Computes the offset in the source line that corresponds
-	 * to the given offset in the translated line. 
-	 * 
-	 * @param sourceLine				the source line
-	 * @param translatedLine			the translated line
-	 * @param offsetInTranslatedLine	the offset in the translated line
-	 * @return the offset in the source line or <code>-1</code> if
-	 * 			it was not possible to compute the offset
-	 */
-	int backTranslateOffsetInLine(String sourceLine, String translatedLine, int offsetInTranslatedLine);
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandlerFactory.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandlerFactory.java
deleted file mode 100644
index 9e8de44..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITagHandlerFactory.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-/**
- * A tag handler factory provides access to tag
- * handlers.
- * 
- * @since 3.0
- */
-public interface ITagHandlerFactory {
-	
-	/**
-	 * Returns a handler that can handle the
-	 * given tag.
-	 * <p>
-	 * Depending on the used handler the factory might
-	 * return a new or a shared instance.</p> 
-	 *
-	 * @param tag the tag for which to return the handler 
-	 * @return a tag handler or <code>null</code> if no handler
-	 * 			is available
-	 */
-	public ITagHandler getHandler(String tag);
-	
-	/**
-	 * Finds and returns a handler that can handle
-	 * the given text snippet.
-	 * <p>
-	 * Depending on the used handler the factory might
-	 * return a new or a shared instance.</p> 
-	 * 
-	 * @param text the text for which to find a handler
-	 * @return a tag handler or <code>null</code> if no handler
-	 * 			is available
-	 */
-	public ITagHandler findHandler(String text);
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslator.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslator.java
deleted file mode 100644
index 66e4e76..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslator.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-import java.io.IOException;
-import java.io.Reader;
-
-/**
- * A translator translates a given file into another language.
- * The translator is also responsible to provide line mapping
- * information for the translation and to compute which offset
- * in an original line corresponds to a given offset in a
- * target line.
- * 
- * @since 3.0
- */
-public interface ITranslator {
-	
-	/**
-	 * Reads the source from the given reader and creates
-	 * translates it into another language. The translated
-	 * source might be given the optional name.
-	 * 
-	 * @param reader the reader to access the source
-	 * @param name the name of the translated source or <code>null</code> if none
-	 * @return
-	 * @throws IOException
-	 */
-	String translate(Reader reader, String name) throws IOException;
-
-	/**
-	 * Returns the line mapping information.
-	 * 
-	 * @return an int array where the index corresponds to line
-	 * 			numbers in the translation and the value is a
-	 * 			source line number
-	 */	
-	int[] getLineMapping();
-	
-	/**
-	 * Assigns an optional tag handler factory to this translator.
-	 * <p>
-	 * A translator can delegate the handling of individual tags
-	 * to tag handlers. The factory is responsible to provide
-	 * the correct tag handlers.</p>
-	 * 
-	 * @param tagHandlerFactory	a tag handler factory or <code>null</code>
-	 * 								if this translator does all work itself 
-	 */
-	void setTagHandlerFactory(ITagHandlerFactory tagHandlerFactory);
-	
-	/**
-	 * Computes the offset in the source line that corresponds
-	 * to the given offset in the translated line. 
-	 * 
-	 * @param sourceLine				the source line
-	 * @param translatedLine			the translated line
-	 * @param offsetInTranslatedLine	the offset in the translated line
-	 * @param tag						the tag to which the source line belongs or
-	 *						 			  <code>null</code> if the tag is not known
-	 * @return the offset in the source line or <code>-1</code> if
-	 * 			it was not possible to compute the offset
-	 */
-	int backTranslateOffsetInLine(String sourceLine, String translatedLine, int offsetInTranslatedLine, String tag);	
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslatorResultCollector.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslatorResultCollector.java
deleted file mode 100644
index e11bf0e..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/ITranslatorResultCollector.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-/**
- * Tagging interface for a translator result collector.
- * 
- * @since 3.0
- */
-public interface ITranslatorResultCollector {
-
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/TagHandlerFactory.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/TagHandlerFactory.java
deleted file mode 100644
index 7520048..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jface/text/source/translation/TagHandlerFactory.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jface.text.source.translation;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.text.Assert;
-
-/**
- * Default implementation of a tag handler factory
- * 
- * @since 3.0
- */
-public class TagHandlerFactory implements ITagHandlerFactory {
-
-	private Map fHandlers;
-
-	public void addTagHandler(String tag, ITagHandler handler)  {
-		Assert.isNotNull(tag);
-		Assert.isNotNull(handler);
-		
-		fHandlers.put(tag, handler);
-	}
-
-	public ITagHandler registerHandler(String tag)  {
-		Assert.isNotNull(tag);
-		return (ITagHandler)fHandlers.remove(tag);
-	}
-
-
-	/*
-	 * @see org.eclipse.jface.text.source.ITagHandlerFactory#getHandler(java.lang.String)
-	 */
-	public ITagHandler getHandler(String tag) {
-		Assert.isNotNull(tag);
-
-		return (ITagHandler)fHandlers.get(tag);
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.ITagHandlerFactory#findHandler(java.lang.String)
-	 */
-	public ITagHandler findHandler(String text) {
-		Assert.isNotNull(text);
-
-		Iterator iter= fHandlers.values().iterator();
-		while (iter.hasNext())  {
-			ITagHandler handler= (ITagHandler)iter.next();
-			if (handler.canHandleText(text))
-				return handler;
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/AbstractJspParser.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/AbstractJspParser.java
deleted file mode 100644
index 834f57e..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/AbstractJspParser.java
+++ /dev/null

@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-
-public abstract class AbstractJspParser { 
-	
-	private Reader fReader;
-	private boolean fHasUnread;
-	private int fUnread;
-	private int fPos;
-	protected int fLines= 1;
-	
-	AbstractJspParser() {
-		super();
-	}
-	
-	private int getc() throws IOException {
-		fPos++;
-		if (fHasUnread) {
-			fHasUnread= false;
-			return fUnread;
-		}
-
-		int ch= fReader.read();
-
-		if (ch == '\n') // LF
-			fLines++;
-		else if (ch == '\r')  { // CR
-			int nextCh= getc();
-			if (nextCh != '\n')
-				fLines++;
-			return nextCh;
-		}
-		return ch;
-	}
-	
-	private void ungetc(int c) {
-		fHasUnread= true;
-		fUnread= c;
-		fPos--;
-	}
-	
-	private void parseDirective() throws IOException {
-		StringBuffer sb= new StringBuffer();
-		int pos= fPos;
-		while (true) {
-			int c = getc();
-			if (c == '%') {
-				c= getc();
-				if (c == '>') {
-					// get attributes
-					parseAttributes(pos, sb.toString());
-					return;
-				}
-			}
-			sb.append((char)c);
-		}
-	}
-	
-	private void parseTag(boolean endTag) throws IOException {
-		StringBuffer sb= new StringBuffer();
-		int pos= fPos;
-		while (true) {
-			int c= getc();
-			if (c == '/') {
-				c= getc();
-				if (c == '>') {
-					// get attributes
-					parseAttributes(pos, sb.toString());
-					return;
-				} else {
-					ungetc(c);
-				}
-			} else if (c == '>') {
-				// get attributes
-				parseAttributes(pos, sb.toString());
-				return;
-			}
-			sb.append((char)c);
-		}
-	}
-	
-	private void parseComment() throws IOException {
-		while (true) {
-			int c = getc();
-			if (c == '-') {
-				c= getc();
-				if (c == '-') {
-					c= getc();
-					if (c == '%') {
-						c= getc();
-						if (c == '>') {
-							return;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private void parseJava(char type) throws IOException {
-		StringBuffer sb= new StringBuffer();
-		int line= fLines;
-		while (true) {
-			int c = getc();
-			if (c == '%') {
-				c= getc();
-				if (c == '>') {
-					java(type, sb.toString(), line);
-					return;
-				}
-			}
-			sb.append((char)c);
-		}
-	}
-	
-	protected void java(char tagType, String contents, int line) {
-		// empty implementation
-	}
-
-	private void parseAttributes(int pos, String s) {
-		
-		boolean hasValue= false;
-		StringBuffer name= new StringBuffer();
-		StringBuffer value= new StringBuffer();
-		String startTag= ""; //$NON-NLS-1$
-		int i= 0;
-		int ix= 0;
-		int startName= 0;
-		int startValue= 0;
-		char c= s.charAt(i++);
-		
-		try {
-			while (true) {
-				
-				// whitespace		
-				while (Character.isWhitespace(c))
-					c= s.charAt(i++);
-					
-				startName= i;
-				while (Character.isLetterOrDigit(c) || c == ':') {
-					name.append(c);
-					c= s.charAt(i++);
-				}
-				
-				// whitespace		
-				while (Character.isWhitespace(c))
-					c= s.charAt(i++);
-					
-				hasValue= false;
-				if (c == '=') {
-					c= s.charAt(i++);
-					
-					// value
-					while (Character.isWhitespace(c))
-						c= s.charAt(i++);
-						
-					startValue= i;
-
-					// Special handling for this taglib tag
-					if (startTag.equals("c:out"))  { //$NON-NLS-1$
-						value= value.append(s.substring(startValue, Math.max(startValue, s.length() - 2)));
-						name.setLength(0);
-						tagAttribute(name.toString(), value.toString(), startName+pos, startValue+pos);
-						break;
-					} else if (c == '"') {
-						c= s.charAt(i++);
-						while (c != '"') {
-							value.append(c);
-							c= s.charAt(i++);
-						}
-						c= s.charAt(i++);
-
-					} else {
-						while (Character.isLetterOrDigit(c)) {
-							value.append(c);
-							c= s.charAt(i++);
-						}
-					}
-					hasValue= true;
-				}
-					
-				if (ix == 0)  {
-					startTag= name.toString();
-					startTag(false, startTag, startName+pos);
-				} else 
-					tagAttribute(name.toString(), hasValue ? value.toString() : null, startName+pos, startValue+pos);
-				ix++;
-				
-				name.setLength(0);
-				value.setLength(0);
-			}
-		} catch (StringIndexOutOfBoundsException e) {
-			// we don't log this exception because it is used
-			// as one way to exit the scanning loop
-		}
-		
-		if (name.length() > 0) {
-			if (ix == 0)
-				startTag(false, name.toString(), startName+pos);
-			else 
-				tagAttribute(name.toString(), hasValue ? value.toString() : null, startName+pos, startValue+pos);
-		}
-		
-		endTag(false);
-	}
-	
-	protected void startTag(boolean endTag, String name, int startName) {
-		// empty implementation
-	}
-	
-	protected void tagAttribute(String attrName, String value, int startName, int startValue) {
-		// empty implementation
-	}
-	
-	protected void endTag(boolean end) {
-		// empty implementation
-	}
-	
-	protected void text(String t, int line) {
-		// empty implementation
-	}
-	
-	void parse(Reader reader) throws IOException {
-		int c;
-		StringBuffer buffer= new StringBuffer();
-		fPos= 0;
-		fLines= 1;
-		int line= fLines;
-		fReader= reader;	
-
-		while (true) {
-			c= getc();
-			switch (c) {
-			case -1:
-				if (buffer.length() > 0)
-					text(buffer.toString(), line);
-				return;
-			case '<':
-				c= getc();
-				if (c == '%') {
-					// flush buffer
-					if (buffer.length() > 0) {
-						text(buffer.toString(), line);
-						buffer.setLength(0);
-						line= fLines;
-					}
-					c= getc();
-					switch (c) {
-					case '-':
-						c= getc();
-						if (c == '-') {
-							parseComment();
-						} else {
-							ungetc(c);
-							continue;
-						}	
-						break;
-					case '@':
-						parseDirective();
-						break;
-					case ' ':
-					case '!':
-					case '=':
-						parseJava((char)c);
-						break;
-					default:
-						parseComment();
-						break;
-					}
-				} else if (c == '/') {
-					parseTag(true);
-				} else {
-					ungetc(c);
-					parseTag(false);
-				}
-				break;
-			default:
-				buffer.append((char)c);
-				break;
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JavaFamilyExamplePreferencePage.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JavaFamilyExamplePreferencePage.java
deleted file mode 100644
index 0bdabcc..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JavaFamilyExamplePreferencePage.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-public class JavaFamilyExamplePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite c= new Composite(parent, SWT.NULL);
-		//c.setLayout(new FillLayout());
-		
-		final Button b= new Button(c, SWT.NULL);
-		b.setText(getButtonLabel());
-		b.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				JspUIPlugin.getDefault().controlJSPIndexing(!JspUIPlugin.getDefault().isJSPIndexingOn());
-				b.setText(getButtonLabel());
-			}
-		});
-		b.pack();
-		
-		return c;
-	}
-	
-	private String getButtonLabel() {
-		if (JspUIPlugin.getDefault().isJSPIndexingOn())
-			return "Stop JSP Indexing"; //$NON-NLS-1$
-		return "Start JSP Indexing"; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-		// empty implementation
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspIndexParser.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspIndexParser.java
deleted file mode 100644
index bd92333..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspIndexParser.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.*;
-import java.io.Reader;
-
-import org.eclipse.core.indexsearch.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.*;
-
-/**
- * @author weinand
- */
-public class JspIndexParser extends AbstractJspParser implements IIndexer {
-	
-	public static final String JSP_TYPE_REF= "jsp_typeRef";	//$NON-NLS-1$
-	
-	IFile fFile;
-	String fFilePath;
-	boolean fInUseBean;
-	String fId;
-	String fClass;
-	IIndex fOutput;
-	
-
-	JspIndexParser(IFile resource) {
-		fFile= resource;
-	}
-	
-	protected void startTag(boolean endTag, String name, int startName) {
-		fInUseBean= "jsp:useBean".equals(name); //$NON-NLS-1$
-	}
-	
-	protected void tagAttribute(String attrName, String value, int startName, int startValue) {
-		if (fInUseBean) {
-			if ("id".equals(attrName)) //$NON-NLS-1$
-				fId= value;
-			else if ("class".equals(attrName)) //$NON-NLS-1$
-				fClass= value;
-		}
-	}
-	
-	protected void endTag(boolean end) {
-		if (fInUseBean) {
-			if (fId != null && fClass != null) {
-
-				String s= JSP_TYPE_REF + "/" + fClass; //$NON-NLS-1$
-				System.out.println("  " + s); //$NON-NLS-1$
-				fOutput.addRef(s, fFilePath);				
-
-				fId= fClass= null;
-			}
-			fInUseBean= false;
-		}
-	}
-	
-	public void index(IIndex indexerOutput) throws IOException {
-		
-		String type= fFile.getFileExtension();
-		if (type != null && JspUIPlugin.JSP_TYPE.equalsIgnoreCase(type)) {
-			
-			// Add the name of the file to the index
-			String path= fFile.getFullPath().toString();
-			
-			String encoding= null;
-			try {
-				encoding= fFile.getCharset();
-			} catch (CoreException e1) {
-			}
-			if (encoding == null)
-				encoding= ResourcesPlugin.getEncoding();
-			
-			String s= null;
-			IPath location= fFile.getLocation();
-			if (location == null)
-				s= ""; //$NON-NLS-1$
-			else
-				s= new String(Util.getFileCharContent(location.toFile(), encoding));
-			
-			try {
-				Reader reader= new StringReader(s);
-				fOutput= indexerOutput;
-				fFilePath= path;			
-				parse(reader);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMatchLocatorParser.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMatchLocatorParser.java
deleted file mode 100644
index d7a8995..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMatchLocatorParser.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.indexsearch.*;
-
-
-public class JspMatchLocatorParser extends AbstractJspParser {
-
-	IFile fResource;
-	String fMatchString;
-	ISearchResultCollector fCollector;
-
-	boolean fInUseBean;
-	String fId;
-	String fClass;
-
-	public JspMatchLocatorParser() {
-		super();
-	}
-
-	protected void startTag(boolean endTag, String name, int startName) {
-		fInUseBean= "jsp:useBean".equals(name); //$NON-NLS-1$
-	}
-
-	protected void tagAttribute(String attrName, String value, int startName, int startValue) {
-		if (fInUseBean && "class".equals(attrName) && fMatchString.equals(value)) { //$NON-NLS-1$
-			try {
-				fCollector.accept(fResource, startValue, value.length());
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	public void match(IFile resource, String matchString, ISearchResultCollector collector) {
-		
-		fResource= resource;
-		fMatchString= matchString;
-		fCollector= collector;
-		Reader reader= null;
-		
-		try {
-			reader= new InputStreamReader(fResource.getContents());
-		} catch (CoreException e1) {
-			e1.printStackTrace();
-		}
-				
-		try {
-			parse(reader);
-		} catch (IOException e2) {
-			e2.printStackTrace();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.java
deleted file mode 100644
index 5d4122c..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jsp;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Helper class to get NLSed messages.
- * 
- * @since 3.0
- */
-class JspMessages {
-
-	private static final String BUNDLE_NAME= JspMessages.class.getName();
-
-	private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private JspMessages() {
-	}
-
-	public static String getString(String key) {
-		// XXX Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.properties b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.properties
deleted file mode 100644
index 52a894f..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspMessages.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-RenameTypeParticipant.name= JSP participant

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspPluginImages.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspPluginImages.java
deleted file mode 100644
index 9a74eec..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspPluginImages.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The images provided by the debug plugin.
- */
-public class JspPluginImages {
-
-	/** 
-	 * The image registry containing <code>Image</code>s.
-	 */
-	private static ImageRegistry imageRegistry;
-	
-	/**
-	 * A table of all the <code>ImageDescriptor</code>s.
-	 */
-	private static HashMap imageDescriptors;
-	
-	/* Declare Common paths */
-	private static URL ICON_BASE_URL= null;
-
-	static {
-		String pathSuffix = "icons/full/"; //$NON-NLS-1$
-			
-		try {
-			ICON_BASE_URL= new URL(JspUIPlugin.getDefault().getDescriptor().getInstallURL(), pathSuffix);
-		} catch (MalformedURLException e) {
-			// do nothing
-		}
-	}
-
-	// Use IPath and toOSString to build the names to ensure they have the slashes correct
-	//private final static String CTOOL= "ctool16/"; //basic colors - size 16x16 //$NON-NLS-1$
-	//private final static String LOCALTOOL= "clcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
-	//private final static String DLCL= "dlcl16/"; //disabled - size 16x16 //$NON-NLS-1$
-	//private final static String ELCL= "elcl16/"; //enabled - size 16x16 //$NON-NLS-1$
-	private final static String OBJECT= "obj16/"; //basic colors - size 16x16 //$NON-NLS-1$
-	//private final static String WIZBAN= "wizban/"; //basic colors - size 16x16 //$NON-NLS-1$
-	//private final static String OVR= "ovr16/"; //basic colors - size 7x8 //$NON-NLS-1$
-	//private final static String VIEW= "cview16/"; // views //$NON-NLS-1$
-	
-	public final static String IMG_OBJ_TOMCAT = "IMG_TOMCAT"; //$NON-NLS-1$
-	public final static String IMG_OBJ_JSP = "IMG_OBJ_JSP"; //$NON-NLS-1$
-	
-	/**
-	 * Declare all images
-	 */
-	private static void declareImages() {
-
-		declareRegistryImage(IMG_OBJ_TOMCAT, OBJECT + "tomcat_obj.gif"); //$NON-NLS-1$
-		declareRegistryImage(IMG_OBJ_JSP, OBJECT + "jsp_obj.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declare an Image in the registry table.
-	 * @param key 	The key to use when registering the image
-	 * @param path	The path where the image can be found. This path is relative to where
-	 *				this plugin class is found (i.e. typically the packages directory)
-	 */
-	private final static void declareRegistryImage(String key, String path) {
-		ImageDescriptor desc= ImageDescriptor.getMissingImageDescriptor();
-		try {
-			desc= ImageDescriptor.createFromURL(makeIconFileURL(path));
-		} catch (MalformedURLException me) {
-			DebugPlugin.log(me);
-		}
-		imageRegistry.put(key, desc);
-		imageDescriptors.put(key, desc);
-	}
-	
-	/**
-	 * Returns the ImageRegistry.
-	 */
-	public static ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			initializeImageRegistry();
-		}
-		return imageRegistry;
-	}
-
-	/**
-	 *	Initialize the image registry by declaring all of the required
-	 *	graphics. This involves creating JFace image descriptors describing
-	 *	how to create/find the image should it be needed.
-	 *	The image is not actually allocated until requested.
-	 *
-	 * 	Prefix conventions
-	 *		Wizard Banners			WIZBAN_
-	 *		Preference Banners		PREF_BAN_
-	 *		Property Page Banners	PROPBAN_
-	 *		Color toolbar			CTOOL_
-	 *		Enable toolbar			ETOOL_
-	 *		Disable toolbar			DTOOL_
-	 *		Local enabled toolbar	ELCL_
-	 *		Local Disable toolbar	DLCL_
-	 *		Object large			OBJL_
-	 *		Object small			OBJS_
-	 *		View 					VIEW_
-	 *		Product images			PROD_
-	 *		Misc images				MISC_
-	 *
-	 *	Where are the images?
-	 *		The images (typically gifs) are found in the same location as this plugin class.
-	 *		This may mean the same package directory as the package holding this class.
-	 *		The images are declared using this.getClass() to ensure they are looked up via
-	 *		this plugin class.
-	 *	@see JFace's ImageRegistry
-	 */
-	public static ImageRegistry initializeImageRegistry() {
-		imageRegistry= new ImageRegistry(JspUIPlugin.getStandardDisplay());
-		imageDescriptors = new HashMap(30);
-		declareImages();
-		return imageRegistry;
-	}
-
-	/**
-	 * Returns the <code>Image<code> identified by the given key,
-	 * or <code>null</code> if it does not exist.
-	 */
-	public static Image getImage(String key) {
-		return getImageRegistry().get(key);
-	}
-	
-	/**
-	 * Returns the <code>ImageDescriptor<code> identified by the given key,
-	 * or <code>null</code> if it does not exist.
-	 */
-	public static ImageDescriptor getImageDescriptor(String key) {
-		if (imageDescriptors == null) {
-			initializeImageRegistry();
-		}
-		return (ImageDescriptor)imageDescriptors.get(key);
-	}
-	
-	private static URL makeIconFileURL(String iconPath) throws MalformedURLException {
-		if (ICON_BASE_URL == null) {
-			throw new MalformedURLException();
-		}
-			
-		return new URL(ICON_BASE_URL, iconPath);
-	}
-}
-
-

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java
deleted file mode 100644
index c9bc908..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import org.eclipse.core.indexsearch.IIndexQuery;
-import org.eclipse.core.indexsearch.ISearchResultCollector;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.search.IJavaSearchResultCollector;
-
-
-public class JspSearchEngine {
-
-	public static void search(final IJavaSearchResultCollector collector, final IIndexQuery query, IProgressMonitor pm) {
-		
-		System.out.println("JspSearchEngine.search: " + query); //$NON-NLS-1$
-									
-		JspUIPlugin.getDefault().search(
-			query,
-			new ISearchResultCollector() {
-				public void accept(IResource resource, int start, int length) throws CoreException {
-					System.out.println("  accept: " + resource); //$NON-NLS-1$
-					collector.accept(resource, start, start+length, null, 999);
-				}
-			},
-			pm
-		);
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java
deleted file mode 100644
index 5ad99f4..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTranslator.java
+++ /dev/null

@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.source.translation.ITagHandler;
-import org.eclipse.jface.text.source.translation.ITagHandlerFactory;
-import org.eclipse.jface.text.source.translation.ITranslator;
-
-import org.eclipse.jdt.internal.ui.examples.jspeditor.JspTranslatorResultCollector;
-
-
-public class JspTranslator extends AbstractJspParser implements ITranslator {
-	
-	private StringBuffer fDeclarations= new StringBuffer();
-	private StringBuffer fContent= new StringBuffer();
-	private StringBuffer fLocalDeclarations= new StringBuffer();
-	
-	private ArrayList fContentLines= new ArrayList();
-	private ArrayList fDeclarationLines= new ArrayList();
-	private ArrayList fLocalDeclarationLines= new ArrayList();
-	private int[] fSmap;
-	
-	private ITagHandlerFactory fTagHandlerFactor;
-	private ITagHandler fCurrentTagHandler;
-
-	private JspTranslatorResultCollector fResultCollector;
-	
-	
-	public JspTranslator() {
-		
-		// Links for passing parameters to the tag handlers 
-		fResultCollector= new JspTranslatorResultCollector(fDeclarations, fLocalDeclarations, fContent, fDeclarationLines, fLocalDeclarationLines, fContentLines);
-	}
-		
-	protected void startTag(boolean endTag, String name, int startName) {
-
-		fCurrentTagHandler= fTagHandlerFactor.getHandler(name);
-	}
-	
-	protected void tagAttribute(String attrName, String value, int startName, int startValue) {
-
-		if (fCurrentTagHandler != null)
-			fCurrentTagHandler.addAttribute(attrName, value, fLines);
-	}
-	
-	protected void endTag(boolean end) {
-
-		if (fCurrentTagHandler != null)
-			try  {
-				fCurrentTagHandler.processEndTag(fResultCollector, fLines);
-			} catch (IOException ex)  {
-				ex.printStackTrace();
-			}
-	}
-	
-	protected void java(char ch, String java, int line) {
-
-		if (ch == '!')
-			fCurrentTagHandler= fTagHandlerFactor.getHandler("<%!"); //$NON-NLS-1$
-		else
-			fCurrentTagHandler= fTagHandlerFactor.getHandler("<%"); //$NON-NLS-1$
-
-		/*
-		 * XXX: This is needed because the used parser does not treat
-		 *      "<%" like every other tag.
-		 */
-		fCurrentTagHandler.addAttribute("source", java, line); //$NON-NLS-1$
-
-		try {
-			fCurrentTagHandler.processEndTag(fResultCollector, line);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	protected void text(String t, int line) {
-		int i= 0;
-		StringBuffer out= new StringBuffer();
-		while (i < t.length()) {
-			char c= t.charAt(i++);
-			if (c == '\n') {
-				fContent.append("    System.out.println(\"" + out.toString() + "\");  //$NON-NLS-1$\n");  //$NON-NLS-1$//$NON-NLS-2$
-				fContentLines.add(new Integer(line++));
-				out.setLength(0);
-			} else {
-				out.append(c);	
-			}
-		}
-		if (out.length() > 0)  {
-			fContent.append("    System.out.print(\"" + out.toString() + "\");  //$NON-NLS-1$\n"); //$NON-NLS-1$ //$NON-NLS-2$
-			fContentLines.add(new Integer(line));
-		}
-	}
-	
-	private void resetTranslator() {
-		fDeclarations.setLength(0);
-		fContent.setLength(0);
-		fLocalDeclarations.setLength(0);
-		
-		fLocalDeclarationLines.clear();
-		fContentLines.clear();
-		fDeclarationLines.clear();
-		
-	}
-
-	public String translate(Reader reader, String name) throws IOException  {
-
-		StringBuffer buffer= new StringBuffer();
-		
-		resetTranslator();
-		parse(reader);
-
-		int lineCount= 2 + fDeclarationLines.size() + 1 + 1 + fLocalDeclarationLines.size() + fContentLines.size() + 3;
-		fSmap= new int[lineCount];
-		int line= 0;
-		fSmap[line++]= 1;
-
-		buffer.append("public class " + name + " {\n\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		fSmap[line++]= 1;
-		fSmap[line++]= 1;
-
-		buffer.append(fDeclarations.toString() + "\n"); //$NON-NLS-1$
-		System.out.println(fDeclarations.toString());
-		for (int i= 0; i < fDeclarationLines.size(); i++)  {
-			fSmap[line++]= ((Integer)fDeclarationLines.get(i)).intValue();
-			System.out.println("" + ((Integer)fDeclarationLines.get(i)).intValue()); //$NON-NLS-1$
-		}
-		fSmap[line]= fSmap[line - 1] + 1;
-		line++;
-
-		buffer.append("  public void out() {\n"); //$NON-NLS-1$
-		fSmap[line]= fSmap[line - 1] + 1;
-		line++;
-		
-		if (fLocalDeclarations.length() > 0)  {
-			buffer.append(fLocalDeclarations.toString());
-			System.out.println(fLocalDeclarations);
-			for (int i= 0; i < fLocalDeclarationLines.size(); i++) {
-				System.out.println("" + ((Integer)fLocalDeclarationLines.get(i)).intValue()); //$NON-NLS-1$
-				fSmap[line++]= ((Integer)fLocalDeclarationLines.get(i)).intValue();
-			}
-		}
-		
-		buffer.append(fContent.toString());
-		System.out.println(fContent);
-		for (int i= 0; i < fContentLines.size(); i++)  {
-			fSmap[line++]= ((Integer)fContentLines.get(i)).intValue();
-			System.out.println("" + ((Integer)fContentLines.get(i)).intValue()); //$NON-NLS-1$
-		}
-
-		buffer.append("  }\n"); //$NON-NLS-1$
-		fSmap[line]= fSmap[line - 1];
-
-		line++;
-		
-		buffer.append("}\n"); //$NON-NLS-1$
-		fSmap[line]= fSmap[line - 2];
-		
-		for (int i= 0; i < fSmap.length; i++)
-			System.out.println("" + i + " -> " + fSmap[i]); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		System.out.println(buffer.toString());
-		
-		return buffer.toString();
-	}
-	
-	public int[] getLineMapping()  {
-		return fSmap;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.ITranslator#setTagHandlerFactory(org.eclipse.jface.text.source.ITagHandlerFactory)
-	 */
-	public void setTagHandlerFactory(ITagHandlerFactory tagHandlerFactory) {
-		fTagHandlerFactor= tagHandlerFactory;
-	}
-
-	/*
-	 * @see ITranslator#backTranslateOffsetInLine(String, String, int)
-	 */
-	public int backTranslateOffsetInLine(String originalLine, String translatedLine, int offsetInTranslatedLine, String tag)  {
-
-		ITagHandler handler;
-		if (tag != null)
-			handler= fTagHandlerFactor.getHandler(tag);
-		else
-			handler= fTagHandlerFactor.findHandler(originalLine);
-
-		if (handler != null)
-			return handler.backTranslateOffsetInLine(originalLine, translatedLine, offsetInTranslatedLine);
-
-		return -1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java
deleted file mode 100644
index 44a15e1..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspTypeQuery.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.indexsearch.*;
-import org.eclipse.core.indexsearch.IIndexQuery;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * Implementation for a JSP type query.
- */
-public class JspTypeQuery implements IIndexQuery {
-
-	private IType fType;
-	private JspMatchLocatorParser fParser;
-	
-	public JspTypeQuery(IType type) {
-		fType= type;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.search.ISearch#computePathsKeyingIndexFiles(java.util.ArrayList)
-	 */
-	public void computePathsKeyingIndexFiles(ArrayList requiredIndexKeys) {
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IProject[] projects= workspace.getRoot().getProjects();
-		try {
-			for (int i= 0; i < projects.length; i++) {
-				IProject project= projects[i];
-				if (!project.isAccessible() || !project.hasNature(JavaCore.NATURE_ID))
-					continue;
-				IPath path= project.getFullPath();
-				if (requiredIndexKeys.indexOf(path) == -1) {
-					requiredIndexKeys.add(path);
-				}
-			}
-		} catch (CoreException ex) {
-			JspUIPlugin.log("jsp query internal error", ex); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.search.ISearch#findIndexMatches(org.eclipse.jdt.internal.core.index.IIndex, org.eclipse.jdt.internal.core.search.PathCollector, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void findIndexMatches(IIndex index, HashSet pathCollector, IProgressMonitor progressMonitor) throws IOException {
-
-		String typeName= fType.getFullyQualifiedName();
-		String s= JspIndexParser.JSP_TYPE_REF + "/" + typeName; //$NON-NLS-1$
-		index.queryPrefix(pathCollector, s);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.search.ISearch#locateMatches(org.eclipse.core.resources.IFile, org.eclipse.jsp.IJspSearchResultCollector)
-	 */
-	public void locateMatches(IFile candidate, ISearchResultCollector resultCollector) {
-		if (fParser== null)
-			fParser= new JspMatchLocatorParser();
-		String typeName= fType.getFullyQualifiedName();
-		fParser.match(candidate, typeName, resultCollector);
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java
deleted file mode 100644
index 0b25dc5..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java
+++ /dev/null

@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import org.eclipse.core.indexsearch.IIndexQuery;
-import org.eclipse.core.indexsearch.ISearchResultCollector;
-import org.eclipse.core.indexsearch.SearchEngine;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageRegistry;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.editors.text.TextEditorPreferenceConstants;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
- */
-public class JspUIPlugin extends AbstractUIPlugin implements IResourceChangeListener {
-		
-	/**
-	 * The id of the JavaFamilyExample plugin (value <code>"org.eclipse.jdt.ui.examples.javafamily"</code>).
-	 */	
-	public static final String ID_PLUGIN= "org.eclipse.jdt.ui.examples.javafamily"; //$NON-NLS-1$
-
-	public static final String JSP_TYPE= "jsp"; //$NON-NLS-1$
-	
-	private static final boolean DEBUG= false;
-	private static JspUIPlugin fgDefault;
-	private static boolean fgJSPIndexingIsEnabled= false;
-	
-	private SearchEngine fSearchEngine;
-	
-	/**
-	 * @param descriptor
-	 */
-	public JspUIPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		fgDefault= this;
-		fSearchEngine= SearchEngine.getSearchEngine();
-	}
-	
-	public static JspUIPlugin getDefault() {
-		return fgDefault;
-	}
-
-	void controlJSPIndexing(boolean enable) {
-		if (fgJSPIndexingIsEnabled != enable) {
-			fgJSPIndexingIsEnabled= enable;
-			IWorkspace workspace= ResourcesPlugin.getWorkspace();
-			if (enable) {
-				
-				IResourceProxyVisitor visitor=
-					new IResourceProxyVisitor() {
-						public boolean visit(IResourceProxy proxy) throws CoreException {
-							String name= proxy.getName();
-							int pos= name.lastIndexOf('.');
-							if (pos >= 0) {
-								String extension= name.substring(pos+1);
-								if (JSP_TYPE.equalsIgnoreCase(extension)) {
-									IResource r= proxy.requestResource();
-									if (r instanceof IFile)
-										jspAdded((IFile)r);
-								}
-							}
-							return true;
-						}
-					};
-				try {
-					workspace.getRoot().accept(visitor, 0);
-				} catch (CoreException e) {
-					log("visiting jsp files", e); //$NON-NLS-1$
-				}
-				
-				workspace.addResourceChangeListener(this,
-	//					IResourceChangeEvent.PRE_AUTO_BUILD |
-	//					IResourceChangeEvent.POST_AUTO_BUILD |
-						IResourceChangeEvent.POST_CHANGE |
-						IResourceChangeEvent.PRE_DELETE |
-						IResourceChangeEvent.PRE_CLOSE
-				);					
-			} else {
-				workspace.removeResourceChangeListener(this);					
-			}
-		}
-	}
-		
-	boolean isJSPIndexingOn() {
-		return fgJSPIndexingIsEnabled;
-	}
-	
-	public void resourceChanged(IResourceChangeEvent event) {
-		if ( !fgJSPIndexingIsEnabled || event == null)
-			return;
-		IResourceDelta d= event.getDelta();
-		if (d == null)
-			return;
-		try {
-			d.accept(
-				new IResourceDeltaVisitor() {
-					public boolean visit(IResourceDelta delta) {
-						if (delta != null) {
-							IResource r= delta.getResource();
-							if (r instanceof IFile) {
-								IFile file= (IFile) r;
-								String type= file.getFileExtension();
-								if (JSP_TYPE.equalsIgnoreCase(type)) {
-									switch (delta.getKind()) {
-									case IResourceDelta.ADDED:
-										jspAdded(file);
-										break;
-									case IResourceDelta.REMOVED:
-										jspRemoved(file);
-										break;
-									case IResourceDelta.CHANGED:
-										// no need to index if the content has not changed
-										if ((delta.getFlags() & IResourceDelta.CONTENT) != 0)
-											jspAdded(file);
-										break;
-									}					
-								}
-							}
-						}
-						return true;
-					}
-				}
-			);
-		} catch (CoreException e) {
-			log("processing resource delta", e); //$NON-NLS-1$
-		}
-	}
-	
-	public static void log(String message, Throwable e) {
-		getDefault().getLog().log(new Status(IStatus.ERROR, ID_PLUGIN, IStatus.ERROR, message, e));
-	}
-	
-	void jspAdded(IFile jspFile) {
-		if (DEBUG) System.out.println("Added: " + jspFile); //$NON-NLS-1$		
-		JspIndexParser indexer= new JspIndexParser(jspFile);
-		fSearchEngine.add(jspFile.getProject().getFullPath(), indexer);
-	}
-	
-	void jspRemoved(IFile jspFile) {
-		if (DEBUG) System.out.println("Removed: " + jspFile); //$NON-NLS-1$
-		fSearchEngine.remove(jspFile.getFullPath().toString(), jspFile.getProject().getFullPath());
-	}
-	
-	public void search(IIndexQuery query, ISearchResultCollector resultCollector, IProgressMonitor pm) {
-		fSearchEngine.search(query, resultCollector, pm, SearchEngine.WAIT_UNTIL_READY_TO_SEARCH);
-	}
-		
-	/**
-	 * Shutdown the JspCore plug-in.
-	 * <p>
-	 * De-registers the resource changed listener.
-	 * <p>
-	 * @see org.eclipse.core.runtime.Plugin#shutdown()
-	 */
-	public void shutdown() {
-		controlJSPIndexing(false);
-	}
-	
-	protected void initializeDefaultPreferences(IPreferenceStore prefs) {
-		TextEditorPreferenceConstants.initializeDefaultValues(prefs);
-	}
-	
-	/**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated display. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display= Display.getCurrent();
-		if (display == null) {
-			display= Display.getDefault();
-		}
-		return display;		
-	}
-	
-	protected ImageRegistry createImageRegistry() {
-		return JspPluginImages.initializeImageRegistry();
-	}	
-		
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java
deleted file mode 100644
index 3842f3b..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jsp;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.text.edits.ReplaceEdit;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.core.indexsearch.ISearchResultCollector;
-
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.refactoring.changes.TextChangeCompatibility;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-
-
-public class RenameTypeParticipant extends RenameParticipant {
-
-	private IType fType;
-
-	protected boolean initialize(Object element) {
-		fType= (IType)element;
-		return true;
-	}
-
-	public String getName() {
-		return JspMessages.getString("RenameTypeParticipant.name"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.participants.IRenameParticipant#checkInput(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.participants.IRenameParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		final Map changes= new HashMap();
-		final String newName= computeNewName();
-		ISearchResultCollector collector= new ISearchResultCollector() {
-			public void accept(IResource resource, int start, int length) throws CoreException {
-				TextFileChange change= (TextFileChange)changes.get(resource);
-				if (change == null) {
-					change= new TextFileChange(resource.getName(), (IFile)resource);
-					changes.put(resource, change);
-				}
-				TextChangeCompatibility.addTextEdit(change, "Update type reference", new ReplaceEdit(start, length, newName)); //$NON-NLS-1$
-			}
-		};
-		JspUIPlugin.getDefault().search(new JspTypeQuery(fType), collector, pm);
-		
-		if (changes.size() == 0)
-			return null;
-		CompositeChange result= new CompositeChange("JSP updates"); //$NON-NLS-1$
-		for (Iterator iter= changes.values().iterator(); iter.hasNext();) {
-			result.add((Change)iter.next());
-		}
-		return result;
-	}
-	
-	private String computeNewName() {
-		String newName= getArguments().getNewName();
-		String currentName= fType.getFullyQualifiedName();
-		int pos= currentName.lastIndexOf('.');
-		if (pos == -1)
-			return newName;
-		return currentName.substring(0, pos + 1) + newName;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/Util.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/Util.java
deleted file mode 100644
index faea5ab..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/Util.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp;
-
-import java.io.*;
-import java.io.File;
-
-public class Util {
-	
-	static char[] getChars(String s) {
-		int l= s.length();
-		char[] cc= new char[l];
-		if (l > 0)
-			s.getChars(0, l, cc, 0);
-		return cc;
-	}
-	
-	static char[] getFileCharContent(File file, String encoding) throws IOException {
-		System.out.println("****jdt.internal.compiler.util.Util.getFileCharContent: " + file + " " + encoding); //$NON-NLS-1$ //$NON-NLS-2$
-		InputStream stream = null;
-		try {
-			stream = new BufferedInputStream(new FileInputStream(file));
-			return Util.getInputStreamAsCharArray(stream, (int) file.length(), encoding);
-		} finally {
-			if (stream != null) {
-				try {
-					stream.close();
-				} catch (IOException e) {
-					// ignore
-				}
-			}
-		}
-	}
-
-	public static char[] getInputStreamAsCharArray(InputStream stream, int length, String encoding) throws IOException {
-		InputStreamReader reader = (encoding == null)
-			? new InputStreamReader(stream)
-			: new InputStreamReader(stream, encoding);
-		char[] contents;
-		if (length == -1) {
-			contents = new char[0];
-			int contentsLength = 0;
-			int amountRead = -1;
-			do {
-				int amountRequested = Math.max(stream.available(), 8192);  // read at least 8K
-
-				// resize contents if needed
-				if (contentsLength + amountRequested > contents.length) {
-					System.arraycopy(
-							contents,
-							0,
-							contents = new char[contentsLength + amountRequested],
-							0,
-							contentsLength);
-				}
-
-				// read as many chars as possible
-				amountRead = reader.read(contents, contentsLength, amountRequested);
-
-				if (amountRead > 0) {
-					// remember length of contents
-					contentsLength += amountRead;
-				}
-			} while (amountRead != -1);
-
-			// resize contents if necessary
-			if (contentsLength < contents.length) {
-				System.arraycopy(
-						contents,
-						0,
-						contents = new char[contentsLength],
-						0,
-						contentsLength);
-			}
-		} else {
-			contents = new char[length];
-			int len = 0;
-			int readSize = 0;
-			while ((readSize != -1) && (len != length)) {
-				// See PR 1FMS89U
-				// We record first the read size. In this case len is the actual read size.
-				len += readSize;
-				readSize = reader.read(contents, len, length - len);
-			}
-			// See PR 1FMS89U
-			// Now we need to resize in case the default encoding used more than one byte for each
-			// character
-			if (len != length)
-				System.arraycopy(contents, 0, (contents = new char[len]), 0, len);
-		}
-
-		return contents;
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.java
deleted file mode 100644
index f0c7c3d..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * LaunchingMessages
- */
-public class LaunchingMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jsp.launching.LaunchingMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/**
-	 * 
-	 */
-	private LaunchingMessages() {
-		super();
-	}
-	/**
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.properties b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.properties
deleted file mode 100644
index 3faca98..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/LaunchingMessages.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-ToggleJspBreakpointAction.2=Toggle Breakpoint
-
-TomcatLaunchDelegate.6=Unable to resolve ${catalina_home}
-TomcatLaunchDelegate.7=Specified $catalina_home does not exist: {0}
-TomcatLaunchDelegate.8=Unable to resolve ${catalina_home}
-TomcatLaunchDelegate.9=${catalina_home} variable does not exist.
-
-TomcatTab.3=&Tomcat install location:
-TomcatTab.4=Select a Tomcat installation directory
-TomcatTab.5=Tomcat installation directory does not exist.
-TomcatTab.6=Tomcat installation directory is not a directory.
-TomcatTab.7=Tomcat
-TomcatTab.21=&Browse...
-TomcatTab.22=&Project:
-TomcatTab.23=B&rowse...
-TomcatTab.24=Select a single project
-TomcatTab.28=Project Selection
-TomcatTab.29=Choose a project containing a web application
-TomcatTab.30=Specified project does not exist
-

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java
deleted file mode 100644
index dfea90e..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointAction.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * ToggleJspBreakpointAction
- */
-public class ToggleJspBreakpointAction extends Action implements IAction {
-	
-	private ITextEditor fEditor;
-	private IVerticalRulerInfo fRulerInfo;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager();
-		IBreakpoint[] breakpoints = manager.getBreakpoints();
-		IResource resource = getResource();
-		int lineNumber = fRulerInfo.getLineOfLastMouseButtonActivity() + 1;
-		for (int i = 0; i < breakpoints.length; i++) {
-			IBreakpoint bp = breakpoints[i];
-			if (bp instanceof IJavaStratumLineBreakpoint) {
-				IJavaStratumLineBreakpoint breakpoint = (IJavaStratumLineBreakpoint)bp;
-				if (breakpoint.getMarker().getResource().equals(resource)) {
-					try {
-						if (breakpoint.getLineNumber() == lineNumber) {
-							// remove
-							breakpoint.delete();
-							return;
-						}
-					} catch (CoreException e) {
-						e.printStackTrace();
-					}
-				} 
-			}
-		}
-		createBreakpoint();
-	}
-	
-	protected void createBreakpoint() {
-		IResource resource = getResource();
-		int lineNumber = fRulerInfo.getLineOfLastMouseButtonActivity() + 1;
-		try {
-			JDIDebugModel.createStratumBreakpoint(resource, null, resource.getName(), null, null, lineNumber, -1, -1, 0, true, null); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @param editor
-	 * @param rulerInfo
-	 */
-	public ToggleJspBreakpointAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
-		super(LaunchingMessages.getString("ToggleJspBreakpointAction.2")); //$NON-NLS-1$
-		fEditor = editor;
-		fRulerInfo = rulerInfo; 
-	}
-
-	protected IResource getResource() {
-		IEditorInput input= fEditor.getEditorInput();
-		IResource resource= (IResource) input.getAdapter(IFile.class);
-		if (resource == null) {
-			resource= (IResource) input.getAdapter(IResource.class);
-		}
-		return resource;
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointRulerActionDelegate.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointRulerActionDelegate.java
deleted file mode 100644
index 85cafef..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/ToggleJspBreakpointRulerActionDelegate.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * ToggleJspBreakpointActionDelegate
- */
-public class ToggleJspBreakpointRulerActionDelegate extends AbstractRulerActionDelegate {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
-	 */
-	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
-		return new ToggleJspBreakpointAction(editor, rulerInfo);
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java
deleted file mode 100644
index 925ed47..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatClasspathProvider.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.jdt.launching.StandardClasspathProvider;
-
-/**
- * TomcatClasspathProvider
- */
-public class TomcatClasspathProvider extends StandardClasspathProvider {
-
-	/**
-	 * Tomcat requires <code>tools.jar</code> and <code>bootstrap.jar</code> on its
-	 * classpath.
-	 * 
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#computeUnresolvedClasspath(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
-		boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
-		if (useDefault) {
-			IRuntimeClasspathEntry[] defaults = super.computeUnresolvedClasspath(configuration);
-			IVMInstall vm = JavaRuntime.computeVMInstall(configuration);
-			LibraryLocation[] libs = JavaRuntime.getLibraryLocations(vm);
-			List rtes = new ArrayList();
-			for (int i = 0; i < defaults.length; i++) {
-				rtes.add(defaults[i]);
-			}
-			// add bootstrap.jar
-			String catalinaHome = TomcatLaunchDelegate.getCatalinaHome();
-			IPath path = new Path(catalinaHome).append("bin").append("bootstrap.jar"); //$NON-NLS-1$ //$NON-NLS-2$
-			IRuntimeClasspathEntry r = JavaRuntime.newArchiveRuntimeClasspathEntry(path);
-			r.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-			rtes.add(r);
-			// add class libraries to bootpath			
-			boolean tools = false; // keeps track of whether a tools.jar was found	
-			for (int i = 0; i < libs.length; i++) {
-				LibraryLocation lib = libs[i];
-				if (lib.getSystemLibraryPath().toString().endsWith("tools.jar")) { //$NON-NLS-1$
-					tools = true;
-				}
-			}
-			if (!tools) {
-				// add a tools.jar
-				IPath toolsPath = new Path(vm.getInstallLocation().getAbsolutePath()).append("lib").append("tools.jar"); //$NON-NLS-1$ //$NON-NLS-2$
-				if (toolsPath.toFile().exists()) {
-					r = JavaRuntime.newArchiveRuntimeClasspathEntry(toolsPath);
-					r.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-					rtes.add(r);
-				}
-			}
-			return (IRuntimeClasspathEntry[])rtes.toArray(new IRuntimeClasspathEntry[rtes.size()]);
-		} else {
-			// recover persisted classpath
-			return recoverRuntimePath(configuration, IJavaLaunchConfigurationConstants.ATTR_CLASSPATH);
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatLaunchDelegate.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatLaunchDelegate.java
deleted file mode 100644
index d942b40..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatLaunchDelegate.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IValueVariable;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate;
-import org.eclipse.jsp.JspUIPlugin;
-
-/**
- * Launch delegate for a local Tomcat server
- */
-public class TomcatLaunchDelegate extends JavaLocalApplicationLaunchConfigurationDelegate {
-
-	/**
-	 * Identifier for Tomcat launch configurations.
-	 */
-	public static final String ID_TOMCAT_LAUNCH_CONFIGURATION_TYPE = "org.eclipse.jsp.TomcatConfigurationType"; //$NON-NLS-1$
-	
-	/**
-	 * Identifier for Tomcat classpath provider.
-	 */
-	public static final String ID_TOMCAT_CLASSPATH_PROVIDER = "org.eclipse.jsp.tomcatClasspathProvider"; //$NON-NLS-1$
-		
-	/**
-	 * Launch configuration attribute - value is path to local installation of Tomcat.
-	 * The path may be encoded in a launch variable.
-	 */
-	public static final String ATTR_CATALINA_HOME = "org.eclipse.jsp.CATALINA_HOME"; //$NON-NLS-1$
-	
-	/**
-	 * Constructs a new launch delegate
-	 */
-	public TomcatLaunchDelegate() {
-		super();
-	}
-
-	/**
-	 * Returns the value of the <code>${catalina_home}</code> launch variable.
-	 * 
-	 * @return the value of the <code>${catalina_home}</code> launch variable
-	 * @exception CoreException if the variable or value is undefined
-	 */
-	public static String getCatalinaHome() throws CoreException {
-		IValueVariable variable = VariablesPlugin.getDefault().getStringVariableManager().getValueVariable("catalina_home"); //$NON-NLS-1$
-		IStatus err = null;
-		if (variable == null) {
-			err = new Status(IStatus.ERROR, JspUIPlugin.getDefault().getDescriptor().getUniqueIdentifier(), 0, LaunchingMessages.getString("TomcatLaunchDelegate.9"), null); //$NON-NLS-1$
-		} else {
-			String home = variable.getValue();	
-			if (home != null && home.length() > 0) {
-				File file = new File(home);
-				if (file.exists() && file.isDirectory()) {
-					return home;
-				} else {
-					err = new Status(IStatus.ERROR, JspUIPlugin.getDefault().getDescriptor().getUniqueIdentifier(), 0, MessageFormat.format(LaunchingMessages.getString("TomcatLaunchDelegate.7"), new String[]{home}), null); //$NON-NLS-1$
-				}
-			} else {
-				err = new Status(IStatus.ERROR, JspUIPlugin.getDefault().getDescriptor().getUniqueIdentifier(), 0, LaunchingMessages.getString("TomcatLaunchDelegate.8"), null); //$NON-NLS-1$
-			}
-		}
-		throw new CoreException(err);
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java
deleted file mode 100644
index 3f8ba64..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java
+++ /dev/null

@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
- 
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jsp.JspPluginImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Specifies the install location of Tomcat.
- */
-public class TomcatTab extends AbstractLaunchConfigurationTab {
-		
-		
-	// Tomcat location
-	private Button fBrowseButton;
-	private Text fTomcatDir;
-	
-	// WebApp location
-	private Button fProjectButton;
-	private Text fProjectText;
-	
-	/**
-	 * Constructs a new Tomcat tab
-	 */
-	public TomcatTab() {
-		super();
-	}
-		
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		Font font = parent.getFont();
-				
-		Composite composite = new Composite(parent, SWT.NONE);		
-		GridLayout workingDirLayout = new GridLayout();
-		workingDirLayout.numColumns = 3;
-		workingDirLayout.marginHeight = 0;
-		workingDirLayout.marginWidth = 0;
-		composite.setLayout(workingDirLayout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		composite.setLayoutData(gd);
-		composite.setFont(font);
-		setControl(composite);
-		
-		createVerticalSpacer(composite, 3);
-				
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(LaunchingMessages.getString("TomcatTab.3")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 3;
-		label.setLayoutData(gd);
-		label.setFont(font);
-				
-		fTomcatDir = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fTomcatDir.setLayoutData(gd);
-		fTomcatDir.setFont(font);
-		fTomcatDir.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fBrowseButton = createPushButton(composite, LaunchingMessages.getString("TomcatTab.21"), null); //$NON-NLS-1$
-		fBrowseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleTomcatBrowseButtonSelected();
-			}
-		});
-		
-		createVerticalSpacer(composite, 3);
-		
-		label = new Label(composite, SWT.NONE);
-		label.setText(LaunchingMessages.getString("TomcatTab.22")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 3;
-		label.setLayoutData(gd);
-		label.setFont(font);
-				
-		fProjectText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fProjectText.setLayoutData(gd);
-		fProjectText.setFont(font);
-		fProjectText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fProjectButton = createPushButton(composite, LaunchingMessages.getString("TomcatTab.23"), null); //$NON-NLS-1$
-		fProjectButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleProjectBrowseButtonSelected();
-			}
-		});		
-	}
-		
-	/**
-	 * Show a dialog that lets the user select a project
-	 * from the workspace
-	 */
-	protected void handleProjectBrowseButtonSelected() {		
-		ILabelProvider lp= new WorkbenchLabelProvider();
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), lp);
-		dialog.setElements(ResourcesPlugin.getWorkspace().getRoot().getProjects());
-		dialog.setMultipleSelection(false);
-		dialog.setTitle(LaunchingMessages.getString("TomcatTab.28")); //$NON-NLS-1$
-		dialog.setMessage(LaunchingMessages.getString("TomcatTab.29")); //$NON-NLS-1$
-		if (dialog.open() == Window.OK) {
-			Object[] elements= dialog.getResult();
-			if (elements != null && elements.length == 1) {
-				fProjectText.setText(((IResource)elements[0]).getName());
-			}
-		}
-		
-	}
-
-	/**
-	 * Show a dialog that lets the user select a tomcat install directory
-	 */
-	protected void handleTomcatBrowseButtonSelected() {
-		DirectoryDialog dialog = new DirectoryDialog(getShell());
-		dialog.setMessage(LaunchingMessages.getString("TomcatTab.4")); //$NON-NLS-1$
-		String currentWorkingDir = fTomcatDir.getText();
-		if (!currentWorkingDir.trim().equals("")) { //$NON-NLS-1$
-			File path = new File(currentWorkingDir);
-			if (path.exists()) {
-				dialog.setFilterPath(currentWorkingDir);
-			}			
-		}
-		
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null) {
-			fTomcatDir.setText(selectedDirectory);
-		}		
-	}
-					
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		// empty implementation
-	}
-		
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		setErrorMessage(null);
-		setMessage(null);
-		
-		String workingDirPath = fTomcatDir.getText().trim();
-		// resolve variables (if any)
-		String expansion;
-		try {
-			expansion = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(workingDirPath);
-		} catch (CoreException e) {
-			setErrorMessage(e.getMessage());
-			return false;
-		}
-		if (workingDirPath.length() > 0) {
-			File dir = new File(expansion);
-			if (!dir.exists()) {
-				setErrorMessage(LaunchingMessages.getString("TomcatTab.5")); //$NON-NLS-1$
-				return false;
-			}
-			if (!dir.isDirectory()) {
-				setErrorMessage(LaunchingMessages.getString("TomcatTab.6")); //$NON-NLS-1$
-				return false;
-			}
-		}	
-		
-		String projectName = fProjectText.getText().trim();
-		if (projectName.length() > 0) {
-			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-			if (!project.exists()) {
-				setErrorMessage(LaunchingMessages.getString("TomcatTab.30")); //$NON-NLS-1$
-				return false;
-			}
-		}	
-					
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(TomcatLaunchDelegate.ATTR_CATALINA_HOME, "${catalina_home}"); //$NON-NLS-1$
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, TomcatLaunchDelegate.ID_TOMCAT_CLASSPATH_PROVIDER);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.catalina.startup.Bootstrap"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			fTomcatDir.setText(configuration.getAttribute(TomcatLaunchDelegate.ATTR_CATALINA_HOME, "")); //$NON-NLS-1$
-			fProjectText.setText(configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "")); //$NON-NLS-1$
-			if (configuration.isWorkingCopy()) {
-				// set VM args
-				ILaunchConfigurationWorkingCopy workingCopy = (ILaunchConfigurationWorkingCopy)configuration;
-				String home = TomcatLaunchDelegate.getCatalinaHome();
-				IPath endorsed = new Path(home).append("common").append("endorsed");  //$NON-NLS-1$//$NON-NLS-2$
-				IPath temp = new Path(home).append("temp"); //$NON-NLS-1$
-				StringBuffer args = new StringBuffer();
-				args.append("-Djava.endorsed.dirs=\""); //$NON-NLS-1$
-				args.append(endorsed.toOSString());
-				args.append("\" "); //$NON-NLS-1$
-				args.append("-Dcatalina.base=\""); //$NON-NLS-1$
-				args.append(home);
-				args.append("\" "); //$NON-NLS-1$
-				args.append("-Dcatalina.home=\""); //$NON-NLS-1$
-				args.append(home);
-				args.append("\" "); //$NON-NLS-1$
-				args.append("-Djava.io.tmpdir=\""); //$NON-NLS-1$
-				args.append(temp.toOSString());
-				args.append("\"");  //$NON-NLS-1$
-				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, args.toString());
-				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "start"); //$NON-NLS-1$
-			}
-		} catch (CoreException e) {
-			setErrorMessage(e.getMessage());
-			DebugPlugin.log(e);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(TomcatLaunchDelegate.ATTR_CATALINA_HOME, getAttributeValueFrom(fTomcatDir));
-		String projectName = getAttributeValueFrom(fProjectText);
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, projectName);
-	}
-
-	/**
-	 * Retuns the string in the text widget, or <code>null</code> if empty.
-	 * 
-	 * @return text or <code>null</code>
-	 */
-	protected String getAttributeValueFrom(Text text) {
-		String content = text.getText().trim();
-		if (content.length() > 0) {
-			return content;
-		}
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LaunchingMessages.getString("TomcatTab.7"); //$NON-NLS-1$
-	}	
-		
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return JspPluginImages.getImage(JspPluginImages.IMG_OBJ_TOMCAT);
-	}	
-
-}
-

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTabGroup.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTabGroup.java
deleted file mode 100644
index 12a8a21..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTabGroup.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jsp.launching;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-
-/**
- * Tab group for launching a local Tomcat server.
- */
-public class TomcatTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-			new TomcatTab(),
-			new JavaJRETab(),
-			new JavaClasspathTab(),
-			new SourceLookupTab(),
-			new CommonTab(),
-		};
-		setTabs(tabs);
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/Search.java b/org.eclipse.jdt.ui.examples.javafamily/stuff/Search.java
deleted file mode 100644
index e669ad0..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/Search.java
+++ /dev/null

@@ -1,461 +0,0 @@
-/*
- * Created on Apr 24, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package org.eclipse.jsp.core.search;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-
-import javax.servlet.jsp.tagext.TagInfo;
-import javax.servlet.jsp.tagext.TagLibraryInfo;
-
-import org.apache.jasper.CommandLineContext;
-import org.apache.jasper.JasperException;
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.Options;
-import org.apache.jasper.compiler.*;
-import org.apache.jasper.compiler.Compiler;
-import org.xml.sax.Attributes;
-
-/**
- * @author weinand
- */
-public class Search {
-	
-	static JspCompilationContext context= new JspCompilationContext() {
-		public String getClassPath() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public JspReader getReader() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public ServletWriter getWriter() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public ClassLoader getClassLoader() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public boolean isErrorPage() {
-			// TODO Auto-generated method stub
-			return false;
-		}
-
-		public String getOutputDir() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public String getJavacOutputDir() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public String getJspFile() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public String getServletClassName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public String getServletPackageName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public String getServletJavaFileName() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public boolean keepGenerated() {
-			// TODO Auto-generated method stub
-			return false;
-		}
-
-		public String getContentType() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public Options getOptions() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public void setContentType(String arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setReader(JspReader arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setWriter(ServletWriter arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setServletClassName(String arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setServletPackageName(String arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setServletJavaFileName(String arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setErrorPage(boolean arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public Compiler createCompiler() throws JasperException {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public String resolveRelativeUri(String arg0) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public InputStream getResourceAsStream(String arg0) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public URL getResource(String arg0) throws MalformedURLException {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public String getRealPath(String arg0) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public String[] getTldLocation(String arg0) throws JasperException {
-			// TODO Auto-generated method stub
-			return null;
-		}
-	};
-	
-	static ParseEventListener pel= new ParseEventListener() {
-		public void setReader(JspReader arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setDefault(boolean arg0) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void setTemplateInfo(Mark arg0, Mark arg1) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void beginPageProcessing() throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleComment(Mark arg0, Mark arg1, char[] arg2)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleDirective(
-			String arg0,
-			Mark arg1,
-			Mark arg2,
-			Attributes arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleDeclaration(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			char[] arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleScriptlet(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			char[] arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleExpression(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			char[] arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleBean(Mark arg0, Mark arg1, Attributes arg2)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleBean(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			boolean arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleBeanEnd(Mark arg0, Mark arg1, Attributes arg2)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleGetProperty(Mark arg0, Mark arg1, Attributes arg2)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleSetProperty(Mark arg0, Mark arg1, Attributes arg2)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleSetProperty(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			boolean arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handlePlugin(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			Hashtable arg3,
-			String arg4)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handlePlugin(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			Hashtable arg3,
-			String arg4,
-			boolean arg5)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleCharData(Mark arg0, Mark arg1, char[] arg2)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public TagLibraries getTagLibraries() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public void handleTagBegin(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			String arg3,
-			String arg4,
-			TagLibraryInfo arg5,
-			TagInfo arg6,
-			boolean arg7)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleTagBegin(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			String arg3,
-			String arg4,
-			TagLibraryInfo arg5,
-			TagInfo arg6,
-			boolean arg7,
-			boolean arg8)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleTagEnd(
-			Mark arg0,
-			Mark arg1,
-			String arg2,
-			String arg3,
-			Attributes arg4,
-			TagLibraryInfo arg5,
-			TagInfo arg6,
-			boolean arg7)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleForward(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			Hashtable arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleForward(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			Hashtable arg3,
-			boolean arg4)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleInclude(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			Hashtable arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleInclude(
-			Mark arg0,
-			Mark arg1,
-			Attributes arg2,
-			Hashtable arg3,
-			boolean arg4)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void endPageProcessing() throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleRootBegin(Attributes arg0) throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleRootEnd() {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleUninterpretedTagBegin(
-			Mark arg0,
-			Mark arg1,
-			String arg2,
-			Attributes arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleUninterpretedTagEnd(
-			Mark arg0,
-			Mark arg1,
-			String arg2,
-			char[] arg3)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void handleJspCdata(Mark arg0, Mark arg1, char[] arg2)
-			throws JasperException {
-			// TODO Auto-generated method stub
-
-		}
-	};
-
-	public static void main(String[] args) {
-				
-		String file= null;
-		String encoding= null;
-		InputStreamReader reader= null;
-		
-		try {
-			Parser p= new Parser(context, file, encoding, reader, pel);
-			p.parse();
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (JasperException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/easy.jsp b/org.eclipse.jdt.ui.examples.javafamily/stuff/easy.jsp
deleted file mode 100644
index ace438a..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/easy.jsp
+++ /dev/null

@@ -1,15 +0,0 @@
-<%@ page contentType="text/html" %>

-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>

-<html>

-  <head>

-    <title>JSP is Easy</title>

-  </head>

-  <body bgcolor="white">

-

-    <h1>JSP is as easy as ...</h1>

-

-    <%-- Calculate the sum of 1 + 2 + 3 dynamically --%>

-    1 + 2 + 3 = <c:out value="${1 + 2 + 3}" />

-

-  </body>

-</html>


diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/easy_jsp.java b/org.eclipse.jdt.ui.examples.javafamily/stuff/easy_jsp.java
deleted file mode 100644
index c95b485..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/easy_jsp.java
+++ /dev/null

@@ -1,91 +0,0 @@
-package org.apache.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import org.apache.jasper.runtime.*;
-
-public class easy_jsp extends HttpJspBase {
-
-
-  private static java.util.Vector _jspx_includes;
-
-  private org.apache.jasper.runtime.TagHandlerPool _jspx_tagPool_c_out_value;
-
-  public easy_jsp() {
-    _jspx_tagPool_c_out_value = new org.apache.jasper.runtime.TagHandlerPool();
-  }
-
-  public java.util.List getIncludes() {
-    return _jspx_includes;
-  }
-
-  public void _jspDestroy() {
-    _jspx_tagPool_c_out_value.release();
-  }
-
-  public void _jspService(HttpServletRequest request, HttpServletResponse response)
-        throws java.io.IOException, ServletException {
-
-    JspFactory _jspxFactory = null;
-    javax.servlet.jsp.PageContext pageContext = null;
-    HttpSession session = null;
-    ServletContext application = null;
-    ServletConfig config = null;
-    JspWriter out = null;
-    Object page = this;
-    JspWriter _jspx_out = null;
-
-
-    try {
-      _jspxFactory = JspFactory.getDefaultFactory();
-      response.setContentType("text/html;charset=ISO-8859-1");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, true, 8192, true);
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      session = pageContext.getSession();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("\r\n");
-      out.write("\r\n");
-      out.write("<html>\r\n  ");
-      out.write("<head>\r\n    ");
-      out.write("<title>JSP is Easy");
-      out.write("</title>\r\n  ");
-      out.write("</head>\r\n  ");
-      out.write("<body bgcolor=\"white\">\r\n\r\n    ");
-      out.write("<h1>JSP is as easy as ...");
-      out.write("</h1>\r\n\r\n    ");
-      out.write("\r\n    1 + 2 + 3 = ");
-      if (_jspx_meth_c_out_0(pageContext))
-        return;
-      out.write("\r\n\r\n  ");
-      out.write("</body>\r\n");
-      out.write("</html>\r\n");
-    } catch (Throwable t) {
-      out = _jspx_out;
-      if (out != null && out.getBufferSize() != 0)
-        out.clearBuffer();
-      if (pageContext != null) pageContext.handlePageException(t);
-    } finally {
-      if (_jspxFactory != null) _jspxFactory.releasePageContext(pageContext);
-    }
-  }
-
-  private boolean _jspx_meth_c_out_0(javax.servlet.jsp.PageContext pageContext)
-          throws Throwable {
-    JspWriter out = pageContext.getOut();
-    /* ----  c:out ---- */
-    org.apache.taglibs.standard.tag.el.core.OutTag _jspx_th_c_out_0 = (org.apache.taglibs.standard.tag.el.core.OutTag) _jspx_tagPool_c_out_value.get(org.apache.taglibs.standard.tag.el.core.OutTag.class);
-    _jspx_th_c_out_0.setPageContext(pageContext);
-    _jspx_th_c_out_0.setParent(null);
-    _jspx_th_c_out_0.setValue("${1 + 2 + 3}");
-    int _jspx_eval_c_out_0 = _jspx_th_c_out_0.doStartTag();
-    if (_jspx_th_c_out_0.doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE)
-      return true;
-    _jspx_tagPool_c_out_value.reuse(_jspx_th_c_out_0);
-    return false;
-  }
-}

diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/exampleJspProject.zip b/org.eclipse.jdt.ui.examples.javafamily/stuff/exampleJspProject.zip
deleted file mode 100644
index fc299767..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/exampleJspProject.zip
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.javafamily/stuff/index-format11 b/org.eclipse.jdt.ui.examples.javafamily/stuff/index-format11
deleted file mode 100644
index 1303041..0000000
--- a/org.eclipse.jdt.ui.examples.javafamily/stuff/index-format11
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.projects/.classpath b/org.eclipse.jdt.ui.examples.projects/.classpath
deleted file mode 100644
index 6c25ac1..0000000
--- a/org.eclipse.jdt.ui.examples.projects/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="examples"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.ui.examples.projects/.cvsignore b/org.eclipse.jdt.ui.examples.projects/.cvsignore
deleted file mode 100644
index fe99505..0000000
--- a/org.eclipse.jdt.ui.examples.projects/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-

diff --git a/org.eclipse.jdt.ui.examples.projects/.project b/org.eclipse.jdt.ui.examples.projects/.project
deleted file mode 100644
index c1ce1fb..0000000
--- a/org.eclipse.jdt.ui.examples.projects/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.ui.examples.projects</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.ide</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.ui.examples.projects/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.ui.examples.projects/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5e3ae3a..0000000
--- a/org.eclipse.jdt.ui.examples.projects/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Wed Sep 01 12:03:01 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.jdt.ui.examples.projects/about.html b/org.eclipse.jdt.ui.examples.projects/about.html
deleted file mode 100644
index 086cd31..0000000
--- a/org.eclipse.jdt.ui.examples.projects/about.html
+++ /dev/null

@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as follows:</p>
-
-<p><b>JUnit 3.8.1</b></p>
-<p>The plug-in is based on software developed by JUnit.org.  Your use of JUnit 3.8.1 in both source and binary code
-form contained in the plug-in is subject to the terms and conditions of the CPL.
-The source code is located in archive/junit/junit381src.jar.</p>
-
-<p>i) IBM effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;</p>
-<p>ii) IBM effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;</p>
-<p>iii) IBM states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.examples.projects/archive/junit/junit381src.jar b/org.eclipse.jdt.ui.examples.projects/archive/junit/junit381src.jar
deleted file mode 100644
index 843f70f..0000000
--- a/org.eclipse.jdt.ui.examples.projects/archive/junit/junit381src.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.projects/build.properties b/org.eclipse.jdt.ui.examples.projects/build.properties
deleted file mode 100644
index 0d1e74f..0000000
--- a/org.eclipse.jdt.ui.examples.projects/build.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = doc-html/,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties,\
-               archive/,\
-               *.jar
-source.jdtexamples.jar = examples/

diff --git a/org.eclipse.jdt.ui.examples.projects/doc-html/cpy.gif b/org.eclipse.jdt.ui.examples.projects/doc-html/cpy.gif
deleted file mode 100644
index ce488b9..0000000
--- a/org.eclipse.jdt.ui.examples.projects/doc-html/cpy.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.projects/doc-html/jdt_projects_ex.html b/org.eclipse.jdt.ui.examples.projects/doc-html/jdt_projects_ex.html
deleted file mode 100644
index 38433a0..0000000
--- a/org.eclipse.jdt.ui.examples.projects/doc-html/jdt_projects_ex.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-   <title>JDT - Java Example Projects</title>
-</head>
-<body>
-
-<h2>
-<b>Java Example Projects</b></h2>
-
-<h3>
-Introduction</h3>
-The Java examples provide you with sample code for exploring the Eclipse Java
-tools.
-
-<h3>
-Loading the Samples</h3>
-
-<ol>
-<li>
-Open the New wizard.</li>
-
-<li>
-Select Java in the Examples category.</li>
-
-<li>
-Select the project to be added to your workspace.</li>
-
-</ol>
-
-<p>The wizard creates a new Java project for you and imports the sample code
-into this project.</p>
-    <p><a href="notices.html"><img src="cpy.gif" alt="Copyright (c) 2000, 2004 IBM Corporation and others. All Rights Reserved." border="0"></a></p>
-</body>
-</html>

diff --git a/org.eclipse.jdt.ui.examples.projects/doc-html/notices.html b/org.eclipse.jdt.ui.examples.projects/doc-html/notices.html
deleted file mode 100644
index cc990a4..0000000
--- a/org.eclipse.jdt.ui.examples.projects/doc-html/notices.html
+++ /dev/null

@@ -1,19 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <LINK REL="STYLESHEET" HREF="../../../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-   <title>Legal Notices</title>
-</head>
-<body>
-
-<h3>
-<a NAME="Notices"></a>Notices</h3>
-<p>
-The material in this guide is Copyright (c) IBM Corporation and others 2000, 2004.
-</p>
-<p>
-<a href="about.html">Terms and conditions regarding the use of this guide.</a>
-</p>
-</body>
-</html>

diff --git a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationOperation.java b/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationOperation.java
deleted file mode 100644
index 0c9ac1f..0000000
--- a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationOperation.java
+++ /dev/null

@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.exampleprojects;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-public class ExampleProjectCreationOperation implements IRunnableWithProgress {
-
-	private IResource fElementToOpen;
-	
-	private ExampleProjectCreationWizardPage[] fPages;
-	private IOverwriteQuery fOverwriteQuery;
-	
-	/**
-	 * Constructor for ExampleProjectCreationOperation
-	 */
-	public ExampleProjectCreationOperation(ExampleProjectCreationWizardPage[] pages, IOverwriteQuery overwriteQuery) {
-		fElementToOpen= null;
-		fPages= pages;
-		fOverwriteQuery= overwriteQuery;
-	}
-	
-	/*
-	 * @see IRunnableWithProgress#run(IProgressMonitor)
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		if (monitor == null) {
-			monitor= new NullProgressMonitor();
-		}
-		try {
-			monitor.beginTask(ExampleProjectMessages.getString("ExampleProjectCreationOperation.op_desc"), fPages.length); //$NON-NLS-1$
-			IWorkspaceRoot root= ExampleProjectsPlugin.getWorkspace().getRoot();
-			
-			for (int i= 0; i < fPages.length; i++) {
-				createProject(root, fPages[i], new SubProgressMonitor(monitor, 1));
-			}
-		} finally {
-			monitor.done();
-		}
-	}		
-	
-	public IResource getElementToOpen() {
-		return fElementToOpen;
-	}
-	
-
-	private void createProject(IWorkspaceRoot root, ExampleProjectCreationWizardPage page, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		IConfigurationElement desc= page.getConfigurationElement();
-		
-		IConfigurationElement[] imports= desc.getChildren("import"); //$NON-NLS-1$
-		IConfigurationElement[] natures= desc.getChildren("nature"); //$NON-NLS-1$
-		IConfigurationElement[] references= desc.getChildren("references"); //$NON-NLS-1$
-		int nImports= (imports == null) ? 0 : imports.length;
-		int nNatures= (natures == null) ? 0 : natures.length;
-		int nReferences= (references == null) ? 0 : references.length;
-		
-		monitor.beginTask(ExampleProjectMessages.getString("ExampleProjectCreationOperation.op_desc_proj"), nImports + 1); //$NON-NLS-1$
-
-		String name= page.getName();
-		
-		String[] natureIds= new String[nNatures];
-		for (int i= 0; i < nNatures; i++) {
-			natureIds[i]= natures[i].getAttribute("id"); //$NON-NLS-1$
-		}
-		IProject[] referencedProjects= new IProject[nReferences];
-		for (int i= 0; i < nReferences; i++) {
-			referencedProjects[i]= root.getProject(references[i].getAttribute("id")); //$NON-NLS-1$
-		}		
-		
-		IProject proj= configNewProject(root, name, natureIds, referencedProjects, monitor);
-			
-		for (int i= 0; i < nImports; i++) {
-			doImports(proj, imports[i], new SubProgressMonitor(monitor, 1));
-		}
-		
-		String open= desc.getAttribute("open"); //$NON-NLS-1$
-		if (open != null && open.length() > 0) {
-			IResource fileToOpen= proj.findMember(new Path(open));
-			if (fileToOpen != null) {
-				fElementToOpen= fileToOpen;
-			}
-		}		
-		
-	}
-	
-	private IProject configNewProject(IWorkspaceRoot root, String name, String[] natureIds, IProject[] referencedProjects, IProgressMonitor monitor) throws InvocationTargetException {
-		try {
-			IProject project= root.getProject(name);
-			if (!project.exists()) {
-				project.create(null);
-			}
-			if (!project.isOpen()) {
-				project.open(null);
-			}
-			IProjectDescription desc= project.getDescription();
-			desc.setLocation(null);
-			desc.setNatureIds(natureIds);
-			desc.setReferencedProjects(referencedProjects);
-			
-			project.setDescription(desc, new SubProgressMonitor(monitor, 1));
-
-			return project;
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-	
-	private void doImports(IProject project, IConfigurationElement curr, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		try {
-			IPath destPath;
-			String name= curr.getAttribute("dest"); //$NON-NLS-1$
-			if (name == null || name.length() == 0) {
-				destPath= project.getFullPath();
-			} else {
-				IFolder folder= project.getFolder(name);
-				if (!folder.exists()) {
-					folder.create(true, true, null);
-				}
-				destPath= folder.getFullPath();
-			}
-			String importPath= curr.getAttribute("src"); //$NON-NLS-1$
-			if (importPath == null) {
-				importPath= ""; //$NON-NLS-1$
-				ExampleProjectsPlugin.log("projectsetup descriptor: import missing"); //$NON-NLS-1$
-				return;
-			}
-		
-			ZipFile zipFile= getZipFileFromPluginDir(importPath, getContributingPlugin(curr));
-			importFilesFromZip(zipFile, destPath, new SubProgressMonitor(monitor, 1));
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-	
-	private IPluginDescriptor getContributingPlugin(IConfigurationElement configurationElement) {
-		Object parent= configurationElement;
-		while(parent != null) {
-			if (parent instanceof IExtension)
-				return ((IExtension)parent).getDeclaringPluginDescriptor();
-			parent= ((IConfigurationElement)parent).getParent();
-		}
-		return null;
-	}
-
-	private ZipFile getZipFileFromPluginDir(String pluginRelativePath, IPluginDescriptor pluginDescriptor) throws CoreException {
-		try {
-			URL starterURL= new URL(pluginDescriptor.getInstallURL(), pluginRelativePath);
-			return new ZipFile(Platform.asLocalURL(starterURL).getFile());
-		} catch (IOException e) {
-			String message= pluginRelativePath + ": " + e.getMessage(); //$NON-NLS-1$
-			Status status= new Status(IStatus.ERROR, ExampleProjectsPlugin.getPluginId(), IStatus.ERROR, message, e);
-			throw new CoreException(status);
-		}
-	}
-	
-	private void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {		
-		ZipFileStructureProvider structureProvider=	new ZipFileStructureProvider(srcZipFile);
-		ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, fOverwriteQuery);
-		op.run(monitor);
-	}
-}

diff --git a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationWizard.java b/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationWizard.java
deleted file mode 100644
index 5b687a9..0000000
--- a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationWizard.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.exampleprojects;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
-public class ExampleProjectCreationWizard extends Wizard implements INewWizard, IExecutableExtension {
-
-	private ExampleProjectCreationWizardPage[] fPages;
-	private IConfigurationElement fConfigElement;
-
-	public ExampleProjectCreationWizard() {
-		super();
-		setDialogSettings(ExampleProjectsPlugin.getDefault().getDialogSettings());
-		setWindowTitle(ExampleProjectMessages.getString("ExampleProjectCreationWizard.title"));		 //$NON-NLS-1$
-		setNeedsProgressMonitor(true);
-	}
-	
-	private void initializeDefaultPageImageDescriptor() {
-		if (fConfigElement != null) {
-			String banner= fConfigElement.getAttribute("banner"); //$NON-NLS-1$
-			if (banner != null) {
-				ImageDescriptor desc= ExampleProjectsPlugin.getDefault().getImageDescriptor(banner);
-				setDefaultPageImageDescriptor(desc);
-			}
-		}
-	}
-
-	/*
-	 * @see Wizard#addPages
-	 */	
-	public void addPages() {
-		super.addPages();
-		
-		IConfigurationElement[] children = fConfigElement.getChildren("projectsetup"); //$NON-NLS-1$
-		if (children == null || children.length == 0) {
-			ExampleProjectsPlugin.log("descriptor must contain one ore more projectsetup tags"); //$NON-NLS-1$
-			return;
-		}
-		
-		fPages=  new ExampleProjectCreationWizardPage[children.length];
-		
-		for (int i= 0; i < children.length; i++) {
-			fPages[i]= new ExampleProjectCreationWizardPage(i, children[i]);
-			addPage(fPages[i]);
-		}
-	}
-	
-	/*
-	 * @see Wizard#performFinish
-	 */		
-	public boolean performFinish() {
-		ExampleProjectCreationOperation runnable= new ExampleProjectCreationOperation(fPages, new ImportOverwriteQuery());
-		
-		IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(runnable);
-		try {
-			getContainer().run(false, true, op);
-		} catch (InvocationTargetException e) {
-			handleException(e.getTargetException());
-			return false;
-		} catch  (InterruptedException e) {
-			return false;
-		}
-		BasicNewProjectResourceWizard.updatePerspective(fConfigElement);
-		IResource res= runnable.getElementToOpen();
-		if (res != null) {
-			openResource(res);
-		}
-		return true;
-	}
-	
-	private void handleException(Throwable target) {
-		String title= ExampleProjectMessages.getString("ExampleProjectCreationWizard.op_error.title"); //$NON-NLS-1$
-		String message= ExampleProjectMessages.getString("ExampleProjectCreationWizard.op_error.message"); //$NON-NLS-1$
-		if (target instanceof CoreException) {
-			IStatus status= ((CoreException)target).getStatus();
-			ErrorDialog.openError(getShell(), title, message, status);
-			ExampleProjectsPlugin.log(status);
-		} else {
-			MessageDialog.openError(getShell(), title, target.getMessage());
-			ExampleProjectsPlugin.log(target);
-		}
-	}
-	
-	private void openResource(final IResource resource) {
-		if (resource.getType() != IResource.FILE) {
-			return;
-		}
-		IWorkbenchWindow window= ExampleProjectsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-		if (window == null) {
-			return;
-		}
-		final IWorkbenchPage activePage= window.getActivePage();
-		if (activePage != null) {
-			final Display display= getShell().getDisplay();
-			display.asyncExec(new Runnable() {
-				public void run() {
-					try {
-						IDE.openEditor(activePage, (IFile)resource, true);
-					} catch (PartInitException e) {
-						ExampleProjectsPlugin.log(e);
-					}
-				}
-			});
-			BasicNewResourceWizard.selectAndReveal(resource, activePage.getWorkbenchWindow());
-		}
-	}	
-		
-	/**
-	 * Stores the configuration element for the wizard.  The config element will be used
-	 * in <code>performFinish</code> to set the result perspective.
-	 */
-	public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) {
-		fConfigElement= cfig;
-		
-		initializeDefaultPageImageDescriptor();
-	}
-	
-	// overwrite dialog
-	
-	private class ImportOverwriteQuery implements IOverwriteQuery {
-		public String queryOverwrite(String file) {
-			String[] returnCodes= { YES, NO, ALL, CANCEL};
-			int returnVal= openDialog(file);
-			return returnVal < 0 ? CANCEL : returnCodes[returnVal];
-		}	
-		
-		private int openDialog(final String file) {
-			final int[] result= { IDialogConstants.CANCEL_ID };
-			getShell().getDisplay().syncExec(new Runnable() {
-				public void run() {
-					String title= ExampleProjectMessages.getString("ExampleProjectCreationWizard.overwritequery.title"); //$NON-NLS-1$
-					String msg= ExampleProjectMessages.getFormattedString("ExampleProjectCreationWizard.overwritequery.message", file); //$NON-NLS-1$
-					String[] options= {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.CANCEL_LABEL};
-					MessageDialog dialog= new MessageDialog(getShell(), title, null, msg, MessageDialog.QUESTION, options, 0);
-					result[0]= dialog.open();
-				}
-			});
-			return result[0];
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-
-	}		
-}

diff --git a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationWizardPage.java b/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationWizardPage.java
deleted file mode 100644
index db536f3..0000000
--- a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectCreationWizardPage.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.exampleprojects;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.wizard.WizardPage;
-
-public class ExampleProjectCreationWizardPage extends WizardPage {
-
-	private IStatus fCurrStatus;
-	
-	private boolean fPageVisible;
-	
-	private IConfigurationElement fConfigurationElement;
-	
-	private String fNameLabel;
-	private String fProjectName;
-	
-	private Text fTextControl;
-	
-	public ExampleProjectCreationWizardPage(int pageNumber, IConfigurationElement elem) {
-		super("page" + pageNumber); //$NON-NLS-1$
-		fCurrStatus= createStatus(IStatus.OK, ""); //$NON-NLS-1$
-		
-		fConfigurationElement= elem;
-		
-		setTitle(getAttribute(elem, "pagetitle")); //$NON-NLS-1$
-		setDescription(getAttribute(elem, "pagedescription")); //$NON-NLS-1$
-		
-		fNameLabel= getAttribute(elem, "label"); //$NON-NLS-1$
-		fProjectName= getAttribute(elem, "name");		 //$NON-NLS-1$
-		
-	}
-	
-	private String getAttribute(IConfigurationElement elem, String tag) {
-		String res= elem.getAttribute(tag);
-		if (res == null) {
-			return '!' + tag + '!';
-		}
-		return res;
-	}
-	
-	/*
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite= new Composite(parent, SWT.NONE);
-		GridLayout gd= new GridLayout();
-		gd.numColumns= 2;
-		composite.setLayout(gd);
-		
-		Label label= new Label(composite, SWT.LEFT);
-		label.setText(fNameLabel);
-		label.setLayoutData(new GridData());
-		
-		fTextControl= new Text(composite, SWT.SINGLE | SWT.BORDER);
-		fTextControl.setText(fProjectName);
-		fTextControl.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (!fTextControl.isDisposed()) {
-					validateText(fTextControl.getText());
-				}
-			}
-		});
-		fTextControl.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		setControl(composite);
-		Dialog.applyDialogFont(composite);
-	}
-
-	private void validateText(String text) {
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IStatus status= workspace.validateName(text, IResource.PROJECT);
-		if (status.isOK()) {
-			if (workspace.getRoot().getProject(text).exists()) {
-				status= createStatus(IStatus.ERROR, ExampleProjectMessages.getString("ExampleProjectCreationWizardPage.error.alreadyexists")); //$NON-NLS-1$
-			}
-		}	
-		updateStatus(status);
-		
-		fProjectName= text;
-	}	
-	
-	
-	/*
-	 * @see WizardPage#becomesVisible
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		fPageVisible= visible;
-		// policy: wizards are not allowed to come up with an error message
-		if (visible && fCurrStatus.matches(IStatus.ERROR)) {
-			// keep the error state, but remove the message
-			fCurrStatus= createStatus(IStatus.ERROR, ""); //$NON-NLS-1$
-		} 
-		updateStatus(fCurrStatus);
-	}	
-
-	/**
-	 * Updates the status line and the ok button depending on the status
-	 */
-	private void updateStatus(IStatus status) {
-		fCurrStatus= status;
-		setPageComplete(!status.matches(IStatus.ERROR));
-		if (fPageVisible) {
-			applyToStatusLine(this, status);
-		}
-	}
-
-	/**
-	 * Applies the status to a dialog page
-	 */
-	private static void applyToStatusLine(DialogPage page, IStatus status) {
-		String errorMessage= null;
-		String warningMessage= null;
-		String statusMessage= status.getMessage();
-		if (statusMessage.length() > 0) {
-			if (status.matches(IStatus.ERROR)) {
-				errorMessage= statusMessage;
-			} else if (!status.isOK()) {
-				warningMessage= statusMessage;
-			}
-		}
-		page.setErrorMessage(errorMessage);
-		page.setMessage(warningMessage);
-	}
-	
-	
-	private static IStatus createStatus(int severity, String message) {
-		return new Status(severity, ExampleProjectsPlugin.getPluginId(), severity, message, null);
-	}
-	
-	/**
-	 * Returns the name entered by the user
-	 */
-	public String getName() {
-		return fProjectName;
-	}
-
-	/**
-	 * Returns the configuration element of this page.
-	 * @return Returns a IConfigurationElement
-	 */
-	public IConfigurationElement getConfigurationElement() {
-		return fConfigurationElement;
-	}
-
-}
-

diff --git a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectMessages.java b/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectMessages.java
deleted file mode 100644
index c5c4ced..0000000
--- a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectMessages.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.exampleprojects;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class ExampleProjectMessages {
-
-	private static final String RESOURCE_BUNDLE= ExampleProjectMessages.class.getName();
-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
-	private ExampleProjectMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return fgResourceBundle.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-	
-	/**
-	 * Gets a string from the resource bundle and formats it with the argument
-	 * 
-	 * @param key	the string used to get the bundle value, must not be null
-	 */
-	public static String getFormattedString(String key, Object arg) {
-		return MessageFormat.format(getString(key), new Object[] { arg });
-	}
-
-
-	/**
-	 * Gets a string from the resource bundle and formats it with arguments
-	 */	
-	public static String getFormattedString(String key, Object[] args) {
-		return MessageFormat.format(getString(key), args);
-	}
-
-
-}

diff --git a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectMessages.properties b/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectMessages.properties
deleted file mode 100644
index 6c571e3..0000000
--- a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectMessages.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-ExampleProjectCreationWizard.title=New
-ExampleProjectCreationWizard.op_error.title=Project Creation Failed
-ExampleProjectCreationWizard.op_error.message=Project could not be created.
-
-ExampleProjectCreationWizard.overwritequery.title=Overwrite
-ExampleProjectCreationWizard.overwritequery.message=Do you want to overwrite {0}?
-
-
-ExampleProjectCreationOperation.op_desc=Creating example projects...
-ExampleProjectCreationOperation.op_desc_proj=Configuring project...
-
-ExampleProjectCreationWizardPage.error.alreadyexists=Project already exists.

diff --git a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectsPlugin.java b/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectsPlugin.java
deleted file mode 100644
index 75b1d0d..0000000
--- a/org.eclipse.jdt.ui.examples.projects/examples/org/eclipse/jdt/internal/ui/exampleprojects/ExampleProjectsPlugin.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.exampleprojects;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ExampleProjectsPlugin extends AbstractUIPlugin {
-
-	// The shared instance.
-	private static ExampleProjectsPlugin fgPlugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public ExampleProjectsPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		fgPlugin= this;
-	}
-
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ExampleProjectsPlugin getDefault() {
-		return fgPlugin;
-	}
-	
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	public ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL url= new URL(getDescriptor().getInstallURL(), name);
-			return ImageDescriptor.createFromURL(url);
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}	
-	
-	public static String getPluginId() {
-		return getDefault().getDescriptor().getUniqueIdentifier();
-	}	
-
-
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-
-	public static void log(String message) {
-		log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, null));
-	}
-
-
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, "Internal Error", e)); //$NON-NLS-1$
-	}
-
-
-}

diff --git a/org.eclipse.jdt.ui.examples.projects/icons/full/dtool16/newjprjex_wiz.gif b/org.eclipse.jdt.ui.examples.projects/icons/full/dtool16/newjprjex_wiz.gif
deleted file mode 100644
index 532a7ef..0000000
--- a/org.eclipse.jdt.ui.examples.projects/icons/full/dtool16/newjprjex_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.projects/icons/full/etool16/newjprjex_wiz.gif b/org.eclipse.jdt.ui.examples.projects/icons/full/etool16/newjprjex_wiz.gif
deleted file mode 100644
index 1aa87cb..0000000
--- a/org.eclipse.jdt.ui.examples.projects/icons/full/etool16/newjprjex_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.projects/icons/full/wizban/newjprjex_wiz.gif b/org.eclipse.jdt.ui.examples.projects/icons/full/wizban/newjprjex_wiz.gif
deleted file mode 100644
index 06c0896..0000000
--- a/org.eclipse.jdt.ui.examples.projects/icons/full/wizban/newjprjex_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.examples.projects/plugin.properties b/org.eclipse.jdt.ui.examples.projects/plugin.properties
deleted file mode 100644
index dbd209f..0000000
--- a/org.eclipse.jdt.ui.examples.projects/plugin.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# --- string from plugin.xml ----
-
-pluginName=Java Development Tools Example Projects
-providerName=Eclipse.org
-
-JUnitProjectExampleCreationWizard.title=Example Project - JUnit
-JUnitProjectExampleCreationWizard.description=Create a new JUnit project
-
-JUnitProjectExampleCreationWizard.pagetitle=JUnit
-JUnitProjectExampleCreationWizard.pagedescription=Create a Java project containing the JUnit source
-JUnitProjectExampleCreationWizard.label=&Project Name:
-
-JUnitProjectExampleCreationWizard.categoryName=Java

diff --git a/org.eclipse.jdt.ui.examples.projects/plugin.xml b/org.eclipse.jdt.ui.examples.projects/plugin.xml
deleted file mode 100644
index 0434c45..0000000
--- a/org.eclipse.jdt.ui.examples.projects/plugin.xml
+++ /dev/null

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.ui.examples.projects"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.internal.ui.exampleprojects.ExampleProjectsPlugin">
-
-   <runtime>
-      <library name="jdtexamples.jar"/>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      
-   </requires>
-
-
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%JUnitProjectExampleCreationWizard.categoryName"
-            parentCategory="org.eclipse.ui.Examples"
-            id="org.eclipse.jdt.ui.java">
-      </category>
-      <wizard
-            banner="icons/full/wizban/newjprjex_wiz.gif"
-            name="%JUnitProjectExampleCreationWizard.title"
-            icon="icons/full/etool16/newjprjex_wiz.gif"
-            category="org.eclipse.ui.Examples/org.eclipse.jdt.ui.java"
-            class="org.eclipse.jdt.internal.ui.exampleprojects.ExampleProjectCreationWizard"
-            project="true"
-            finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-            id="org.eclipse.jdt.examples.projects.JUnitProjectExampleCreationWizard">
-         <description>
-            %JUnitProjectExampleCreationWizard.description
-         </description>
-         <projectsetup
-               pagetitle="%JUnitProjectExampleCreationWizard.pagetitle"
-               name="JUnit"
-               label="%JUnitProjectExampleCreationWizard.label"
-               pagedescription="%JUnitProjectExampleCreationWizard.pagedescription">
-            <nature
-                  id="org.eclipse.jdt.core.javanature">
-            </nature>
-            <import
-                  dest=""
-                  src="archive/junit/junit381src.jar">
-            </import>
-         </projectsetup>
-      </wizard>
-   </extension>
-
-</plugin>

diff --git a/org.eclipse.jdt.ui.examples.projects/scripts/exportplugin.xml b/org.eclipse.jdt.ui.examples.projects/scripts/exportplugin.xml
deleted file mode 100644
index efcfc8e..0000000
--- a/org.eclipse.jdt.ui.examples.projects/scripts/exportplugin.xml
+++ /dev/null

@@ -1,37 +0,0 @@
-<project name="org.eclipse.jdt.ui.examples.projects" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.jdt.ui.examples.projects" />
-		<property name="version"  value="_3.1.0" />
-		<property name="dest"  value="${destdir}/${plugin}${version}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<jar 
-			jarfile="${dest}/jdtexamples.jar"
-			basedir="bin"
-		/>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<copy todir="${dest}/icons">
-			<fileset dir="icons" />
-		</copy>
-			<copy todir="${dest}/archive">
-			<fileset dir="archive" />
-		</copy>
-			<copy todir="${dest}/doc-html">
-			<fileset dir="doc-html" />
-		</copy>
-		<zip zipfile="${dest}/jdtexamplessrc.zip">
-		    <fileset dir="examples" />
-  		</zip>				
-	</target>
-</project>

diff --git a/org.eclipse.jdt.ui.tests.refactoring/.classpath b/org.eclipse.jdt.ui.tests.refactoring/.classpath
deleted file mode 100644
index 447dc7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="test cases"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.ui.tests.refactoring/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/.project b/org.eclipse.jdt.ui.tests.refactoring/.project
deleted file mode 100644
index 185eda7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/.project
+++ /dev/null

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.ui.tests.refactoring</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.ui</project>
-		<project>org.eclipse.jdt.ui.tests</project>
-		<project>org.eclipse.jface.text</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.ide</project>
-		<project>org.eclipse.ui.workbench.texteditor</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.ui.tests.refactoring/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.ui.tests.refactoring/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f03173..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Wed Sep 01 12:06:36 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.jdt.ui.tests.refactoring/about.html b/org.eclipse.jdt.ui.tests.refactoring/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/build.properties b/org.eclipse.jdt.ui.tests.refactoring/build.properties
deleted file mode 100644
index b2d7aa8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/build.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
-               about.html,\
-               resources/,\
-               *.jar
-source.refactoringtests.jar = test cases/

diff --git a/org.eclipse.jdt.ui.tests.refactoring/plugin.properties b/org.eclipse.jdt.ui.tests.refactoring/plugin.properties
deleted file mode 100644
index cf0d116..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/plugin.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-Plugin.name= Refactoring Tests Pluging
-Plugin.providerName= Eclipse.org

diff --git a/org.eclipse.jdt.ui.tests.refactoring/plugin.xml b/org.eclipse.jdt.ui.tests.refactoring/plugin.xml
deleted file mode 100644
index ac7c439..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/plugin.xml
+++ /dev/null

@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.ui.tests.refactoring"
-   name="%Plugin.name"
-   version="3.1.0"
-   provider-name="%Plugin.providerName"
-   class="org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringTestPlugin">
-
-   <runtime>
-      <library name="refactoringtests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jdt.ui.tests"/>
-      <import plugin="org.eclipse.core.runtime.compatibility" optional="true"/>
-	  <import plugin="org.eclipse.ltk.core.refactoring"/>      
-	  <import plugin="org.eclipse.ltk.ui.refactoring"/>    
-	  <import plugin="org.eclipse.test.performance"/>    
-   </requires>
-   
-    <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-      <renameParticipant
-            class="org.eclipse.jdt.ui.tests.refactoring.TestRenameParticipantShared"
-            name="org.eclipse.jdt.ui.tests.refactoring.TestRenameParticipantShared"
-            id="org.eclipse.jdt.ui.tests.refactoring.TestRenameParticipantShared"> 
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-             <or>
-               <instanceof value="org.eclipse.core.resources.IResource"/>
-               <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-             </or>
-           </with>
-         </enablement>
-      </renameParticipant>
-      <renameParticipant
-            class="org.eclipse.jdt.ui.tests.refactoring.TestRenameParticipantSingle"
-            name="org.eclipse.jdt.ui.tests.refactoring.TestRenameParticipantSingle"
-            id="org.eclipse.jdt.ui.tests.refactoring.TestRenameParticipantSingle">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-             <or>
-               <instanceof value="org.eclipse.core.resources.IResource"/>
-               <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-             </or>
-           </with>
-         </enablement>
-      </renameParticipant>
-   </extension>
-   <extension point="org.eclipse.ltk.core.refactoring.moveParticipants">
-      <moveParticipant
-            class="org.eclipse.jdt.ui.tests.refactoring.TestMoveParticipantShared"
-            name="org.eclipse.jdt.ui.tests.refactoring.TestMoveParticipantShared"
-            id="org.eclipse.jdt.ui.tests.refactoring.TestMoveParticipantShared">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-             <or>
-               <instanceof value="org.eclipse.core.resources.IResource"/>
-               <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-             </or>
-           </with>
-         </enablement>
-      </moveParticipant>
-       <moveParticipant
-            class="org.eclipse.jdt.ui.tests.refactoring.TestMoveParticipantSingle"
-            name="org.eclipse.jdt.ui.tests.refactoring.TestMoveParticipantSingle"
-            id="org.eclipse.jdt.ui.tests.refactoring.TestMoveParticipantSingle">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-             <or>
-               <instanceof value="org.eclipse.core.resources.IResource"/>
-               <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-             </or>
-           </with>
-         </enablement>
-      </moveParticipant>
-   </extension>
-   <extension point="org.eclipse.ltk.core.refactoring.createParticipants">
-      <createParticipant
-            class="org.eclipse.jdt.ui.tests.refactoring.TestCreateParticipantShared"
-            name="org.eclipse.jdt.ui.tests.refactoring.TestCreateParticipantShared"
-            id="org.eclipse.jdt.ui.tests.refactoring.TestCreateParticipantShared">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-             <or>
-               <instanceof value="org.eclipse.core.resources.IResource"/>
-               <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-             </or>
-           </with>
-         </enablement>
-      </createParticipant>
-      <createParticipant
-            class="org.eclipse.jdt.ui.tests.refactoring.TestCreateParticipantSingle"
-            name="org.eclipse.jdt.ui.tests.refactoring.TestCreateParticipantSingle"
-            id="org.eclipse.jdt.ui.tests.refactoring.TestCreateParticipantSingle">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-             <or>
-               <instanceof value="org.eclipse.core.resources.IResource"/>
-               <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-             </or>
-           </with>
-         </enablement>
-      </createParticipant>
-   </extension>
-   <extension point="org.eclipse.ltk.core.refactoring.deleteParticipants">
-      <deleteParticipant
-            class="org.eclipse.jdt.ui.tests.refactoring.TestDeleteParticipantShared"
-            name="org.eclipse.jdt.ui.tests.refactoring.TestDeleteParticipantShared"
-            id="org.eclipse.jdt.ui.tests.refactoring.TestDeleteParticipantShared">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-             <or>
-               <instanceof value="org.eclipse.core.resources.IResource"/>
-               <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-             </or>
-           </with>
-         </enablement>
-      </deleteParticipant>
-       <deleteParticipant
-            class="org.eclipse.jdt.ui.tests.refactoring.TestDeleteParticipantSingle"
-            name="org.eclipse.jdt.ui.tests.refactoring.TestDeleteParticipantSingle"
-            id="org.eclipse.jdt.ui.tests.refactoring.TestDeleteParticipantSingle">
-         <enablement>
-           <with variable="affectedNatures">
-             <iterate operator="or">
-               <equals value="org.eclipse.jdt.core.javanature"/>
-             </iterate>
-           </with>
-           <with variable="element">
-             <or>
-               <instanceof value="org.eclipse.core.resources.IResource"/>
-               <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
-             </or>
-           </with>
-         </enablement>
-      </deleteParticipant>
-   </extension>
-   
-</plugin>

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test0_in.java
deleted file mode 100644
index 0a37955..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test0_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class A{

-	private int f;

-	void m(){

-		int g= f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test0_out.java
deleted file mode 100644
index 2c46008..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test0_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-class A{

-	private int f;

-	void m(){

-		int g= getF();

-	}

-	private int getF(){

-		return f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test1_in.java
deleted file mode 100644
index b00dd07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test1_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class A{

-	private int f;

-	void m(){

-		f= 3;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test1_out.java
deleted file mode 100644
index f166768..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test1_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-class A{

-	private int f;

-	void m(){

-		setF(3);

-	}

-	private void setF(int f){

-		this.f= f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test2_in.java
deleted file mode 100644
index a0f3096..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test2_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//abstract and make private

-package p;

-class A{

-	public int f;

-	void m(){

-		int g= f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test2_out.java
deleted file mode 100644
index 3ec4bc3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test2_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//abstract and make private

-package p;

-class A{

-	private int f;

-	void m(){

-		int g= f;

-	}

-	public int getF(){

-		return f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test3_in.java
deleted file mode 100644
index 08a9cad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test3_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//abstract and make private

-package p;

-class A{

-	public int f;

-	void m(){

-		int g= f;

-	}

-}

-class B{

-	int m(){

-		A a= new A();

-		return a.f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test3_out.java
deleted file mode 100644
index ce9a78a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test3_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//abstract and make private

-package p;

-class A{

-	private int f;

-	void m(){

-		int g= getF();

-	}

-	public int getF(){

-		return f;

-	}

-}

-class B{

-	int m(){

-		A a= new A();

-		return a.getF();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test4_in.java
deleted file mode 100644
index af410b1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test4_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//abstract and make private (do not abstract private accesses)

-package p;

-class A{

-	public int f;

-	void m(){

-		int g= f;

-	}

-}

-class B{

-	int m(){

-		A a= new A();

-		return a.f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test4_out.java
deleted file mode 100644
index 8ccdfa3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test4_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//abstract and make private (do not abstract private accesses)

-package p;

-class A{

-	private int f;

-	void m(){

-		int g= f;

-	}

-	public int getF(){

-		return f;

-	}

-}

-class B{

-	int m(){

-		A a= new A();

-		return a.getF();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test5_in.java
deleted file mode 100644
index 603871f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test5_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//abstract and make private

-package p;

-class A{

-	public int f;

-	void m(){

-		f= f;

-	}

-}

-class B{

-	int m(){

-		A a= new A();

-		a.f= a.f;

-		return a.f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test5_out.java
deleted file mode 100644
index 65c7709..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/can/A_test5_out.java
+++ /dev/null

@@ -1,21 +0,0 @@
-//abstract and make private

-package p;

-class A{

-	private int f;

-	void m(){

-		setF(getF());

-	}

-	public int getF(){

-		return f;

-	}

-	public void setF(int f){

-		this.f= f;

-	}

-}

-class B{

-	int m(){

-		A a= new A();

-		a.setF(a.getF());

-		return a.getF();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/cannot/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/cannot/A_testFail0.java
deleted file mode 100644
index 308c8bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AbstractField/cannot/A_testFail0.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//abstract and make private, only getter

-package p;

-class A{

-	public int f;

-	void m(){

-		f= f;

-	}

-}

-class B{

-	int m(){

-		A a= new A();

-		a.f= a.f;

-		return a.f;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu1/in/A.java
deleted file mode 100644
index cf08e44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu1/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class A {
-	void foo() {
-		List l= new ArrayList();
-		l.add(new String());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu1/out/A.java
deleted file mode 100644
index 909aff4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu1/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class A {
-	void foo() {
-		List<String> l= new ArrayList<String>();
-		l.add(new String());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu2/in/A.java
deleted file mode 100644
index 7f0337f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu2/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.AbstractList;
-
-class A {
-	void foo() {
-		AbstractList l= new ArrayList();
-		l.add(new String());
-		l.add("");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu2/out/A.java
deleted file mode 100644
index d6d3f2f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu2/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.AbstractList;
-
-class A {
-	void foo() {
-		AbstractList<String> l= new ArrayList<String>();
-		l.add(new String());
-		l.add("");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu3/in/A.java
deleted file mode 100644
index bbe0463..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu3/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
-
-class A {
-	void foo() {
-		AbstractList l= new ArrayList();
-		List list= l;
-		list.add("Eclipse");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu3/out/A.java
deleted file mode 100644
index b01ac1e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/AugmentRawContainerClients/testCu3/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
-
-class A {
-	void foo() {
-		AbstractList<String> l= new ArrayList<String>();
-		List<String> list= l;
-		list.add("Eclipse");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test0_in.java
deleted file mode 100644
index 95a0fe5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test0_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private void m(int i, int j){
-	}
-	private void foo(){
-		m(1, 2);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test0_out.java
deleted file mode 100644
index 6b86b75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test0_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private void m(int j, int i){
-	}
-	private void foo(){
-		m(2, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test10_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test10_in.java
deleted file mode 100644
index 996a053..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test10_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to j k i
-package p;
-class A{
-	private void m(int i, int j, int k){
-	}
-	private void foo(){
-		m(1, 2, 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test10_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test10_out.java
deleted file mode 100644
index d050502..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test10_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to j k i
-package p;
-class A{
-	private void m(int j, int k, int i){
-	}
-	private void foo(){
-		m(2, 3, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test11_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test11_in.java
deleted file mode 100644
index 361a676..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test11_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//change to j k i
-package p;
-class A{
-	private void m(int i, int j, int k){
-	}
-	private void foo(){
-		m(3+ 1, 
-			2, 
-				3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test11_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test11_out.java
deleted file mode 100644
index 6abf7f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test11_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//change to j k i
-package p;
-class A{
-	private void m(int j, int k, int i){
-	}
-	private void foo(){
-		m(2, 
-			3, 
-				3+ 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test12_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test12_in.java
deleted file mode 100644
index f1d6726..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test12_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//change to j k i
-package p;
-class A{
-	private void m(int i, int j, int k){
-	}
-	private void foo(){
-		m(19, 
-			/*comment*/2000, 
-				3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test12_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test12_out.java
deleted file mode 100644
index 2cc1236..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test12_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//change to j k i
-package p;
-class A{
-	private void m(int j, int k, int i){
-	}
-	private void foo(){
-		m(/*comment*/2000, 
-			3, 
-				19);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test13_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test13_in.java
deleted file mode 100644
index 963f2ea..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test13_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//change to j k i
-package p;
-class A{
-	private void m(int i, int j, int k){
-	}
-	private void foo(){
-		m(19, 
-			/*comment*/2000, 
-				3/*comment2*/);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test13_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test13_out.java
deleted file mode 100644
index 3a83012..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test13_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//change to j k i
-package p;
-class A{
-	private void m(int j, int k, int i){
-	}
-	private void foo(){
-		m(/*comment*/2000, 
-			3/*comment2*/, 
-				19);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test14_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test14_in.java
deleted file mode 100644
index b3beea3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test14_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private int m(int i, int j){
-		return m(m(1, 2), 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test14_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test14_out.java
deleted file mode 100644
index 1d856cc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test14_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private int m(int j, int i){
-		return m(3, m(2, 1));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test15_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test15_in.java
deleted file mode 100644
index 6c68ffb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test15_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private void m(int i, boolean b){
-	}
-	private void foo(){
-		m(2, true);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test15_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test15_out.java
deleted file mode 100644
index a1aee28..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test15_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private void m(boolean b, int i){
-	}
-	private void foo(){
-		m(true, 2);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test16_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test16_in.java
deleted file mode 100644
index bd03d2f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test16_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-class A{
-	protected void m(int i, boolean b){
-	}
-	private void foo(){
-		m(2, true);
-	}
-}
-class B extends A{
-	protected void m(int j, boolean b){
-		m(6, false);
-		super.m(4, true);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test16_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test16_out.java
deleted file mode 100644
index ca0a136..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test16_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-class A{
-	protected void m(boolean b, int i){
-	}
-	private void foo(){
-		m(true, 2);
-	}
-}
-class B extends A{
-	protected void m(boolean b, int j){
-		m(false, 6);
-		super.m(true, 4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test17_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test17_in.java
deleted file mode 100644
index 8515e6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test17_in.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-class A1 implements A{
-	public void m(int i, boolean b){
-	}
-	private void foo(){
-		m(2, true);
-	}
-}
-class B extends A1{
-	public void m(int j, boolean b){
-		m(6, false);
-		super.m(4, true);
-	}
-}
-interface A {
-	public void m(int i, boolean b);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test17_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test17_out.java
deleted file mode 100644
index f86e232..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test17_out.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-class A1 implements A{
-	public void m(boolean b, int i){
-	}
-	private void foo(){
-		m(true, 2);
-	}
-}
-class B extends A1{
-	public void m(boolean b, int j){
-		m(false, 6);
-		super.m(true, 4);
-	}
-}
-interface A {
-	public void m(boolean b, int i);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test18_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test18_in.java
deleted file mode 100644
index 38c7930..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test18_in.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-class A1 implements A{
-	public void m(int i, boolean b){
-	}
-	private void foo(){
-		m(2, true);
-	}
-}
-class B extends A1 implements AA{
-	public void m(int j, boolean b){
-		m(6, false);
-		super.m(4, true);
-	}
-}
-interface A {
-	public void m(int i, boolean b);
-}
-interface AA {
-	public void m(int xxx, boolean yyy);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test18_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test18_out.java
deleted file mode 100644
index 5118484..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test18_out.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-class A1 implements A{
-	public void m(boolean b, int i){
-	}
-	private void foo(){
-		m(true, 2);
-	}
-}
-class B extends A1 implements AA{
-	public void m(boolean b, int j){
-		m(false, 6);
-		super.m(true, 4);
-	}
-}
-interface A {
-	public void m(boolean b, int i);
-}
-interface AA {
-	public void m(boolean yyy, int xxx);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test19_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test19_in.java
deleted file mode 100644
index 204f3ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test19_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A {
-	public void m(int i, final boolean b){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test19_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test19_out.java
deleted file mode 100644
index 1db9fb4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test19_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A {
-	public void m(final boolean b, int i){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test1_in.java
deleted file mode 100644
index 014a77c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test1_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	private void m(int i, int j){
-	}
-	private void foo(){
-		m(1,
-		2);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test1_out.java
deleted file mode 100644
index a94f00c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test1_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	private void m(int j, int i){
-	}
-	private void foo(){
-		m(2,
-		1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test20_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test20_in.java
deleted file mode 100644
index 73a860d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test20_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A {
-	void m(int a, int b[]){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test20_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test20_out.java
deleted file mode 100644
index 7966618..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test20_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A {
-	void m(int b[], int a){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test21_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test21_in.java
deleted file mode 100644
index 57f3cf7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test21_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A {
-	A(int a, int b){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test21_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test21_out.java
deleted file mode 100644
index 8e163ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test21_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A {
-	A(int b, int a){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test22_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test22_in.java
deleted file mode 100644
index 5973c82..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test22_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	A(int a, int b){}
-	A(){
-		this(3, 2);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test22_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test22_out.java
deleted file mode 100644
index 27b8cd4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test22_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	A(int b, int a){}
-	A(){
-		this(2, 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test23_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test23_in.java
deleted file mode 100644
index 9f19fe6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test23_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	A(int a, int b){}
-}
-class B extends A{
-	B(){
-		super(4, 6);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test23_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test23_out.java
deleted file mode 100644
index 0238f01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test23_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	A(int b, int a){}
-}
-class B extends A{
-	B(){
-		super(6, 4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test24_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test24_in.java
deleted file mode 100644
index 60bcb15..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test24_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	A(int a, int b){}
-	
-	void f(){
-		new A(1, 4){
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test24_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test24_out.java
deleted file mode 100644
index c1f8b6e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test24_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	A(int b, int a){}
-	
-	void f(){
-		new A(4, 1){
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test25_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test25_in.java
deleted file mode 100644
index b55e8ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test25_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class Outer{
-	class A {
-		A(int a, int b){}
-	}
-}	
-class Outer2 extends Outer.A{
-	Outer2(){
-		new Outer().super(4, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test25_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test25_out.java
deleted file mode 100644
index f0db900..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test25_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class Outer{
-	class A {
-		A(int b, int a){}
-	}
-}	
-class Outer2 extends Outer.A{
-	Outer2(){
-		new Outer().super(1, 4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test26_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test26_in.java
deleted file mode 100644
index a3467df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test26_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	A(int a, int b){}
-	
-	void f(){
-		new A(1, 4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test26_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test26_out.java
deleted file mode 100644
index 14b9c22..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test26_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	A(int b, int a){}
-	
-	void f(){
-		new A(4, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test2_in.java
deleted file mode 100644
index fe19e39..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test2_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private void m(int i, int j){
-		m(i, j);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test2_out.java
deleted file mode 100644
index 083b2b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test2_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private void m(int j, int i){
-		m(j, i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test3_in.java
deleted file mode 100644
index 4d7f0c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test3_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private void m(
-	 int i,
-	 int j){
-		m(i, j);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test3_out.java
deleted file mode 100644
index 9822034..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test3_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private void m(
-	 int j,
-	 int i){
-		m(j, i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test4_in.java
deleted file mode 100644
index 50b1283..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test4_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private int m(
-	 int i,
-	 int j){
-		return m(m(i, j), 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test4_out.java
deleted file mode 100644
index e37883a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test4_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private int m(
-	 int j,
-	 int i){
-		return m(1, m(j, i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test5_in.java
deleted file mode 100644
index 891cabe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test5_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private void m(
-	 int i,
-	 int j){
-		m(i, 1 + 2);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test5_out.java
deleted file mode 100644
index 5d1b0bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test5_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private void m(
-	 int j,
-	 int i){
-		m(1 + 2, i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test6_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test6_in.java
deleted file mode 100644
index 02bf8cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test6_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to k i j
-package p;
-class A{
-	private void m(int i, int j, int k){
-	}
-	private void foo(){
-		m(1, 2, 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test6_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test6_out.java
deleted file mode 100644
index 14f2b69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test6_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to k i j
-package p;
-class A{
-	private void m(int k, int i, int j){
-	}
-	private void foo(){
-		m(3, 1, 2);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test7_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test7_in.java
deleted file mode 100644
index 35017b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test7_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to i k j 
-package p;
-class A{
-	private void m(int i, int j, int k){
-	}
-	private void foo(){
-		m(1, 2, 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test7_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test7_out.java
deleted file mode 100644
index 76e96b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test7_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to i k j 
-package p;
-class A{
-	private void m(int i, int k, int j){
-	}
-	private void foo(){
-		m(1, 3, 2);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test8_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test8_in.java
deleted file mode 100644
index 4038ea3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test8_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to k j i 
-package p;
-class A{
-	private void m(int i, int j, int k){
-	}
-	private void foo(){
-		m(1, 2, 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test8_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test8_out.java
deleted file mode 100644
index 2bf338b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test8_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to k j i 
-package p;
-class A{
-	private void m(int k, int j, int i){
-	}
-	private void foo(){
-		m(3, 2, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test9_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test9_in.java
deleted file mode 100644
index 2234f30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test9_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to j i k
-package p;
-class A{
-	private void m(int i, int j, int k){
-	}
-	private void foo(){
-		m(1, 2, 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test9_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test9_out.java
deleted file mode 100644
index 20fac3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_test9_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change to j i k
-package p;
-class A{
-	private void m(int j, int i, int k){
-	}
-	private void foo(){
-		m(2, 1, 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd28_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd28_in.java
deleted file mode 100644
index dbda6a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd28_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private void m(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd28_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd28_out.java
deleted file mode 100644
index 888d1b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd28_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private void m(int i, int x){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd29_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd29_in.java
deleted file mode 100644
index dbda6a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd29_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private void m(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd29_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd29_out.java
deleted file mode 100644
index ed5f756..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd29_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private void m(int x, int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd30_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd30_in.java
deleted file mode 100644
index ab989d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd30_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private void m(int i){
-		m(i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd30_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd30_out.java
deleted file mode 100644
index da6fa61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd30_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private void m(int i, int x){
-		m(i, x);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd31_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd31_in.java
deleted file mode 100644
index 203fe15..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd31_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		m(i);
-	}
-}
-class B extends A{
-	void m(int j){
-		super.m(j);
-		this.m(j);
-		m(j);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd31_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd31_out.java
deleted file mode 100644
index 5a50e62..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd31_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	void m(int i, int x){
-		m(i, x);
-	}
-}
-class B extends A{
-	void m(int j, int x){
-		super.m(j, x);
-		this.m(j, x);
-		m(j, x);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd32_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd32_in.java
deleted file mode 100644
index ab989d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd32_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private void m(int i){
-		m(i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd32_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd32_out.java
deleted file mode 100644
index 412db60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd32_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private void m(int x, int i){
-		m(x, i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd33_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd33_in.java
deleted file mode 100644
index ca119d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd33_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private void m(){
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd33_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd33_out.java
deleted file mode 100644
index ba5e604..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAdd33_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private void m(int x){
-		m(x);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddRecursive1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddRecursive1_in.java
deleted file mode 100644
index c80f69d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddRecursive1_in.java
+++ /dev/null

@@ -1,33 +0,0 @@
-package p;
-
-class A {
-	int i;
-	void m(int i) {this.i = i;}
-}
-class Super extends A {
-	void m(int i) { super.m(1); }
-}
-class Recursive extends A {
-	void m(int i) { if (true) m(i); }
-}
-class ThisRecursive extends A {
-	void m(int i) { this.m(i); }
-}
-class AlmostRecursive extends A {
-	void m(int i) { new A().m(i); }
-}
-class RecursiveOrNot extends A {
-	void m(int i) { new RecursiveOrNot().m(i); }
-}
-class NonRecursive extends A {
-	void m(int i) { int k= i; }
-}
-class Calling extends A {
-	void bar() { m(17); }
-}
-class Calling2 {
-	void bar() { new A().m(17); }
-}
-class Calling3 {
-	void bar() { new Recursive().m(17); }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddRecursive1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddRecursive1_out.java
deleted file mode 100644
index a8d3648..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddRecursive1_out.java
+++ /dev/null

@@ -1,33 +0,0 @@
-package p;
-
-class A {
-	int i;
-	void m(int i, boolean bool) {this.i = i;}
-}
-class Super extends A {
-	void m(int i, boolean bool) { super.m(1, bool); }
-}
-class Recursive extends A {
-	void m(int i, boolean bool) { if (true) m(i, bool); }
-}
-class ThisRecursive extends A {
-	void m(int i, boolean bool) { this.m(i, bool); }
-}
-class AlmostRecursive extends A {
-	void m(int i, boolean bool) { new A().m(i, true); }
-}
-class RecursiveOrNot extends A {
-	void m(int i, boolean bool) { new RecursiveOrNot().m(i, bool); }
-}
-class NonRecursive extends A {
-	void m(int i, boolean bool) { int k= i; }
-}
-class Calling extends A {
-	void bar() { m(17, true); }
-}
-class Calling2 {
-	void bar() { new A().m(17, true); }
-}
-class Calling3 {
-	void bar() { new Recursive().m(17, true); }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddReorderRename34_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddReorderRename34_in.java
deleted file mode 100644
index dd3f8c2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddReorderRename34_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddReorderRename34_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddReorderRename34_out.java
deleted file mode 100644
index e85b749..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAddReorderRename34_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	private int m(boolean jj, Object x, int i){
-		return m(false, x, m(jj, x, i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll35_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll35_in.java
deleted file mode 100644
index 2a9c8b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll35_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//only visibility change - to public
-class A{
-	private int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll35_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll35_out.java
deleted file mode 100644
index cc2fa7b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll35_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//only visibility change - to public
-class A{
-	public int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll36_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll36_in.java
deleted file mode 100644
index 7ee41c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll36_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//only visibility change - to private
-class A{
-	public int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll36_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll36_out.java
deleted file mode 100644
index 2ef5a29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll36_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//only visibility change - to private
-class A{
-	private int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll37_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll37_in.java
deleted file mode 100644
index a847439..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll37_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//to protected
-class A{
-	public int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
-class B extends A{
-	public int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll37_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll37_out.java
deleted file mode 100644
index df49d85..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll37_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//to protected
-class A{
-	protected int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
-class B extends A{
-	protected int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll38_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll38_in.java
deleted file mode 100644
index 1fb09e8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll38_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//to protected
-class A{
-	int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
-class B extends A{
-	public int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll38_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll38_out.java
deleted file mode 100644
index 00f60b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll38_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//to protected
-class A{
-	protected int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
-class B extends A{
-	public int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll39_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll39_in.java
deleted file mode 100644
index f4e0509..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll39_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//to public
-class A{
-	protected int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
-class B extends A{
-	protected int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll39_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll39_out.java
deleted file mode 100644
index 2f3c016..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll39_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//to public
-class A{
-	public int m(boolean jj, Object x, int i){
-		return m(false, x, m(jj, x, i));
-	}
-}
-class B extends A{
-	public int m(boolean jj, Object x, int i){
-		return m(false, x, m(jj, x, i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll40_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll40_in.java
deleted file mode 100644
index f4e0509..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll40_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//to public
-class A{
-	protected int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
-class B extends A{
-	protected int m(int iii, boolean j){
-		return m(m(iii, j), false);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll40_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll40_out.java
deleted file mode 100644
index 33960fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll40_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//to public
-class A{
-	public int m(boolean jj, int[] x, int i){
-		return m(false, x, m(jj, x, i));
-	}
-}
-class B extends A{
-	public int m(boolean jj, int[] x, int i){
-		return m(false, x, m(jj, x, i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll41_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll41_in.java
deleted file mode 100644
index 1b30b89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll41_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		m(0);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll41_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll41_out.java
deleted file mode 100644
index a3476d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll41_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll42_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll42_in.java
deleted file mode 100644
index 1b30b89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll42_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		m(0);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll42_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll42_out.java
deleted file mode 100644
index 6935d8c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll42_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		m(i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll43_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll43_in.java
deleted file mode 100644
index 9e42322..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll43_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i, int j){
-		m(0, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll43_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll43_out.java
deleted file mode 100644
index 52fa429..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll43_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int j){
-		m(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll44_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll44_in.java
deleted file mode 100644
index 9e42322..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll44_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i, int j){
-		m(0, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll44_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll44_out.java
deleted file mode 100644
index cf2d976..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll44_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	boolean m(int j){
-		m(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll45_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll45_in.java
deleted file mode 100644
index 9e42322..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll45_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i, int j){
-		m(0, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll45_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll45_out.java
deleted file mode 100644
index 21828dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll45_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(boolean j){
-		m(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll46_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll46_in.java
deleted file mode 100644
index 8a28c5e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll46_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	A(){
-	}
-	void f(){
-		new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll46_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll46_out.java
deleted file mode 100644
index 00fbc25..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll46_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	A(int i){
-	}
-	void f(){
-		new A(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll47_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll47_in.java
deleted file mode 100644
index 9badbb3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll47_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	A(){
-	}
-	void f(){
-		new A(){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll47_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll47_out.java
deleted file mode 100644
index 3d941b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll47_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	A(int i){
-	}
-	void f(){
-		new A(1){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll48_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll48_in.java
deleted file mode 100644
index 51c75de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll48_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	A(){
-	}
-}
-class B extends A{
-	B(){
-		super();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll48_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll48_out.java
deleted file mode 100644
index a475abd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll48_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	A(int i){
-	}
-}
-class B extends A{
-	B(){
-		super(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll49_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll49_in.java
deleted file mode 100644
index cac6cfd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll49_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	A(){
-	}
-}
-class B extends A{
-	B(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll49_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll49_out.java
deleted file mode 100644
index a475abd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll49_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	A(int i){
-	}
-}
-class B extends A{
-	B(){
-		super(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll50_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll50_in.java
deleted file mode 100644
index be34b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll50_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	A(){
-	}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll50_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll50_out.java
deleted file mode 100644
index acbf6d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll50_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	A(int i){
-	}
-}
-class B extends A{
-
-	B() {
-		super(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll51_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll51_in.java
deleted file mode 100644
index 2d95523..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll51_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class F{
-	class A{
-		A(){
-		}
-	}
-}
-class X extends F.A{
-	X(){
-		new F().super();
-		new F().new A();
-		new F().new A(){};
-		new F(){}.new A(){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll51_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll51_out.java
deleted file mode 100644
index 8e1711c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll51_out.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class F{
-	class A{
-		A(int i){
-		}
-	}
-}
-class X extends F.A{
-	X(){
-		new F().super(1);
-		new F().new A(1);
-		new F().new A(1){};
-		new F(){}.new A(1){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll52_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll52_in.java
deleted file mode 100644
index c3d7a1e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll52_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	A(){
-	}
-}
-class B extends A{
-	B(){
-		this(3);
-	}
-	B(int y){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll52_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll52_out.java
deleted file mode 100644
index 0189181..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll52_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	A(int i){
-	}
-}
-class B extends A{
-	B(){
-		this(3);
-	}
-	B(int y){
-		super(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll53_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll53_in.java
deleted file mode 100644
index c449e33..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll53_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//change type of a to HashSet
-package p;
-
-class A {
-	void m(int a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll53_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll53_out.java
deleted file mode 100644
index 343f333..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll53_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change type of a to HashSet
-package p;
-
-import java.util.HashSet;
-
-class A {
-	void m(HashSet a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll54_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll54_in.java
deleted file mode 100644
index 6978f8f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll54_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change type of a to List
-package p;
-
-import java.util.List;
-
-class A {
-	void m(int a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll54_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll54_out.java
deleted file mode 100644
index a5d24a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll54_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//change type of a to List
-package p;
-
-import java.util.List;
-
-class A {
-	void m(List a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll55_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll55_in.java
deleted file mode 100644
index 9752d75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll55_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;//add boolean e before d
-
-class A {
-	public void m(Object[] b, int c, boolean d) {
-		m(new Object[] { }, Integer.MAX_VALUE, false);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll55_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll55_out.java
deleted file mode 100644
index 2a387e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll55_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;//add boolean e before d
-
-class A {
-	public void m(Object[] b, int c, boolean e, boolean d) {
-		m(new Object[] { }, Integer.MAX_VALUE, e, false);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll56_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll56_in.java
deleted file mode 100644
index 08690e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll56_in.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p; //remove 'part'
-
-import java.util.Vector;
-
-class HistoryFrame extends Vector {
-
-	public HistoryFrame(EvaViewPart part, int title) {
-
-		super(title);
-
-	}
-}
-class EvaViewPart {
-
-	private void showJFreeChartFrame() {
-		HistoryFrame frame= new HistoryFrame(this, 5);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll56_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll56_out.java
deleted file mode 100644
index b051dd7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll56_out.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p; //remove 'part'
-
-import java.util.Vector;
-
-class HistoryFrame extends Vector {
-
-	public HistoryFrame(int title) {
-
-		super(title);
-
-	}
-}
-class EvaViewPart {
-
-	private void showJFreeChartFrame() {
-		HistoryFrame frame= new HistoryFrame(5);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll57_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll57_in.java
deleted file mode 100644
index 745c608..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll57_in.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p; //swap hello and goodbye
-
-class TEST
-{
-   public interface X
-   {
-	  public void method(final int i, String hello, final String goodbye);
-   }
-   
-   private static X x = new X()
-	{
-	   public void method(final int i, String hello, final String goodbye)
-	   {
-		  System.err.println(hello + goodbye);
-	   }
-	};
-   
-   public static void main(String[] args)
-   {
-	  x.method(1, "hello", "goodbye");
-   }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll57_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll57_out.java
deleted file mode 100644
index c7202fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll57_out.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p; //swap hello and goodbye
-
-class TEST
-{
-   public interface X
-   {
-	  public void method(final int i, final String goodbye, String hello);
-   }
-   
-   private static X x = new X()
-	{
-	   public void method(final int i, final String goodbye, String hello)
-	   {
-		  System.err.println(hello + goodbye);
-	   }
-	};
-   
-   public static void main(String[] args)
-   {
-	  x.method(1, "goodbye", "hello");
-   }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll58_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll58_in.java
deleted file mode 100644
index 8c8c4bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll58_in.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-
-abstract class A {
-	/**
-	 * @param a an a
-	 * @param b bee
-	 * @return the number
-	 * @see #m(int, String[][][])
-	 */
-	public abstract int m(int a, String[] b[][]);
-}
-class B extends A {
-	public int m(int number, String[] b[][]) {
-		return number + 0;
-	}
-}
-class C extends B {
-	/**
-	 * @param a an a
-	 * @param b bee
-	 */
-	public int m(int a, String[] strings[][]) {
-		return a + 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll58_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll58_out.java
deleted file mode 100644
index 4b6ae9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll58_out.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-
-abstract class A {
-	/**
-	 * @param bbb bee
-	 * @param abb an a
-	 * @return the number
-	 * @see #m(String[][][], int)
-	 */
-	public abstract int m(String[] bbb[][], int abb);
-}
-class B extends A {
-	public int m(String[] bbb[][], int number) {
-		return number + 0;
-	}
-}
-class C extends B {
-	/**
-	 * @param bbb bee
-	 * @param abb an a
-	 */
-	public int m(String[] strings[][], int abb) {
-		return abb + 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll59_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll59_in.java
deleted file mode 100644
index 9747b21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll59_in.java
+++ /dev/null

@@ -1,36 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	/**
-	 * @param from 1st param of {@link A#getList(int, long) me}
-	 * @see getList
-	 * @see #getList(int, long)
-	 * @see #getList(int from, tho long)
-	 * @see #getList(int from, long tho)
-	 * @param to
-	 * @return list
-	 * @param bogus{@link #getList}
-	 */
-	public ArrayList getList(int from, long to) {
-		return new ArrayList((int)to-from);
-	}
-	
-	/** start here
-	 * Doesn't call {@linkplain #getList(int, long)}
-	 *
-	 * @see getList
-	 * @see #getList
-	 * @see A#getList(int, long)
-	 * @see A#getList(int, long, Object[][])
-	 * @see A#getList (
-	 *   int fro,long tho
-	 * )
-	 * @see #getList(..)
-	 * @see p.A#getList(int, int, boolean)
-	 * @see <a href="spec.html#section">Java Spec</a>
-	 * @see A# getList(int, long)
-	 */
-	public ArrayList getList(int from, long to, Object[] arr[]) {
-		return new ArrayList(Arrays.asList(arr).subList(from, (int)to));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll59_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll59_out.java
deleted file mode 100644
index 5199db0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll59_out.java
+++ /dev/null

@@ -1,37 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	/**
-	 * @param really TODO
-	 * @param f 1st param of {@link A#getList(boolean, int, char) me}
-	 * @param t
-	 * @param bogus{@link #getList}
-	 * @see getList
-	 * @see #getList(boolean, int, char)
-	 * @see #getList(int from, tho long)
-	 * @see #getList(boolean really, int f, char t)
-	 * @return list
-	 */
-	public List getList(boolean really, int f, char t) {
-		return new ArrayList((int)t-f);
-	}
-	
-	/** start here
-	 * Doesn't call {@linkplain #getList(boolean, int, char)}
-	 *
-	 * @see getList
-	 * @see #getList
-	 * @see A#getList(boolean, int, char)
-	 * @see A#getList(int, long, Object[][])
-	 * @see A#getList (
-	 *   boolean really,int f, char t
-	 * )
-	 * @see #getList(..)
-	 * @see p.A#getList(int, int, boolean)
-	 * @see <a href="spec.html#section">Java Spec</a>
-	 * @see A# getList(boolean, int, char)
-	 */
-	public ArrayList getList(int from, long to, Object[] arr[]) {
-		return new ArrayList(Arrays.asList(arr).subList(from, (int)to));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll60_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll60_in.java
deleted file mode 100644
index 1975343..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll60_in.java
+++ /dev/null

@@ -1,44 +0,0 @@
-package p;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-
-class A {
-	/**
-	 * @param to {@link #getList}
-	 * @version throwaway
-	 * @param from 1st param of {@link A#getList(int, long) me}
-	 * @see #getList(int, long)
-	 * @param from 2nd
-	 * @see #getList(int from, long tho)
-	 * @param to
-	 * @throws java.io.IOException
-	 * @return the list
-	 * @throws IOException
-	 */
-	public ArrayList getList(int from, long to) throws IOException {
-		//change to: java.util.List getList(long tho, List l, int to) throws Exception
-		// (swap parameters, insert new in between, change return type, change Ex.)
-		return new ArrayList((int)to-from);
-	}
-}
-
-interface I {
-	public ArrayList getList(int from, long to) throws java.io.IOException;
-}
-
-interface J {
-	/** Doc: @param t t */
-	public ArrayList getList(int f, long t) throws FileNotFoundException;
-}
-
-class B extends A implements I, J {
-	/**
-	 * @return {@inheritDoc} 
-	 * @see p.A#getList(int, long)
-	 */
-	public ArrayList getList(int from, long to) throws FileNotFoundException {
-		return new ArrayList() {};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll60_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll60_out.java
deleted file mode 100644
index 7665801..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll60_out.java
+++ /dev/null

@@ -1,46 +0,0 @@
-package p;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-
-class A {
-	/**
-	 * @param tho {@link #getList}
-	 * @param tho
-	 * @param l TODO
-	 * @param to 1st param of {@link A#getList(long, List, int) me}
-	 * @param to 2nd
-	 * @version throwaway
-	 * @throws Exception TODO
-	 * @see #getList(long, List, int)
-	 * @see #getList(long tho, List l, int to)
-	 * @return the list
-	 */
-	public List getList(long tho, List l, int to) throws Exception {
-		//change to: java.util.List getList(long tho, List l, int to) throws Exception
-		// (swap parameters, insert new in between, change return type, change Ex.)
-		return new ArrayList((int)tho-to);
-	}
-}
-
-interface I {
-	public List getList(long tho, List l, int to) throws Exception;
-}
-
-interface J {
-	/** Doc: @param t t 
-	 * @param l TODO
-	 * @throws Exception TODO*/
-	public List getList(long t, List l, int f) throws FileNotFoundException, Exception;
-}
-
-class B extends A implements I, J {
-	/**
-	 * @return {@inheritDoc} 
-	 * @see p.A#getList(long, List, int)
-	 */
-	public List getList(long tho, List l, int to) throws FileNotFoundException, Exception {
-		return new ArrayList() {};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll61_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll61_in.java
deleted file mode 100644
index f175006..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll61_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	Object m()[]{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll61_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll61_out.java
deleted file mode 100644
index 57d6693..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testAll61_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	Object m(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException01_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException01_in.java
deleted file mode 100644
index ff2e8c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException01_in.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-
-import java.io.IOException;
-
-abstract class A {
-	public abstract int m(long l) throws IOException;
-}
-
-class B extends A {
-	public int m(long l) throws IOException {
-		return 17;
-	}
-	public int m(int i) {
-		return i;
-	}
-}
-
-class C extends B {
-}
-
-class D extends A {
-	public int m(long l) {
-		return 0;
-	}
-}	
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException01_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException01_out.java
deleted file mode 100644
index fb302a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException01_out.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.zip.ZipException;
-
-abstract class A {
-	public abstract int m(long l) throws IOException, ZipException;
-}
-
-class B extends A {
-	public int m(long l) throws IOException, ZipException {
-		return 17;
-	}
-	public int m(int i) {
-		return i;
-	}
-}
-
-class C extends B {
-}
-
-class D extends A {
-	public int m(long l) throws ZipException {
-		return 0;
-	}
-}	
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException02_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException02_in.java
deleted file mode 100644
index ad60d61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException02_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract void m();
-}
-
-class B extends A {
-	public int m() throws Illegal {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException02_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException02_out.java
deleted file mode 100644
index afdae8e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException02_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract void m() throws RuntimeException;
-}
-
-class B extends A {
-	public int m() throws Illegal, RuntimeException {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException03_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException03_in.java
deleted file mode 100644
index afdae8e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException03_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract void m() throws RuntimeException;
-}
-
-class B extends A {
-	public int m() throws Illegal, RuntimeException {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException03_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException03_out.java
deleted file mode 100644
index ad60d61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException03_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract void m();
-}
-
-class B extends A {
-	public int m() throws Illegal {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException04_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException04_in.java
deleted file mode 100644
index 8c6e82a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException04_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract void m();
-}
-
-class B extends A {
-	public int m() throws RuntimeException {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException04_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException04_out.java
deleted file mode 100644
index 924aa89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException04_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-import java.io.IOException;
-
-abstract class A {
-	public abstract void m() throws IOException, ClassNotFoundException;
-}
-
-class B extends A {
-	public int m() throws RuntimeException, IOException, ClassNotFoundException {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_in.java
deleted file mode 100644
index 24a972e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.p;
-
-import java.io.IOException;
-
-class A {
-	/**
-	 * @throws Exception
-	 * @throws IOException
-	 * @throws IllegalArgumentException
-	 */
-	void m() throws Exception, IOException, IllegalArgumentException {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_out.java
deleted file mode 100644
index 6bb544f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testException05_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package org.eclipse.p;
-
-
-class A {
-	/**
-	 * @throws Exception
-	 */
-	void m() throws Exception {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport01_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport01_in.java
deleted file mode 100644
index c9b0535..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport01_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-import java.security.Permission;
-
-abstract class A {
-	public abstract int m();
-	Permission perm;
-	protected void finalize() {
-		m();
-	}
-}
-
-class B extends A {
-	public int m() {
-		return 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport01_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport01_out.java
deleted file mode 100644
index 56e9a2d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport01_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-import java.security.Permission;
-
-abstract class A {
-	public abstract int m(java.security.acl.Permission acl, Permission p);
-	Permission perm;
-	protected void finalize() {
-		m(null, perm);
-	}
-}
-
-class B extends A {
-	public int m(java.security.acl.Permission acl, Permission p) {
-		return 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport02_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport02_in.java
deleted file mode 100644
index c9b0535..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport02_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-import java.security.Permission;
-
-abstract class A {
-	public abstract int m();
-	Permission perm;
-	protected void finalize() {
-		m();
-	}
-}
-
-class B extends A {
-	public int m() {
-		return 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport02_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport02_out.java
deleted file mode 100644
index a2b1fa1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport02_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-import java.security.Permission;
-
-abstract class A {
-	public abstract int m(Permission p, java.security.acl.Permission acl);
-	Permission perm;
-	protected void finalize() {
-		m(null, null);
-	}
-}
-
-class B extends A {
-	public int m(Permission p, java.security.acl.Permission acl) {
-		return 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport03_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport03_in.java
deleted file mode 100644
index 93dd56c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport03_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract int m();
-	protected void finalize() {
-		m();
-	}
-}
-
-class B extends A {
-	public int m() {
-		return 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport03_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport03_out.java
deleted file mode 100644
index d0b955b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport03_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-import java.security.acl.Permission;
-
-abstract class A {
-	public abstract int m(Permission p, java.security.Permission pp);
-	protected void finalize() {
-		m(0, 0);
-	}
-}
-
-class B extends A {
-	public int m(Permission p, java.security.Permission pp) {
-		return 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport04_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport04_in.java
deleted file mode 100644
index ef048be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport04_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract int m();
-	protected void finalize() {
-		m();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport04_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport04_out.java
deleted file mode 100644
index d662b19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport04_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract int m(Object o);
-	protected void finalize() {
-		m(null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport05_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport05_in.java
deleted file mode 100644
index f0b3e47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport05_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class A {
-	List m() {
-		return new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport05_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport05_out.java
deleted file mode 100644
index 184c050..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport05_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-
-class A {
-	Object m() {
-		return new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport06_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport06_in.java
deleted file mode 100644
index 109b9bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport06_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.security.Permission;
-
-class A {
-	Cloneable m(Permission perm, java.security.acl.Permission acl) {
-		Object o1= perm;
-		Object o2= acl;
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport06_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport06_out.java
deleted file mode 100644
index 52ead49..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport06_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.security.Permission;
-
-class A {
-	java.security.acl.Permission m(Permission xperm, java.security.acl.Permission[][] xacl) {
-		Object o1= xacl;
-		Object o2= xperm;
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_in.java
deleted file mode 100644
index a5627d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class A {
-	void m(List list) {
-		
-	}
-	void use() {
-		m(new ArrayList());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_out.java
deleted file mode 100644
index 46edd3c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport07_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-
-class A {
-	void m() {
-		
-	}
-	void use() {
-		m();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport08_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport08_in.java
deleted file mode 100644
index a57346a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport08_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.Vector;
-
-class A {
-   public static boolean textContains(String text, Vector v) {
-      return v.contains(text);
-   }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport08_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport08_out.java
deleted file mode 100644
index 1b0bb5d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testImport08_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.Vector;
-
-class A {
-   public static boolean textContains(Vector v, String text) {
-      return v.contains(text);
-   }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic01_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic01_in.java
deleted file mode 100644
index 32c8495..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic01_in.java
+++ /dev/null

@@ -1,19 +0,0 @@
-class Example {
-	public static final Example A = new Example("A1", "A2");
-	public static final Example B = Example.getExample("B1", "B2");
-	
-	public static final Example C;    
-	public static final Example D;
-	static {
-		C = new Example("C1", "C2");
-		D = Example.getExample("D1", "D2");
-	}
-	
-	public Example(String arg1, String arg2) {
-
-	}
-	
-	public static Example getExample(String arg1, String arg2) {
-		return new Example(arg1, arg2);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic01_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic01_out.java
deleted file mode 100644
index 490af8b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic01_out.java
+++ /dev/null

@@ -1,19 +0,0 @@
-class Example {
-	public static final Example A = new Example("A2", "A1");
-	public static final Example B = Example.getExample("B1", "B2");
-	
-	public static final Example C;    
-	public static final Example D;
-	static {
-		C = new Example("C2", "C1");
-		D = Example.getExample("D1", "D2");
-	}
-	
-	public Example(String b, String a) {
-
-	}
-	
-	public static Example getExample(String arg1, String arg2) {
-		return new Example(arg2, arg1);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic02_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic02_in.java
deleted file mode 100644
index 32c8495..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic02_in.java
+++ /dev/null

@@ -1,19 +0,0 @@
-class Example {
-	public static final Example A = new Example("A1", "A2");
-	public static final Example B = Example.getExample("B1", "B2");
-	
-	public static final Example C;    
-	public static final Example D;
-	static {
-		C = new Example("C1", "C2");
-		D = Example.getExample("D1", "D2");
-	}
-	
-	public Example(String arg1, String arg2) {
-
-	}
-	
-	public static Example getExample(String arg1, String arg2) {
-		return new Example(arg1, arg2);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic02_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic02_out.java
deleted file mode 100644
index 7e5dc4d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testInStatic02_out.java
+++ /dev/null

@@ -1,19 +0,0 @@
-class Example {
-	public static final Example A = new Example("A1", "A2");
-	public static final Example B = Example.getExample("B2", "B1");
-	
-	public static final Example C;    
-	public static final Example D;
-	static {
-		C = new Example("C1", "C2");
-		D = Example.getExample("D2", "D1");
-	}
-	
-	public Example(String arg1, String arg2) {
-
-	}
-	
-	public static Example getExample(String b, String a) {
-		return new Example(a, b);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName01_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName01_in.java
deleted file mode 100644
index f04c138..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName01_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-	void m(String y){
-        m(y);
-    }
-}
-
-class B {
-	public int m(String q) {
-		new A().m("x");
-		return m("k");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName01_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName01_out.java
deleted file mode 100644
index 2e98448..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName01_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-	void newName(String y){
-        newName(y);
-    }
-}
-
-class B {
-	public int m(String q) {
-		new A().newName("x");
-		return m("k");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName02_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName02_in.java
deleted file mode 100644
index d8ccd4e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName02_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-	void m(String y){
-        m(y);
-    }
-}
-
-class B extends A {
-	public void m(String q) {
-		new A().m("x");
-		return m("k");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName02_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName02_out.java
deleted file mode 100644
index 63e29e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testName02_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-	void newName(String y){
-        newName(y);
-    }
-}
-
-class B extends A {
-	public void newName(String q) {
-		new A().newName("x");
-		return newName("k");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder26_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder26_in.java
deleted file mode 100644
index 592b8fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder26_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class A{
-	private void m(boolean y, int a){
-        m(y, a);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder26_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder26_out.java
deleted file mode 100644
index c3db1fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder26_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class A{
-	private void m(int bb, boolean zzz){
-        m(bb, zzz);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder27_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder27_in.java
deleted file mode 100644
index 592b8fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder27_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class A{
-	private void m(boolean y, int a){
-        m(y, a);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder27_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder27_out.java
deleted file mode 100644
index e6204fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/canModify/A_testRenameReorder27_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class A{
-	private void m(int a, boolean yyy){
-        m(a, yyy);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFail0.java
deleted file mode 100644
index 4d043c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFail0.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	private native int m(int i, int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFail1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFail1.java
deleted file mode 100644
index 482ae7b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFail1.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-	private void m() throws Integer {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd2.java
deleted file mode 100644
index abf6cbf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd2.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//name clash in subclass
-class A{
-	int m(int i){
-	}
-}
-class B extends A{
-	int m(int x){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd3.java
deleted file mode 100644
index 0b79feb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd3.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	int m(int i){
-	}
-}
-class B extends A{
-	int m(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd4.java
deleted file mode 100644
index 49def5e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailAdd4.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//name clash in subclass
-class A{
-	int m(int i){
-	}
-}
-class B extends A{
-	int m(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll5.java
deleted file mode 100644
index 359bd64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll5.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int m(int i){
-	}
-}
-class B extends A{
-	int m(int i){
-		int o= i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll6.java
deleted file mode 100644
index 74b0a1f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll6.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//cannot change type of i to Certificate (there are 2 Certificates)
-package p;
-class A{
-	int m(int i){
-		return 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll7.java
deleted file mode 100644
index 93ffb84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll7.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//cannot change type of i to Fred - no such type exists
-package p;
-class A{
-	int m(int i){
-		return 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll8.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll8.java
deleted file mode 100644
index 46bdbcc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailDoAll8.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void run(int i) {
-		int k= i;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailImport01.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailImport01.java
deleted file mode 100644
index 93dd56c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeSignature/cannotModify/A_testFailImport01.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-abstract class A {
-	public abstract int m();
-	protected void finalize() {
-		m();
-	}
-}
-
-class B extends A {
-	public int m() {
-		return 17;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testArray_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testArray_in.java
deleted file mode 100644
index 7fc62aa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testArray_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.Vector;
-
-class A_testArray_in {
-	public static void main(String[] args) {
-		Vector[] vv = new Vector[10];
-		System.out.println("Hello, world!");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testArray_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testArray_out.java
deleted file mode 100644
index 7fc62aa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testArray_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.Vector;
-
-class A_testArray_in {
-	public static void main(String[] args) {
-		Vector[] vv = new Vector[10];
-		System.out.println("Hello, world!");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testBogusSelection_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testBogusSelection_in.java
deleted file mode 100644
index 3b8a967..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testBogusSelection_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.Hashtable;
-
-class A_testBogusSelection_in {
-	public static void main(String[] args) {
-		Hashtable h = new Hashtable();
-		System.out.println("Hello, world!");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testBogusSelection_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testBogusSelection_out.java
deleted file mode 100644
index 3b8a967..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testBogusSelection_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.Hashtable;
-
-class A_testBogusSelection_in {
-	public static void main(String[] args) {
-		Hashtable h = new Hashtable();
-		System.out.println("Hello, world!");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testFieldOfLocalType_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testFieldOfLocalType_in.java
deleted file mode 100644
index da01e6e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testFieldOfLocalType_in.java
+++ /dev/null

@@ -1,35 +0,0 @@
-public class A_testFieldOfLocalType_in {
-	
-	public void foobar() {
-		class Listener3 {
-			private A_testFieldOfLocalType_in fTest;
-			
-			private Listener3() {
-				fTest= new A_testFieldOfLocalType_in();
-			}
-			
-			public int bar() {
-				return foo();
-			}
-			
-			public int foo() {
-				return 1;
-			}
-			
-			private String getProperty() {
-				return null;
-			}
-		}
-		
-		this.addListener(new Listener3() {
-			public int bar() {
-				return 1;
-			}
-		});
-	}
-	
-	
-	public void addListener(Object o) {
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testFieldOfLocalType_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testFieldOfLocalType_out.java
deleted file mode 100644
index da01e6e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testFieldOfLocalType_out.java
+++ /dev/null

@@ -1,35 +0,0 @@
-public class A_testFieldOfLocalType_in {
-	
-	public void foobar() {
-		class Listener3 {
-			private A_testFieldOfLocalType_in fTest;
-			
-			private Listener3() {
-				fTest= new A_testFieldOfLocalType_in();
-			}
-			
-			public int bar() {
-				return foo();
-			}
-			
-			public int foo() {
-				return 1;
-			}
-			
-			private String getProperty() {
-				return null;
-			}
-		}
-		
-		this.addListener(new Listener3() {
-			public int bar() {
-				return 1;
-			}
-		});
-	}
-	
-	
-	public void addListener(Object o) {
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testInvalidSelection_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testInvalidSelection_in.java
deleted file mode 100644
index 38f4fe6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testInvalidSelection_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.Hashtable;
-
-class A_testInvalidSelection_in {
-	public static void main(String[] args) {
-		Hashtable h = new Hashtable();
-		System.out.println("Hello, world!");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testInvalidSelection_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testInvalidSelection_out.java
deleted file mode 100644
index 38f4fe6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testInvalidSelection_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.Hashtable;
-
-class A_testInvalidSelection_in {
-	public static void main(String[] args) {
-		Hashtable h = new Hashtable();
-		System.out.println("Hello, world!");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testMultiDeclaration_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testMultiDeclaration_in.java
deleted file mode 100644
index 0f08c6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testMultiDeclaration_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*;
-
-class A_testMultiDeclaration_in {
-	public void foo(){
-		List l = list1; list2 =l;
-	}
-	
-	public ArrayList list1, list2;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testMultiDeclaration_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testMultiDeclaration_out.java
deleted file mode 100644
index 0f08c6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testMultiDeclaration_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*;
-
-class A_testMultiDeclaration_in {
-	public void foo(){
-		List l = list1; list2 =l;
-	}
-	
-	public ArrayList list1, list2;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testObjectReturnType_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testObjectReturnType_in.java
deleted file mode 100644
index a4b3d16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testObjectReturnType_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-public class A_testObjectReturnType_in {
-	
-	public void Object foo() {
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testObjectReturnType_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testObjectReturnType_out.java
deleted file mode 100644
index a4b3d16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testObjectReturnType_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-public class A_testObjectReturnType_in {
-	
-	public void Object foo() {
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testOverriddenBinaryMethod_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testOverriddenBinaryMethod_in.java
deleted file mode 100644
index f85e820..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testOverriddenBinaryMethod_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-
-public class A_testOverriddenBinaryMethod_in {
-	public String toString(){
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testOverriddenBinaryMethod_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testOverriddenBinaryMethod_out.java
deleted file mode 100644
index f85e820..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testOverriddenBinaryMethod_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-
-public class A_testOverriddenBinaryMethod_in {
-	public String toString(){
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testPrimitive_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testPrimitive_in.java
deleted file mode 100644
index 86530f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testPrimitive_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.Vector;
-
-class A_testArray_in {
-	public static void main(String[] args) {
-		int i = 10;
-		System.out.println("Hello, world!");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testPrimitive_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testPrimitive_out.java
deleted file mode 100644
index 86530f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testPrimitive_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.Vector;
-
-class A_testArray_in {
-	public static void main(String[] args) {
-		int i = 10;
-		System.out.println("Hello, world!");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testUpdateNotPossible_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testUpdateNotPossible_in.java
deleted file mode 100644
index d24d1b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testUpdateNotPossible_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-import java.util.Hashtable;
-
-class A_testUpdateNotPossible_in {
-	public void foo {
-		Hashtable h1 = new Hashtable();
-		Hashtable h2 = new Hashtable();
-		h1 = h2;
-		h2 = h1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testUpdateNotPossible_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testUpdateNotPossible_out.java
deleted file mode 100644
index d24d1b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/negative/A_testUpdateNotPossible_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-import java.util.Hashtable;
-
-class A_testUpdateNotPossible_in {
-	public void foo {
-		Hashtable h1 = new Hashtable();
-		Hashtable h2 = new Hashtable();
-		h1 = h2;
-		h2 = h1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testArray_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testArray_in.java
deleted file mode 100644
index 45e456d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testArray_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testArray_in {
-	void foo(){
-		List[] ls = new ArrayList[10];
-		int n = ls.length;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDeclSubtypesOfList_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDeclSubtypesOfList_in.java
deleted file mode 100644
index df1089b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDeclSubtypesOfList_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*;
-
-class A_testFieldDeclSubtypesOfList_in {
-	public void foo(){
-		List list2 = list;
-	}
-	
-	public ArrayList list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDeclSubtypesOfList_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDeclSubtypesOfList_out.java
deleted file mode 100644
index c19dc17..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDeclSubtypesOfList_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*;
-
-class A_testFieldDeclSubtypesOfList_in {
-	public void foo(){
-		List list2 = list;
-	}
-	
-	public List list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDecl_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDecl_in.java
deleted file mode 100644
index d39640f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDecl_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-import java.util.*;
-
-class A_testFieldDecl_in {
-	void foo(){
-		list = new ArrayList();
-		List list2 = list;
-	}
-	
-	
-	public static ArrayList list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDecl_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDecl_out.java
deleted file mode 100644
index 7f2c18c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldDecl_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-import java.util.*;
-
-class A_testFieldDecl_in {
-	void foo(){
-		list = new ArrayList();
-		List list2 = list;
-	}
-	
-	
-	public static AbstractList list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldName_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldName_in.java
deleted file mode 100644
index 420f08d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldName_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-import java.util.ArrayList;
-import java.util.List;
-
-class A_testFieldName_in {
-	void foo(){
-		list = new ArrayList();
-		List list2 = list;
-	}
-	
-	public static ArrayList list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldName_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldName_out.java
deleted file mode 100644
index 0630d51..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldName_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
-
-class A_testFieldName_in {
-	void foo(){
-		list = new ArrayList();
-		List list2 = list;
-	}
-	
-	public static AbstractList list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldType_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldType_in.java
deleted file mode 100644
index fbea643..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldType_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-import java.util.*;
-
-class A_testFieldType_in {
-	void foo(){
-		list = new ArrayList();
-		List list2 = list;
-	}
-	
-	
-	public static ArrayList list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldType_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldType_out.java
deleted file mode 100644
index ca474a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldType_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-import java.util.*;
-
-class A_testFieldType_in {
-	void foo(){
-		list = new ArrayList();
-		List list2 = list;
-	}
-	
-	
-	public static AbstractList list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldUseSubtypesOfList_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldUseSubtypesOfList_in.java
deleted file mode 100644
index 3edf03d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldUseSubtypesOfList_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*;
-
-class A_testFieldUseSubtypesOfList_in {
-	public void foo(){
-		List list2 = list;
-	}
-	
-	public ArrayList list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldUseSubtypesOfList_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldUseSubtypesOfList_out.java
deleted file mode 100644
index 0867282..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldUseSubtypesOfList_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*;
-
-class A_testFieldUseSubtypesOfList_in {
-	public void foo(){
-		List list2 = list;
-	}
-	
-	public List list;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess2.java
deleted file mode 100644
index d145005..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess2.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testFieldWithAccess2 {
-	void bar(){
-		A_testFieldWithAccess_in ww = new A_testFieldWithAccess_in();
-		Collection pp = ww.fList;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess_in.java
deleted file mode 100644
index cfcb567..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.*;
-
-class A_testFieldWithAccess_in {
-	public List fList = new ArrayList();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess_out.java
deleted file mode 100644
index 6a92e17..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testFieldWithAccess_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.*;
-
-class A_testFieldWithAccess_in {
-	public Collection fList = new ArrayList();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testHashMap_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testHashMap_in.java
deleted file mode 100644
index a91710c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testHashMap_in.java
+++ /dev/null

@@ -1,71 +0,0 @@
-package p;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-
-public class A_testHashMap_in {
-	public static void main(String[] args) {
-		A a = new B();
-		Collection c1 = a.e();
-		HashMap h1 = new HashMap();	/* A1 */
-		a.h(h1, "aaa", c1);
-		a.k(h1);
-		for (Iterator it = h1.values().iterator(); it.hasNext(); ){
-			Vector v1 = (Vector)it.next(); /* C1 */
-			Integer i1 = (Integer)v1.iterator().next(); /* C2 */
-			System.out.println(i1);
-		}
-	}
-}
-
-class A {
-	public Vector e(){
-		Vector v2 = new Vector();	/* A2 */
-		Integer i2 = new Integer(17);
-		insert(v2, i2);
-		Integer i3 = (Integer)v2.iterator().next(); /* C3 */
-		return v2;
-	}
-	public void f(){
-		Vector v3 = new Vector();	/* A3 */
-		v3.add(new Integer(18));
-		reverse(v3);
-		Integer i4 = (Integer)v3.get(0); /* C4 */
-	}
-	public void g(){
-		Vector v4 = new Vector();	/* A4 */
-		v4.add(new String("xyzzy"));
-		reverse(v4);
-		String s1 = (String)v4.get(0); /* C5 */
-	}
-	public void h(Map m1, Object o1, Collection c2){
-		HashMap h2 = new HashMap(); /* A5 */
-		h2.put(o1, c2);
-		m1.putAll(h2);
-	}
-	public void k(Map m2){
-		Vector v5 = new Vector(); /* A6 */
-		v5.add(new Integer(18));
-		v5.addAll(m2.keySet());
-	}
-	public void insert(Vector v6, Object o2){
-		v6.add(o2);
-	}
-	public void reverse(List x1){
-		for (int t=0; t < x1.size()/2; t++){
-			Object temp = x1.get(x1.size()-t);
-			x1.add(x1.size()-1, x1.get(t));
-			x1.add(t, temp);
-		}
-	}
-}
-class B extends A {
-	public void h(Map m3, Object o3, Collection c3){
-		m3.put(o3, c3);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testHashMap_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testHashMap_out.java
deleted file mode 100644
index 277252d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testHashMap_out.java
+++ /dev/null

@@ -1,72 +0,0 @@
-package p;
-
-import java.util.AbstractMap;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-
-public class A_testHashMap_in {
-	public static void main(String[] args) {
-		A a = new B();
-		Collection c1 = a.e();
-		AbstractMap h1 = new HashMap();	/* A1 */
-		a.h(h1, "aaa", c1);
-		a.k(h1);
-		for (Iterator it = h1.values().iterator(); it.hasNext(); ){
-			Vector v1 = (Vector)it.next(); /* C1 */
-			Integer i1 = (Integer)v1.iterator().next(); /* C2 */
-			System.out.println(i1);
-		}
-	}
-}
-
-class A {
-	public Vector e(){
-		Vector v2 = new Vector();	/* A2 */
-		Integer i2 = new Integer(17);
-		insert(v2, i2);
-		Integer i3 = (Integer)v2.iterator().next(); /* C3 */
-		return v2;
-	}
-	public void f(){
-		Vector v3 = new Vector();	/* A3 */
-		v3.add(new Integer(18));
-		reverse(v3);
-		Integer i4 = (Integer)v3.get(0); /* C4 */
-	}
-	public void g(){
-		Vector v4 = new Vector();	/* A4 */
-		v4.add(new String("xyzzy"));
-		reverse(v4);
-		String s1 = (String)v4.get(0); /* C5 */
-	}
-	public void h(Map m1, Object o1, Collection c2){
-		HashMap h2 = new HashMap(); /* A5 */
-		h2.put(o1, c2);
-		m1.putAll(h2);
-	}
-	public void k(Map m2){
-		Vector v5 = new Vector(); /* A6 */
-		v5.add(new Integer(18));
-		v5.addAll(m2.keySet());
-	}
-	public void insert(Vector v6, Object o2){
-		v6.add(o2);
-	}
-	public void reverse(List x1){
-		for (int t=0; t < x1.size()/2; t++){
-			Object temp = x1.get(x1.size()-t);
-			x1.add(x1.size()-1, x1.get(t));
-			x1.add(t, temp);
-		}
-	}
-}
-class B extends A {
-	public void h(Map m3, Object o3, Collection c3){
-		m3.put(o3, c3);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testImport_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testImport_in.java
deleted file mode 100644
index 16a83bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testImport_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-
-import java.awt.List;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-class A_TestImport_in {
-	public void foo(Hashtable table){
-		table = new Hashtable();
-		table.put("foo", "bar");
-		List awtList = null;
-		ArrayList al = new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testImport_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testImport_out.java
deleted file mode 100644
index de26311..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testImport_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-
-import java.awt.List;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-class A_TestImport_in {
-	public void foo(Hashtable table){
-		table = new Hashtable();
-		table.put("foo", "bar");
-		List awtList = null;
-		java.util.List al = new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testInterfaceTypes_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testInterfaceTypes_in.java
deleted file mode 100644
index bb7d617..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testInterfaceTypes_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-
-public class A_testInterfaceTypes_in {
-	void foo(){
-		B b = new C();
-		b.toString();
-	}
-}
-
-interface I { }
-class A implements I { }
-class B extends A implements I { }
-class C extends B implements I { }

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testInterfaceTypes_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testInterfaceTypes_out.java
deleted file mode 100644
index 3b775d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testInterfaceTypes_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-
-public class A_testInterfaceTypes_in {
-	void foo(){
-		I b = new C();
-		b.toString();
-	}
-}
-
-interface I { }
-class A implements I { }
-class B extends A implements I { }
-class C extends B implements I { }

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalSuperTypesOfArrayList_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalSuperTypesOfArrayList_in.java
deleted file mode 100644
index 2222265..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalSuperTypesOfArrayList_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-import java.util.*;
-
-class A_testLocalSuperTypesOfArrayList_in {
-	public static void main(String[] args) {
-		ArrayList list = new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalSuperTypesOfArrayList_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalSuperTypesOfArrayList_out.java
deleted file mode 100644
index 2c93a7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalSuperTypesOfArrayList_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-import java.util.*;
-
-class A_testLocalSuperTypesOfArrayList_in {
-	public static void main(String[] args) {
-		List list = new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarCast_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarCast_in.java
deleted file mode 100644
index d488f84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarCast_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*;
-
-class A_testLocalVarCast_in {
-	public void foo(){
-		ArrayList x = new ArrayList();
-		ArrayList o = x;
-		List y = (List)o;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarCast_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarCast_out.java
deleted file mode 100644
index b5a3e9a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarCast_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*;
-
-class A_testLocalVarCast_in {
-	public void foo(){
-		ArrayList x = new ArrayList();
-		List o = x;
-		List y = (List)o;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarDecl_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarDecl_in.java
deleted file mode 100644
index 30ddcb5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarDecl_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
-
-class A_testLocalVarDecl_in {
-	public static void main(String[] args) {
-		Hashtable table = new Properties();
-		Map map = table;
-		table.put(table,table);
-		table.containsKey(map);
-		map = new HashMap();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarDecl_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarDecl_out.java
deleted file mode 100644
index 1d5d5d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarDecl_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
-
-class A_testLocalVarDecl_in {
-	public static void main(String[] args) {
-		Map table = new Properties();
-		Map map = table;
-		table.put(table,table);
-		table.containsKey(map);
-		map = new HashMap();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarName_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarName_in.java
deleted file mode 100644
index a0946af..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarName_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-import java.util.*;
-
-class A_testLocalVarName_in {
-	public static void main(String[] args) {
-		Hashtable table = new Properties();
-		Map map = table;
-		table.put(table,table);
-		table.containsKey(map);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarName_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarName_out.java
deleted file mode 100644
index 37ae052..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarName_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-import java.util.*;
-
-class A_testLocalVarName_in {
-	public static void main(String[] args) {
-		Map table = new Properties();
-		Map map = table;
-		table.put(table,table);
-		table.containsKey(map);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarType_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarType_in.java
deleted file mode 100644
index 7be90b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarType_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-import java.util.*;
-
-class A_testLocalVarType_in {
-	public static void main(String[] args) {
-		Hashtable table = new Properties();
-		Map map = table;
-		table.put(table,table);
-		table.containsKey(map);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarType_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarType_out.java
deleted file mode 100644
index 9d3f17b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarType_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-import java.util.*;
-
-class A_testLocalVarType_in {
-	public static void main(String[] args) {
-		Map table = new Properties();
-		Map map = table;
-		table.put(table,table);
-		table.containsKey(map);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarUse_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarUse_in.java
deleted file mode 100644
index 20e284a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarUse_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testLocalVarUse_in {
-	public void foo(){
-		ArrayList list = new ArrayList();
-		List list2 = list;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarUse_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarUse_out.java
deleted file mode 100644
index 880f2e4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testLocalVarUse_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testLocalVarUse_in {
-	public void foo(){
-		AbstractList list = new ArrayList();
-		List list2 = list;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUClass1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUClass1.java
deleted file mode 100644
index 23d87d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUClass1.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testMultiCUClass1 extends A_testMultiCU_in implements A_testMultiCUInterface1 {
-	public void foo(List z){
-		Collection c = z;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUClass2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUClass2.java
deleted file mode 100644
index e6215d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUClass2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testMultiCUClass2 extends A_testMultiCU_in implements A_testMultiCUInterface2 {
-	/* no method foo(List) here */
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUInterface1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUInterface1.java
deleted file mode 100644
index 3bf98b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUInterface1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.*;
-
-public interface A_testMultiCUInterface1 {
-	public void foo(List y1);
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUInterface2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUInterface2.java
deleted file mode 100644
index 81752ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCUInterface2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.*;
-
-public interface A_testMultiCUInterface2 {
-	public void foo(List y2);
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCU_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCU_in.java
deleted file mode 100644
index 0ee53b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCU_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testMultiCU_in {
-	public void foo(List x){
-		x = new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCU_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCU_out.java
deleted file mode 100644
index 2aae916..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testMultiCU_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testMultiCU_in {
-	public void foo(Collection x){
-		x = new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDeclWithOverride_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDeclWithOverride_in.java
deleted file mode 100644
index 427d9d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDeclWithOverride_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-import java.util.*;
-
-class A_testParameterDeclWithOverride_in {
-	static class X {
-		public void foo(AbstractList v1){
-			Collection c = v1;
-		}
-	}
-	static class Y extends X {
-		public void foo(AbstractList v2){
-			v2 = new ArrayList();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDeclWithOverride_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDeclWithOverride_out.java
deleted file mode 100644
index 99e9581..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDeclWithOverride_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-import java.util.*;
-
-class A_testParameterDeclWithOverride_in {
-	static class X {
-		public void foo(ArrayList v1){
-			Collection c = v1;
-		}
-	}
-	static class Y extends X {
-		public void foo(ArrayList v2){
-			v2 = new ArrayList();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDecl_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDecl_in.java
deleted file mode 100644
index 75389de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDecl_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testParameterDecl_in {
-	public void foo(Hashtable table){
-		table = new Hashtable();
-		table.put("foo", "bar");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDecl_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDecl_out.java
deleted file mode 100644
index 193f938..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterDecl_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testParameterDecl_in {
-	public void foo(Map table){
-		table = new Hashtable();
-		table.put("foo", "bar");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterNameWithOverride_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterNameWithOverride_in.java
deleted file mode 100644
index bacb43f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterNameWithOverride_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-import java.util.*;
-
-class A_testParameterNameWithOverride_in {
-	static class X {
-		public void foo(AbstractList v1){
-			Collection c = v1;
-		}
-	}
-	static class Y extends X {
-		public void foo(AbstractList v2){
-			v2 = new ArrayList();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterNameWithOverride_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterNameWithOverride_out.java
deleted file mode 100644
index 51a0e9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterNameWithOverride_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-import java.util.*;
-
-class A_testParameterNameWithOverride_in {
-	static class X {
-		public void foo(Collection v1){
-			Collection c = v1;
-		}
-	}
-	static class Y extends X {
-		public void foo(Collection v2){
-			v2 = new ArrayList();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterName_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterName_in.java
deleted file mode 100644
index b88497c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterName_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testParameterName_in {
-	public void foo(Hashtable table){
-		table = new Hashtable();
-		table.put("foo", "bar");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterName_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterName_out.java
deleted file mode 100644
index 5189183..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterName_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testParameterName_in {
-	public void foo(Map table){
-		table = new Hashtable();
-		table.put("foo", "bar");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverride_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverride_in.java
deleted file mode 100644
index 00796bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverride_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-import java.util.*;
-
-class A_testParameterTypeWithOverride_in {
-	static class X {
-		public void foo(AbstractList v1){
-			Collection c = v1;
-		}
-	}
-	static class Y extends X {
-		public void foo(AbstractList v2){
-			v2 = new ArrayList();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverride_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverride_out.java
deleted file mode 100644
index f66f2d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverride_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-import java.util.*;
-
-class A_testParameterTypeWithOverride_in {
-	static class X {
-		public void foo(List v1){
-			Collection c = v1;
-		}
-	}
-	static class Y extends X {
-		public void foo(List v2){
-			v2 = new ArrayList();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding2.java
deleted file mode 100644
index 8d79d00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding2.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testParameterTypeWithOverriding2 extends A_testParameterTypeWithOverriding_in {
-	public void foo(List list2){
-		Collection c = list2;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding2_out.java
deleted file mode 100644
index 8d79d00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding2_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testParameterTypeWithOverriding2 extends A_testParameterTypeWithOverriding_in {
-	public void foo(List list2){
-		Collection c = list2;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding_in.java
deleted file mode 100644
index 3db6fb0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testParameterTypeWithOverriding_in {
-	public void foo(List list){
-		list = new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding_out.java
deleted file mode 100644
index 9176fa4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterTypeWithOverriding_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testParameterTypeWithOverriding_in {
-	public void foo(Collection list){
-		list = new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterType_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterType_in.java
deleted file mode 100644
index da71728..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterType_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testParameterType_in {
-	public void foo(Hashtable table){
-		table = new Hashtable();
-		table.put("foo", "bar");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterType_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterType_out.java
deleted file mode 100644
index a1bc569..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testParameterType_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-import java.util.*;
-
-class A_testParameterType_in {
-	public void foo(Dictionary table){
-		table = new Hashtable();
-		table.put("foo", "bar");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType2.java
deleted file mode 100644
index 527bb43..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType2.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.*;
-
-public class A_testReturnType2 {
-	void bar(){
-		A_testReturnType_in ww = new A_testReturnType_in();
-		Object pp = ww.foo();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnTypeWithCall_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnTypeWithCall_in.java
deleted file mode 100644
index cbed2e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnTypeWithCall_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-import java.util.*;
-
-class A_testReturnTypeWithCall_in {
-	public ArrayList foo(){
-		return new ArrayList();
-	}
-	public void bar(){
-		List l = this.foo();	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnTypeWithCall_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnTypeWithCall_out.java
deleted file mode 100644
index 7f0b8ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnTypeWithCall_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-import java.util.*;
-
-class A_testReturnTypeWithCall_in {
-	public AbstractList foo(){
-		return new ArrayList();
-	}
-	public void bar(){
-		List l = this.foo();	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType_in.java
deleted file mode 100644
index 7b0bfd1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-class A_testReturnType_in {
-	public List foo(){
-		return new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType_out.java
deleted file mode 100644
index 139f62d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testReturnType_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.*;
-
-class A_testReturnType_in {
-	public Collection foo(){
-		return new ArrayList();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testString_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testString_in.java
deleted file mode 100644
index 1db9bd5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testString_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-
-class A_testString_in {
-	public static void bar(){
-		String s = new String();
-		s.toString();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testString_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testString_out.java
deleted file mode 100644
index d96ed24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ChangeTypeRefactoring/positive/A_testString_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-
-class A_testString_in {
-	public static void bar(){
-		Object s = new String();
-		s.toString();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test0_in.java
deleted file mode 100644
index f24aa7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test0_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//private, static, final
-class A{
-	void f(){
-		new A(){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test0_out.java
deleted file mode 100644
index 501f134..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test0_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//private, static, final
-class A{
-	private final class Inner extends A {
-	}
-
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test10_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test10_in.java
deleted file mode 100644
index 17e86da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test10_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//private, static, final
-class A{
-	A(int i){
-	}
-	void f(){
-		new A(1){
-			void f(){
-				x();
-			}
-		};
-	}
-	static void x(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test10_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test10_out.java
deleted file mode 100644
index 7bd4647..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test10_out.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-//private, static, final
-class A{
-	private final class Inner extends A {
-		private Inner(int i) {
-			super(i);
-		}
-		void f(){
-			x();
-		}
-	}
-	A(int i){
-	}
-	void f(){
-		new Inner(1);
-	}
-	static void x(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test11_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test11_in.java
deleted file mode 100644
index bcf9c61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test11_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	void f(){
-		final int u= 9;
-		new A(){
-			int k= u;
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test11_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test11_out.java
deleted file mode 100644
index 9dc80ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test11_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-class A{
-	private final class Inner extends A {
-		int k;
-		private final int u;
-		private Inner(int u) {
-			super();
-			this.u= u;
-			k= u;
-		}
-	}
-
-	void f(){
-		final int u= 9;
-		new Inner(u);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test12_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test12_in.java
deleted file mode 100644
index b3e2851..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test12_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	A(int x){
-	}
-	void f(){
-		final int u= 9;
-		int s= 2;
-		new A(s){
-			int k= u;
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test12_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test12_out.java
deleted file mode 100644
index 3ef6ce6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test12_out.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-class A{
-	private final class Inner extends A {
-		int k;
-		private final int u;
-		private Inner(int x, int u) {
-			super(x);
-			this.u= u;
-			k= u;
-		}
-	}
-	A(int x){
-	}
-	void f(){
-		final int u= 9;
-		int s= 2;
-		new Inner(s, u);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test13_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test13_in.java
deleted file mode 100644
index 3a0d387..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test13_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	A(Object s){}
-	void f(){
-		class Local{}
-		new A(new Local()){
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test13_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test13_out.java
deleted file mode 100644
index be04509..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test13_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	private final class Inner extends A {
-		private Inner(Object s) {
-			super(s);
-		}
-	}
-	A(Object s){}
-	void f(){
-		class Local{}
-		new Inner(new Local());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test14_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test14_in.java
deleted file mode 100644
index 44ac387..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test14_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//private, static, final
-class A{
-	void f(){
-		new Object(){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test14_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test14_out.java
deleted file mode 100644
index 53a64d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test14_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//private, static, final
-class A{
-	private final class Inner {
-	}
-
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test15_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test15_in.java
deleted file mode 100644
index 6feac7b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test15_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-
-class A{
-	void g(){
-		new ArrayList(6){
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test15_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test15_out.java
deleted file mode 100644
index 6783e2d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test15_out.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-
-class A{
-	private final class Inner extends ArrayList {
-		private Inner(int arg0) {
-			super(arg0);
-		}
-	}
-
-	void g(){
-		new Inner(6);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test16_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test16_in.java
deleted file mode 100644
index 176d1cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test16_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A {
-	void f(){
-		new Comparable(){
-			public int compareTo(Object other) {
-				return 0;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test16_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test16_out.java
deleted file mode 100644
index 36f5608..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test16_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A {
-	private final class Inner implements Comparable {
-		public int compareTo(Object other) {
-			return 0;
-		}
-	}
-
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test17_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test17_in.java
deleted file mode 100644
index 3612339..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test17_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	A(Object x){
-	}
-	void f(){
-		new A(this){
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test17_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test17_out.java
deleted file mode 100644
index 42c8e2a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test17_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	private final class Inner extends A {
-		private Inner(Object x) {
-			super(x);
-		}
-	}
-	A(Object x){
-	}
-	void f(){
-		new Inner(this);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test18_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test18_in.java
deleted file mode 100644
index db38aa6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test18_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	void f(){
-		final int u= 9;
-		new A(){
-			void g(){
-				int uj= u;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test18_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test18_out.java
deleted file mode 100644
index 3578aaa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test18_out.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A{
-	private final class Inner extends A {
-		private final int u;
-		private Inner(int u) {
-			super();
-			this.u= u;
-		}
-		void g(){
-			int uj= u;
-		}
-	}
-
-	void f(){
-		final int u= 9;
-		new Inner(u);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test19_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test19_in.java
deleted file mode 100644
index 37303db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test19_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	void f(){
-		final int u= 8;
-		new A(){
-			int l= 9;
-			int p0= 2, k= u, k1= k;
-			int l1= l+1, p, q= p+u;
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test19_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test19_out.java
deleted file mode 100644
index c910733..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test19_out.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-class A{
-	private final class Inner extends A {
-		int l= 9;
-		int p0= 2, k, k1= k;
-		int l1= l+1, p, q;
-		private final int u;
-		private Inner(int u) {
-			super();
-			this.u= u;
-			k= u;
-			q= p+u;
-		}
-	}
-
-	void f(){
-		final int u= 8;
-		new Inner(u);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test1_in.java
deleted file mode 100644
index c567910..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test1_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//public, static, final
-class A{
-	void f(){
-		new A(){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test1_out.java
deleted file mode 100644
index 8db3e50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test1_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//public, static, final
-class A{
-	public final class Inner extends A {
-	}
-
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test20_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test20_in.java
deleted file mode 100644
index ab963b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test20_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	public void foo() {
-		A foo= new A() {
-			public void bar() {
-					// TODO the return is misaligned
-	return;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test20_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test20_out.java
deleted file mode 100644
index bae6c85..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test20_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	private final class Inner extends A {
-		public void bar() {
-				// TODO the return is misaligned
-return;
-		}
-	}
-
-	public void foo() {
-		A foo= new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test21_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test21_in.java
deleted file mode 100644
index 8a0519e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test21_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A {
-	public static void foo() {
-		A foo= new A() {
-			public void bar() {
-				return;
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test21_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test21_out.java
deleted file mode 100644
index 06b73ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test21_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A {
-	private static final class Inner extends A {
-		public void bar() {
-			return;
-		}
-	}
-
-	public static void foo() {
-		A foo= new Inner();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test22_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test22_in.java
deleted file mode 100644
index 407e4e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test22_in.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A {
-	interface I	{
-		void bar();
-	}
-	public static void foo(){
-		I foo= new I() {
-			public void bar() {
-				I foo = new I() {
-					public void bar(){
-					}
-				};
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test22_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test22_out.java
deleted file mode 100644
index b3e88b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test22_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-class A {
-	private static final class Inner implements I {
-		public void bar(){
-		}
-	}
-	interface I	{
-		void bar();
-	}
-	public static void foo(){
-		I foo= new I() {
-			public void bar() {
-				I foo = new Inner();
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test23_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test23_in.java
deleted file mode 100644
index 488a62c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test23_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A {
-	public static void foo1(){
-		A foo = new A()	{
-			public void foo(){
-				A foo = new A(){};
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test23_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test23_out.java
deleted file mode 100644
index 734562e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test23_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	private final class Inner extends A {
-	}
-
-	public static void foo1(){
-		A foo = new A()	{
-			public void foo(){
-				A foo = new Inner();
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test24_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test24_in.java
deleted file mode 100644
index 41428c2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test24_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	static A a = new A(){
-		public void foo(){
-		}
-	};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test24_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test24_out.java
deleted file mode 100644
index b786337..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test24_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	private static final class Inner extends A {
-		public void foo(){
-		}
-	}
-
-	static A a = new Inner();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test25_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test25_in.java
deleted file mode 100644
index 17059d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test25_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A {
-	interface I{
-		void foo();
-	}
-	static A i = new A(){
-		public void foo(){
-			I i = new I() {
-				public void foo(){
-					
-				}
-			};
-		}
-	};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test25_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test25_out.java
deleted file mode 100644
index bce37ae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test25_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A {
-	private final class Inner implements I {
-		public void foo(){
-			
-		}
-	}
-	interface I{
-		void foo();
-	}
-	static A i = new A(){
-		public void foo(){
-			I i = new Inner();
-		}
-	};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test26_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test26_in.java
deleted file mode 100644
index 3fd6378..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test26_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A {
-	interface I{
-		void foo();
-	}
-	static I i = new I(){
-		public void foo(){
-			I i = new I() {
-				public void foo(){
-					
-				}
-			};
-		}
-	};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test26_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test26_out.java
deleted file mode 100644
index 236d9ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test26_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A {
-	private static final class Inner implements I {
-		public void foo(){
-			
-		}
-	}
-	interface I{
-		void foo();
-	}
-	static I i = new I(){
-		public void foo(){
-			I i = new Inner();
-		}
-	};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test27_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test27_in.java
deleted file mode 100644
index df8ef5a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test27_in.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-class A {
-	interface I{
-		void foo();
-	}
-	static void foo1(){
-		new A(){
-			void foo(){
-				I i = new I(){
-					public void foo(){
-						I i = new I(){
-							public void foo(){
-							}
-						};
-					}
-				};
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test27_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test27_out.java
deleted file mode 100644
index d5dd8c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test27_out.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-class A {
-	private final class Inner implements I {
-		public void foo(){
-		}
-	}
-	interface I{
-		void foo();
-	}
-	static void foo1(){
-		new A(){
-			void foo(){
-				I i = new I(){
-					public void foo(){
-						I i = new Inner();
-					}
-				};
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test28_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test28_in.java
deleted file mode 100644
index 4ede75f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test28_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	public static class B extends A {
-		public void foo(){
-		}
-	}
-	
-	static B b = new B() {
-		public void foo() {
-			B b = new B(){};
-		}
-	};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test28_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test28_out.java
deleted file mode 100644
index 6440a3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test28_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A {
-	private final class Inner extends B {
-	}
-
-	public static class B extends A {
-		public void foo(){
-		}
-	}
-	
-	static B b = new B() {
-		public void foo() {
-			B b = new Inner();
-		}
-	};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test2_in.java
deleted file mode 100644
index f37423a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test2_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//public, nonstatic, final
-class A{
-	void f(){
-		new A(){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test2_out.java
deleted file mode 100644
index d8358e2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test2_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//public, nonstatic, final
-class A{
-	public final class Inner extends A {
-	}
-
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test3_in.java
deleted file mode 100644
index 9a318b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test3_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//public, nonstatic, nonfinal
-class A{
-	void f(){
-		new A(){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test3_out.java
deleted file mode 100644
index f02f8b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test3_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//public, nonstatic, nonfinal
-class A{
-	public class Inner extends A {
-	}
-
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test4_in.java
deleted file mode 100644
index 5a2d397..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test4_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//private, static, final
-class A{
-	A(){
-	}
-	void f(){
-		new A(){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test4_out.java
deleted file mode 100644
index 953159c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test4_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//private, static, final
-class A{
-	private final class Inner extends A {
-	}
-	A(){
-	}
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test5_in.java
deleted file mode 100644
index d2e45d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test5_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//private, static, final
-class A{
-	A(int i){
-	}
-	void f(){
-		new A(1){};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test5_out.java
deleted file mode 100644
index ba6a492..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test5_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//private, static, final
-class A{
-	private final class Inner extends A {
-		private Inner(int i) {
-			super(i);
-		}
-	}
-	A(int i){
-	}
-	void f(){
-		new Inner(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test6_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test6_in.java
deleted file mode 100644
index 18cbe20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test6_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//private, static, final
-class A{
-	A(int i){
-	}
-	void f(){
-		new A(1){
-			void f(){
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test6_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test6_out.java
deleted file mode 100644
index b7c7807..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test6_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-//private, static, final
-class A{
-	private final class Inner extends A {
-		private Inner(int i) {
-			super(i);
-		}
-		void f(){
-		}
-	}
-	A(int i){
-	}
-	void f(){
-		new Inner(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test7_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test7_in.java
deleted file mode 100644
index 81d8b7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test7_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//private, static, final
-class A{
-	A(int i){
-	}
-	void f(){
-		new A(1){
-			int X = 0;
-			void f(){
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test7_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test7_out.java
deleted file mode 100644
index e6c4841..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test7_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//private, static, final
-class A{
-	private final class Inner extends A {
-		int X = 0;
-		private Inner(int i) {
-			super(i);
-		}
-		void f(){
-		}
-	}
-	A(int i){
-	}
-	void f(){
-		new Inner(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test8_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test8_in.java
deleted file mode 100644
index 76a1c72..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test8_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//private, nonstatic, final
-class A{
-	A(int i){
-	}
-	void f(){
-		new A(1){
-			void f(){
-				x();
-			}
-		};
-	}
-	void x(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test8_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test8_out.java
deleted file mode 100644
index c07a000..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test8_out.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-//private, nonstatic, final
-class A{
-	private final class Inner extends A {
-		private Inner(int i) {
-			super(i);
-		}
-		void f(){
-			x();
-		}
-	}
-	A(int i){
-	}
-	void f(){
-		new Inner(1);
-	}
-	void x(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test9_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test9_in.java
deleted file mode 100644
index 5c55e59..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test9_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//private, nonstatic, final
-class A{
-	int y;
-	A(int i){
-	}
-	void f(){
-		new A(1){
-			void f(){
-				y= 0;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test9_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test9_out.java
deleted file mode 100644
index fdf593c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/canConvert/A_test9_out.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-//private, nonstatic, final
-class A{
-	private final class Inner extends A {
-		private Inner(int i) {
-			super(i);
-		}
-		void f(){
-			y= 0;
-		}
-	}
-	int y;
-	A(int i){
-	}
-	void f(){
-		new Inner(1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail0.java
deleted file mode 100644
index c4f269c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail0.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//references a local type
-class A{
-    void f(){
-        class Local{}
-        new A(){
-            Object x= new Local();
-        };
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail1.java
deleted file mode 100644
index 841b262..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail1.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-    class Inner{}
-    void f(){
-        new A(){
-            Object x= new Object();
-        };
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail2.java
deleted file mode 100644
index 9fc6c63..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail2.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class Inner{
-	class InnerInner{
-	    void f(){
-	        new Object(){
-	        };
-	    }
-	}    
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail3.java
deleted file mode 100644
index 2b82544..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail3.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-public class A {
-	public static class B extends A {
-		public void foo(){
-		}
-	}
-	
-	static B b = new B() {
-		public void foo() {
-			B b = new B(){};
-		}
-	};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail4.java
deleted file mode 100644
index 4746799..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ConvertAnonymousToNested/cannotConvert/A_testFail4.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-class A {
-	static void foo() {
-		final int x= 10; 
-		Runnable runnable= new Runnable() {
-			private int field;
-			public void run() {
-				I i= new I() {
-					public void method() {
-						field= x;
-					}
-				};
-			}
-		};
-	}
-}
-
-interface I {
-	void method();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_declared_in_multi_yes_type/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_declared_in_multi_yes_type/in/A.java
deleted file mode 100644
index a641675..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_declared_in_multi_yes_type/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int[] bar[], baz;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_declared_in_multi_yes_type/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_declared_in_multi_yes_type/out/A.java
deleted file mode 100644
index 0ae86ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_declared_in_multi_yes_type/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int[] bar[], baz;
-	int[] bar[];
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_yes_field/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_yes_field/in/A.java
deleted file mode 100644
index 7c8fc80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_yes_field/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int bar;
-	int baz;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_yes_field/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_yes_field/out/A.java
deleted file mode 100644
index 9b0472f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_field_yes_field/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int bar;
-	int baz;
-	int bar;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type/in/A.java
deleted file mode 100644
index 127f912..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int[] bar[]= null, baz= null;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type/out/A.java
deleted file mode 100644
index a4c844b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int[] bar[]= null, baz= null;
-	int[] bar[] = null;
-	int[] baz = null;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type_1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type_1/in/A.java
deleted file mode 100644
index 79ac2a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type_1/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A {
-	private int var11, var2, var3;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type_1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type_1/out/A.java
deleted file mode 100644
index 8fe2349..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_fields_declared_in_multi_yes_type_1/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	private int var11, var2, var3;
-	private int var11;
-	private int var2;
-	private int var3;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/in/A.java
deleted file mode 100644
index 5fd23e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-import java.util.*;
-import java.lang.Object;
-class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/in/C.java
deleted file mode 100644
index 9c6b788..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/in/C.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class C {
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/out/A.java
deleted file mode 100644
index 5fd23e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-import java.util.*;
-import java.lang.Object;
-class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/out/C.java
deleted file mode 100644
index 0a21d09..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_cu/out/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-import java.util.*;
-import java.lang.Object;
-class C {
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/in/A.java
deleted file mode 100644
index 5fd23e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-import java.util.*;
-import java.lang.Object;
-class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/in/C.java
deleted file mode 100644
index 9c6b788..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/in/C.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class C {
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/out/A.java
deleted file mode 100644
index 5fd23e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-import java.util.*;
-import java.lang.Object;
-class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/out/C.java
deleted file mode 100644
index 0a21d09..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_method_in_different_cu/out/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-import java.util.*;
-import java.lang.Object;
-class C {
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/in/A.java
deleted file mode 100644
index 7d966e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/in/C.java
deleted file mode 100644
index 49f041f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/in/C.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class C {
-}
-class D {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/out/A.java
deleted file mode 100644
index 7d966e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/out/C.java
deleted file mode 100644
index 5df7e22..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_import_container_yes_type_in_different_cu/out/C.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.*;
-class C {
-}
-class D {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_method/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_method/in/A.java
deleted file mode 100644
index 63216a9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_method/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	static {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_method/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_method/out/A.java
deleted file mode 100644
index f419de0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_method/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	static {
-	}
-	static {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_type/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_type/in/A.java
deleted file mode 100644
index 8c67b83..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_type/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	{
-		int fred= 0; //comment
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_type/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_type/out/A.java
deleted file mode 100644
index 354ed94..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_initializer_yes_type/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	{
-		int fred= 0; //comment
-	}
-	void foo() {
-	}
-	{
-		int fred= 0; //comment
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/in/A.java
deleted file mode 100644
index f32cf61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	class Inner {
-		void foo() {//comment here
-		}
-		int bar;//comment there
-		int baz;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/in/C.java
deleted file mode 100644
index 8b3f1f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/in/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class C{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/out/A.java
deleted file mode 100644
index f32cf61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	class Inner {
-		void foo() {//comment here
-		}
-		int bar;//comment there
-		int baz;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/out/C.java
deleted file mode 100644
index a10a14d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_inner_type_yes_cu/out/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class C{
-}
-
-class Inner {
-	void foo() {//comment here
-	}
-	int bar;//comment there
-	int baz;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/in/A.java
deleted file mode 100644
index 97fa672..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/in/C.java
deleted file mode 100644
index 49f041f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/in/C.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class C {
-}
-class D {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/out/A.java
deleted file mode 100644
index 97fa672..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/out/C.java
deleted file mode 100644
index cc9219f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_cu_with_main_type/out/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class C {
-
-	void foo() {
-	}
-}
-class D {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_field/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_field/in/A.java
deleted file mode 100644
index 949b72d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_field/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int bar;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_field/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_field/out/A.java
deleted file mode 100644
index 046d474..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_field/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int bar;
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_initializer/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_initializer/in/A.java
deleted file mode 100644
index 7d966e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_initializer/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_initializer/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_initializer/out/A.java
deleted file mode 100644
index 3437196..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_initializer/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	{
-	}
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_itself/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_itself/in/A.java
deleted file mode 100644
index 97fa672..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_itself/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_itself/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_itself/out/A.java
deleted file mode 100644
index 050fef9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_itself/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_other_method/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_other_method/in/A.java
deleted file mode 100644
index 3df1c60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_other_method/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	void bar() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_other_method/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_other_method/out/A.java
deleted file mode 100644
index d662690..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_other_method/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	void bar() {
-	}
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_type/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_type/in/A.java
deleted file mode 100644
index be7483e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_type/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-		int stuff= 1; //this is a comment
-					  //and another one
-	}
-	int bar;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_type/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_type/out/A.java
deleted file mode 100644
index 8015905..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_method_yes_type/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-		int stuff= 1; //this is a comment
-					  //and another one
-	}
-	void foo() {
-		int stuff= 1; //this is a comment
-					  //and another one
-	}
-	int bar;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/in/A.java
deleted file mode 100644
index 7c8fc80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int bar;
-	int baz;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/in/C.java
deleted file mode 100644
index 8b3f1f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/in/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class C{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/out/A.java
deleted file mode 100644
index 7c8fc80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-	int bar;
-	int baz;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/out/C.java
deleted file mode 100644
index 3609e4e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Copy/test_type_yes_type/out/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class C{
-}
-
-class A {
-	void foo() {
-	}
-	int bar;
-	int baz;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/CopyPackageChange/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/CopyPackageChange/A.java
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/CopyPackageChange/A.java
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu0/in/A.java
deleted file mode 100644
index 5fa7bcf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu0/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int i, j;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu0/out/A.java
deleted file mode 100644
index bbeefab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu0/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int j;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu1/in/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu1/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu1/out/A.java
deleted file mode 100644
index ff4381d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu1/out/A.java
+++ /dev/null

@@ -1 +0,0 @@
-package p;

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu10/in/A.java
deleted file mode 100644
index 3ec9951..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu10/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	static {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu10/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu10/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu11/in/A.java
deleted file mode 100644
index e411cc5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu11/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-import java.util.List;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu11/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu11/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu12/in/A.java
deleted file mode 100644
index 490e407..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu12/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	class B{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu12/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu12/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu13/in/A.java
deleted file mode 100644
index 490e407..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu13/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	class B{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu13/out/A.java
deleted file mode 100644
index ff4381d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu13/out/A.java
+++ /dev/null

@@ -1 +0,0 @@
-package p;

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu14/in/A.java
deleted file mode 100644
index 490e407..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu14/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	class B{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu14/out/A.java
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu14/out/A.java
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu15/in/A.java
deleted file mode 100644
index 815e6f3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu15/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	int field;
-	public int getField(){
-		return field;
-	}
-
-	public void setField(int field){
-		this.field= field;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu15/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu15/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu16/in/A.java
deleted file mode 100644
index 4b4ee0d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu16/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/**
- */
-class Test{
-}/**
- */
-class Test1{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu16/out/A.java
deleted file mode 100644
index f6c2f03..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu16/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/**
- */
-class Test1{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu17/in/A.java
deleted file mode 100644
index bb37e19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu17/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-
-	void f(){}
-	
-	/**
-	 * 
-	 */
-	void fs(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu17/out/A.java
deleted file mode 100644
index 48f86a9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu17/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-
-	/**
-	 * 
-	 */
-	void fs(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu18/in/A.java
deleted file mode 100644
index 7d18eda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu18/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	/**
-	 */
-	void fs(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu18/out/A.java
deleted file mode 100644
index 688a6d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu18/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu19/in/A.java
deleted file mode 100644
index 029feb2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu19/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-import java.util.List;
-import java.util.Set;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu19/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu19/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu2/in/A.java
deleted file mode 100644
index 40ae578..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu2/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int i;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu2/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu2/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu20/in/A.java
deleted file mode 100644
index 0c54a34..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu20/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A 
-	protected String fEmpty;
-
-	public static void main (String[] args) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu20/out/A.java
deleted file mode 100644
index b7ed234..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu20/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A 
-	public static void main (String[] args) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu21/in/A.java
deleted file mode 100644
index 9d80a97..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu21/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A 
-	private int var11, var2, var3;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu21/out/A.java
deleted file mode 100644
index cb4cb95..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu21/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A 
-	private int var2, var3;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu22/in/A.java
deleted file mode 100644
index d1826a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu22/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu22/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu22/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu23/in/A.java
deleted file mode 100644
index 069dfcd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu23/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	private int nestingDepth;
-	private boolean openOnRun = true;
-	public boolean getOpenOnRun() {
-		return openOnRun;
-	}
-	protected int getNestingDepth() {
-		return nestingDepth;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu23/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu23/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu3/in/A.java
deleted file mode 100644
index 5fa7bcf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu3/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int i, j;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu3/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu3/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu4/in/A.java
deleted file mode 100644
index be1c2f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu4/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int i, j, k;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu4/out/A.java
deleted file mode 100644
index bbeefab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu4/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int j;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu5/in/A.java
deleted file mode 100644
index 5fa7bcf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu5/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int i, j;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu5/out/A.java
deleted file mode 100644
index 40ae578..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu5/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int i;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu6/in/A.java
deleted file mode 100644
index 618deb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu6/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int i= 0, j= 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu6/out/A.java
deleted file mode 100644
index 727dfc4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu6/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int i= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu7/in/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu7/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu7/out/A.java
deleted file mode 100644
index 197a31b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu7/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu8/in/A.java
deleted file mode 100644
index ed947f2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu8/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu8/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu8/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu9/in/A.java
deleted file mode 100644
index c08e03d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu9/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu9/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Delete/testDeleteWithinCu9/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_in.java
deleted file mode 100644
index 34e6051..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//5, 16 -> 5, 17   AllowLoadtime == false
-package p;
-class A {
-	void f() {
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_out.java
deleted file mode 100644
index 942e111..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//5, 16 -> 5, 17   AllowLoadtime == false
-package p;
-class A {
-	private static final int CONSTANT= 0;
-	void f() {
-		int i= CONSTANT;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_in.java
deleted file mode 100644
index bb77191..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 17 -> 8, 22
-package p;
-
-class A {
-	void foob() {
-		int c= 2 + 2 * 4 + (28 + 2 + 2) + 1;
-
-		int e= (2 + 2) * 3 * 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_out.java
deleted file mode 100644
index f3c9fe3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 8, 17 -> 8, 22
-package p;
-
-class A {
-	private static final int CONSTANT= 2 + 2;
-	void foob() {
-		int c= 2 + 2 * 4 + (28 + CONSTANT) + 1;
-
-		int e= (CONSTANT) * 3 * 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_in.java
deleted file mode 100644
index 751b6aa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-// 10, 37 -> 10, 43
-package p;
-
-class A {
-	void foob() {
-
-		int c= 3 * (2 + 1) + 2 + 2 * 4 + 28;
-
-
-		int e= (2 + 2) * (27 + 2 * (2+2* 4+1*2));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_out.java
deleted file mode 100644
index 67b999d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-// 10, 37 -> 10, 43
-package p;
-
-class A {
-	private static final int CONSTANT= 2+2* 4;
-	void foob() {
-
-		int c= 3 * (2 + 1) + CONSTANT + 28;
-
-
-		int e= (2 + 2) * (27 + 2 * (CONSTANT+1*2));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_in.java
deleted file mode 100644
index 7481e13..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 9, 19 -> 9, 24
-package p;
-
-class A {
-	void foob() {
-		
-		int e= (2 + 2) * 3 * 1;
-		
-		int f= 5 *3*  1 *(1 + 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_out.java
deleted file mode 100644
index c4f8054..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-// 9, 19 -> 9, 24
-package p;
-
-class A {
-	private static final int CONSTANT= 3*  1;
-	void foob() {
-		
-		int e= (2 + 2) * CONSTANT;
-		
-		int f= 5 *CONSTANT *(1 + 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_in.java
deleted file mode 100644
index 08cf97c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//9, 16 -> 9, 28   AllowLoadtime == true
-package p;
-
-class S {
-	public static S instance= new S();
-	
-	int f(){
-
-		int v= instance.f();
-		return 0;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_out.java
deleted file mode 100644
index a057491..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//9, 16 -> 9, 28   AllowLoadtime == true
-package p;
-
-class S {
-	public static S instance= new S();
-	private static final int CONSTANT= instance.f();
-	
-	int f(){
-
-		int v= CONSTANT;
-		return 0;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_in.java
deleted file mode 100644
index 5ac843b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//10, 28 -> 10, 44   AllowLoadtime == true
-package p;
-
-class S {
-	public static S instance= new S();
-
-	int s;
-
-	int f() {
-		System.out.println(S.instance.s + 1);
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_out.java
deleted file mode 100644
index a53a057..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//10, 28 -> 10, 44   AllowLoadtime == true
-package p;
-
-class S {
-	public static S instance= new S();
-	private static final int CONSTANT= S.instance.s + 1;
-
-	int s;
-
-	int f() {
-		System.out.println(CONSTANT);
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_in.java
deleted file mode 100644
index 71a125d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//5, 16 -> 5, 25   AllowLoadtime == false
-package p;
-class A {
-	void f() {
-		int i= getFred();
-	}
-	static int getFred(){
-		return 5;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_out.java
deleted file mode 100644
index e42902f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//5, 16 -> 5, 25   AllowLoadtime == false
-package p;
-class A {
-	private static final int CONSTANT= getFred();
-	void f() {
-		int i= CONSTANT;
-	}
-	static int getFred(){
-		return 5;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_in.java
deleted file mode 100644
index 2df41b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//5, 20 -> 5, 27   AllowLoadtime == false
-package p;
-class A {
-	void f() {
-		boolean i= isRed();
-	}
-	static boolean isRed(){
-		return 5==1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_out.java
deleted file mode 100644
index 1f2d557..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//5, 20 -> 5, 27   AllowLoadtime == false
-package p;
-class A {
-	private static final boolean CONSTANT= isRed();
-	void f() {
-		boolean i= CONSTANT;
-	}
-	static boolean isRed(){
-		return 5==1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_in.java
deleted file mode 100644
index 4c84790..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//5, 16 -> 5, 35   AllowLoadtime == false
-package p;
-class A {
-	void f() {
-		int i= getYetAnotherFred();
-	}
-	static int getYetAnotherFred(){
-		return 5;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_out.java
deleted file mode 100644
index 5aa9959..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//5, 16 -> 5, 35   AllowLoadtime == false
-package p;
-class A {
-	private static final int CONSTANT= getYetAnotherFred();
-	void f() {
-		int i= CONSTANT;
-	}
-	static int getYetAnotherFred(){
-		return 5;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_in.java
deleted file mode 100644
index d8b8815..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//5, 16 -> 5, 17   AllowLoadtime == false,  qualifyReferencesWithClassName= true
-package p;
-class ClassName {
-	int f() {
-		return 0;
-	}
-	
-	class Nested {
-		{
-			System.out.println(0);	
-		}
-		
-		void f() {
-			int i= 0;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_out.java
deleted file mode 100644
index 6adfcc7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_out.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//5, 16 -> 5, 17   AllowLoadtime == false,  qualifyReferencesWithClassName= true
-package p;
-class ClassName {
-	private static final int CONSTANT= 0;
-	int f() {
-		return ClassName.CONSTANT;
-	}
-	
-	class Nested {
-		{
-			System.out.println(ClassName.CONSTANT);	
-		}
-		
-		void f() {
-			int i= ClassName.CONSTANT;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_in.java
deleted file mode 100644
index 77f3a8c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-// 5, 23 -> 5, 38
-class Foo {
-	public final static String BASE = "base."; //$NON-NLS-1$
-	public void m1() {
-		String name = BASE + "suffix";
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_out.java
deleted file mode 100644
index 023ec69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-// 5, 23 -> 5, 38
-class Foo {
-	public final static String BASE = "base."; //$NON-NLS-1$
-	private static final String CONSTANT= BASE + "suffix";
-	public void m1() {
-		String name = CONSTANT;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_in.java
deleted file mode 100644
index a9eea96..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//5, 16 -> 5, 21   AllowLoadtime == false
-package p;
-class A {
-	void f() {
-		int i= 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_out.java
deleted file mode 100644
index 235a882..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//5, 16 -> 5, 21   AllowLoadtime == false
-package p;
-class A {
-	private static final int CONSTANT= 1 + 2;
-	void f() {
-		int i= CONSTANT;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_in.java
deleted file mode 100644
index 102d0a9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-// 7, 19 -> 7, 28
-class BodyDeclOnSameLine {
-	private final static String BAR= "c";
-	private final static String FOO=  "a";  /* ambiguous */ String strange= "b"; //$NON-NLS-1$ //$NON-NLS-2$
-
-	void m() {
-		String s= FOO + BAR;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_out.java
deleted file mode 100644
index 3aa11d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-// 7, 19 -> 7, 28
-class BodyDeclOnSameLine {
-	private final static String BAR= "c";
-	private final static String FOO=  "a"; private static final String CONSTANT= FOO + BAR;  /* ambiguous */ String strange= "b"; //$NON-NLS-1$ //$NON-NLS-2$
-
-	void m() {
-		String s= CONSTANT;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_in.java
deleted file mode 100644
index c2834b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//  4, 28 -> 4, 37
-class EndsOnSameLine {
-	void m() {
-		System.out.println(FOO + FOO);
-	}
-
-	static final String FOO= "foo";} // $NON-NLS-1$
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_out.java
deleted file mode 100644
index fa66a97..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//  4, 28 -> 4, 37
-class EndsOnSameLine {
-	void m() {
-		System.out.println(CONSTANT);
-	}
-
-	static final String FOO= "foo"; private static final String CONSTANT= FOO + FOO;} // $NON-NLS-1$
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_in.java
deleted file mode 100644
index 66ad43a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//8, 16 -> 8, 27   AllowLoadtime == false
-package p;
-class A {
-	static final int foo= 1;
-	static final int bar= 2;
-	static final int baz= 3;
-	void f() {
-		int i= 1 + 3 * bar;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_out.java
deleted file mode 100644
index 87cffcf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//8, 16 -> 8, 27   AllowLoadtime == false
-package p;
-class A {
-	static final int foo= 1;
-	static final int bar= 2;
-	private static final int CONSTANT= 1 + 3 * bar;
-	static final int baz= 3;
-	void f() {
-		int i= CONSTANT;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_in.java
deleted file mode 100644
index d049fb1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//8, 16 -> 8, 27   AllowLoadtime == false
-package p;
-class A {
-	static final int foo= 1;
-	static final int bar= 2;
-	static final int baz= foo * (1+3*bar);
-	void f() {
-		int i= 1 + 3 * bar;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_out.java
deleted file mode 100644
index 62aeeb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//8, 16 -> 8, 27   AllowLoadtime == false
-package p;
-class A {
-	static final int foo= 1;
-	static final int bar= 2;
-	private static final int CONSTANT= 1 + 3 * bar;
-	static final int baz= foo * (CONSTANT);
-	void f() {
-		int i= CONSTANT;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_in.java
deleted file mode 100644
index 9eb2244..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//5, 23 -> 5, 34   AllowLoadtime == false
-package p;
-class A {
-	static void f() {
-		int i= 2*(1 + 2 * b() * 5);
-		System.out.println(i);
-		System.out.println(2*b     ()*5  +1);
-	}
-	static int b() {
-		return 4;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_out.java
deleted file mode 100644
index bf3031a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//5, 23 -> 5, 34   AllowLoadtime == false
-package p;
-class A {
-	private static final int CONSTANT= 2 * b() * 5;
-	static void f() {
-		int i= 2*(1 + CONSTANT);
-		System.out.println(i);
-		System.out.println(CONSTANT  +1);
-	}
-	static int b() {
-		return 4;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_in.java
deleted file mode 100644
index b871560..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//11, 20 -> 11, 26   AllowLoadtime == true
-package p;
-
-class R {
-	static int rG() {
-		return 2;
-	}
-
-	static class S extends R {
-		int f(){
-			int d= R.rG();
-			return d;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_out.java
deleted file mode 100644
index cc45ec7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//11, 20 -> 11, 26   AllowLoadtime == true
-package p;
-
-class R {
-	static int rG() {
-		return 2;
-	}
-
-	static class S extends R {
-		private static final int CONSTANT= R.rG();
-		int f(){
-			int d= CONSTANT;
-			return d;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_in.java
deleted file mode 100644
index 4d28bf7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//13, 20 -> 13, 35   AllowLoadtime == true
-package p;
-
-class R {
-	public static R instance= new R();
-	
-	int rF() {
-		return 1;
-	}
-	
-	static class S extends R {
-		int f(){
-			int d= R.instance.rF();		
-			return 0;	
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_out.java
deleted file mode 100644
index 931e69e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_out.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//13, 20 -> 13, 35   AllowLoadtime == true
-package p;
-
-class R {
-	public static R instance= new R();
-	
-	int rF() {
-		return 1;
-	}
-	
-	static class S extends R {
-		private static final int CONSTANT= R.instance.rF();
-		int f(){
-			int d= CONSTANT;		
-			return 0;	
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_in.java
deleted file mode 100644
index 001007d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//12, 20 -> 12, 28   AllowLoadtime == true
-package p;
-
-
-class R {
-	static int rG() {
-		return 2;	
-	}
-	
-	static class S extends R {
-		void f(){
-			int d= p.R.rG();	
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_out.java
deleted file mode 100644
index 82d01e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//12, 20 -> 12, 28   AllowLoadtime == true
-package p;
-
-
-class R {
-	static int rG() {
-		return 2;	
-	}
-	
-	static class S extends R {
-		private static final int CONSTANT= p.R.rG();
-		void f(){
-			int d= CONSTANT;	
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_in.java
deleted file mode 100644
index 59610d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//8, 16 -> 8, 22   AllowLoadtime == true
-package p;
-
-class S {
-	static int s;
-
-	int f() {
-		return 23 * s;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_out.java
deleted file mode 100644
index 186eeb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//8, 16 -> 8, 22   AllowLoadtime == true
-package p;
-
-class S {
-	static int s;
-	private static final int CONSTANT= 23 * s;
-
-	int f() {
-		return CONSTANT;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_in.java
deleted file mode 100644
index 87db857..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 6, 24 -> 6, 29
-package p;
-
-class A {
-	void foob() {
-		int a= 2 * 3 + 3 + 1;
-
-		int b= (3 + 1) + 1*1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_out.java
deleted file mode 100644
index de08992..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 6, 24 -> 6, 29
-package p;
-
-class A {
-	private static final int CONSTANT= 3 + 1;
-	void foob() {
-		int a= 2 * 3 + CONSTANT;
-
-		int b= (CONSTANT) + 1*1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_in.java
deleted file mode 100644
index b2d2c71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//5, 18 -> 5, 18   AllowLoadtime == false
-package p;
-class A {
-	void f() {
-		int i= 100;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_out.java
deleted file mode 100644
index 81d5e7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//5, 18 -> 5, 18   AllowLoadtime == false
-package p;
-class A {
-	private static final int CONSTANT= 100;
-	void f() {
-		int i= CONSTANT;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail0.java
deleted file mode 100644
index 5ebd210..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail0.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//8, 16 -> 8, 21   AllowLoadtime == true
-package p;
-
-class S {
-	int s;
-	
-	void f(){
-		int l= s + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail1.java
deleted file mode 100644
index bc91ca4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//8, 16 -> 8, 26   AllowLoadtime == true
-package p;
-
-class S {
-	int s;
-		
-	int f() {
-		return 23 *this.s;	
-	}
-}	

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail10.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail10.java
deleted file mode 100644
index ae366f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail10.java
+++ /dev/null

@@ -1,19 +0,0 @@
-//15, 20 -> 15, 37   AllowLoadtime == false
-package p;
-
-class R {
-	static R instance() {
-		return null;
-	}
-	
-	int rF() {
-		return 1;	
-	}
-	
-	static class S extends R {
-		int f(){
-			int d= R.instance().rF();		
-			return 0;	
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail11.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail11.java
deleted file mode 100644
index 77096bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail11.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//8, 16 -> 8, 22   AllowLoadtime == false
-package p;
-
-class S {
-	static int s;
-		
-	int f() {
-		return 23 * s;	
-	}
-}	

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail12.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail12.java
deleted file mode 100644
index 1ffe9d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail12.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//4, 7 -> 4, 8   AllowLoadtime == true
-package p;
-
-class S {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail13.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail13.java
deleted file mode 100644
index af9a246..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail13.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//2, 9 -> 2, 10   AllowLoadtime == true
-package p;
-
-class S {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail14.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail14.java
deleted file mode 100644
index 2d28a7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail14.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//5, 9 -> 5, 11   AllowLoadtime == true
-package p;
-
-class S {
-	int i= 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail15.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail15.java
deleted file mode 100644
index 062140a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail15.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//5, 10 -> 5, 13   AllowLoadtime == true
-package p;
-
-class S {
-	int i= 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail2.java
deleted file mode 100644
index 01cc4e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail2.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//9, 20 -> 9, 21   AllowLoadtime == true
-package p;
-
-class R {
-	int r;
-	
-	static class S extends R {
-		void f(){
-			int n= r;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail3.java
deleted file mode 100644
index 778b26d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail3.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//9, 18 -> 9, 25   AllowLoadtime == true
-package p;
-
-class R {
-	int r;
-
-	static class S extends R {
-		String f() {
-			fish(super.r);
-			return null;	
-		}
-		static void fish(int parm) {
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail4.java
deleted file mode 100644
index 08045d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail4.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//6, 16 -> 6, 20   AllowLoadtime == true
-package p;
-
-class S {
-	int f(){
-		return f2();	
-	}
-	int f2() {
-		return 0;
-	}
-}	
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail5.java
deleted file mode 100644
index d55f27e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail5.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//9, 16 -> 9, 25   AllowLoadtime == true
-package p;
-
-class S {
-	public int f2() {
-		return 1;	
-	}
-	void f(){
-		int i= this.f2();	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail6.java
deleted file mode 100644
index 0e12a9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail6.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//11, 20 -> 11, 24   AllowLoadtime == true
-package p;
-class R {
-	int rF() {
-		return 1;
-	}
-	
-	
-	static class S extends R {
-		int f(){
-			int t= rF();
-			return t * t;
-		}	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail7.java
deleted file mode 100644
index 836f07d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail7.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//11, 20 -> 11, 34   AllowLoadtime == true
-package p;
-
-class R {
-	int rF() {
-		return 1;
-	}
-	
-	static class S extends R {
-		void foo() {
-			int u= super.rF() + 1;	
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName0.java
deleted file mode 100644
index 34aa9cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName0.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	void foo() {
-		String s= getFooBar();//expected FOO_BAR
-	}
-	static String getFooBar() {
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName1.java
deleted file mode 100644
index e4fadd8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName1.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	void foo() {
-		boolean isfb= isFooBar();//expected FOO_BAR
-	}
-	static boolean isFooBar() {
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral0.java
deleted file mode 100644
index 421fc6e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral0.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void foo() {
-		String s= "Foo.HashMap";//expected FOO_HASHMAP
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral1.java
deleted file mode 100644
index 03eb775..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral1.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void foo() {
-		String s= "Foo/Hash+Map";//expected FOO_HASH_MAP
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/in/A.java
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/in/A.java
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/out/A.java
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/out/A.java
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/in/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/A.java
deleted file mode 100644
index e773ba6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A implements I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/in/A.java
deleted file mode 100644
index dd87960..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/A.java
deleted file mode 100644
index 8a36a2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/in/A.java
deleted file mode 100644
index 6641992..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	public final void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/A.java
deleted file mode 100644
index eb1b77e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public final void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/in/A.java
deleted file mode 100644
index 9f7c410..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/in/A.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package p;
-
-public abstract class A {
-	public abstract void x()   ;
-	//	 TestRunListener implementation
-	public abstract void y() /* nasty */;
-	public abstract void z() // xx
-	;
-
-	/** Javadoc*/abstract public void a () /**post-Javadoc*/;
-
-	/**JD*/
-	
-	//abstract
-	
-	public abstract void b();
-	
-	//destruct
-	public
-	abstract
-	void c
-	()
-	/* Comments*/
-	/** en */
-	// gros!
-	; //post
-	public abstract void d();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/A.java
deleted file mode 100644
index e41ad30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/A.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package p;
-
-public abstract class A implements I {
-	public abstract void x()   ;
-	//	 TestRunListener implementation
-	public abstract void y() /* nasty */;
-	public abstract void z() // xx
-	;
-
-	/** Javadoc*/abstract public void a () /**post-Javadoc*/;
-
-	/**JD*/
-	
-	//abstract
-	
-	public abstract void b();
-	
-	//destruct
-	public
-	abstract
-	void c
-	()
-	/* Comments*/
-	/** en */
-	// gros!
-	; //post
-	public abstract void d();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java
deleted file mode 100644
index c48e504..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract void x();
-	//	 TestRunListener implementation
-	public abstract void y() /* nasty */;
-	public abstract void z() // xx
-	;
-	/** Javadoc*/
-	public abstract void a() /**post-Javadoc*/
-	;
-	/**JD*/
-	public abstract void b();
-	//destruct
-	public abstract void c()
-	/* Comments*/
-	/** en */
-	// gros!
-	; //post
-	public abstract void d();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/in/A.java
deleted file mode 100644
index 2b34eb5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-abstract class A{
-	abstract public void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/A.java
deleted file mode 100644
index b29a790..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-abstract class A implements I{
-	abstract public void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/in/A.java
deleted file mode 100644
index 5e21e43..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	public void m(){}
-	private void f(){
-		A a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/A.java
deleted file mode 100644
index 41cb3cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A implements I{
-	public void m(){}
-	private void f(){
-		I a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/in/A.java
deleted file mode 100644
index 12e1ef3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A extends Object implements Cloneable{
-	public void m(){
-	}
-	protected Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/A.java
deleted file mode 100644
index be2224a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A extends Object implements Cloneable, I{
-	public void m(){
-	}
-	protected Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/in/A.java
deleted file mode 100644
index 5a5dfce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	public void m(){}
-	void f(){
-		A a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/A.java
deleted file mode 100644
index a4a2709..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	void f(){
-		I a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/in/A.java
deleted file mode 100644
index 5a5e889..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/A.java
deleted file mode 100644
index 857dece..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		I a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java
deleted file mode 100644
index 6529d15..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-	public abstract void m1();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/in/A.java
deleted file mode 100644
index 25c6492..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/A.java
deleted file mode 100644
index 2a08fb9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		I a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/in/A.java
deleted file mode 100644
index f8b6018..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/A.java
deleted file mode 100644
index 1e3a413..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/in/A.java
deleted file mode 100644
index ef848e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-		a.m();
-
-		A a1= new A();
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/A.java
deleted file mode 100644
index f175b95..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		I a= new A();
-		a.m();
-
-		A a1= new A();
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/in/A.java
deleted file mode 100644
index 465ce7d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A(), a1 = new A();
-		a.m();
-
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/A.java
deleted file mode 100644
index 66eebc6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A(), a1 = new A();
-		a.m();
-
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/in/A.java
deleted file mode 100644
index 8cde1c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.List;
-
-class A{
-	public List m(){return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/A.java
deleted file mode 100644
index b0e0bdf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.List;
-
-class A implements I{
-	public List m(){return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java
deleted file mode 100644
index a6a02f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-import java.util.List;
-
-/** typecomment template*/
-interface I {
-	public abstract List m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/in/A.java
deleted file mode 100644
index 465ce7d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A(), a1 = new A();
-		a.m();
-
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/A.java
deleted file mode 100644
index f92f6a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		I a= new A(), a1 = new A();
-		a.m();
-
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java
deleted file mode 100644
index 6529d15..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-	public abstract void m1();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/in/A.java
deleted file mode 100644
index 097d162..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A extends Exception {
-	public void m() {}
-	void e() throws A{}
-	void g() {
-		try{
-			e();
-		} catch (A a){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/A.java
deleted file mode 100644
index e5b9c3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A extends Exception implements I {
-	public void m() {}
-	void e() throws A{}
-	void g() {
-		try{
-			e();
-		} catch (A a){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java
deleted file mode 100644
index 0881aa0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/in/A.java
deleted file mode 100644
index ccfb484..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	Class g() {
-		return A.class;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/A.java
deleted file mode 100644
index b0fcab7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	Class g() {
-		return A.class;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/in/A.java
deleted file mode 100644
index 6a11d58..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	void g() {
-		A a= (A)new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/A.java
deleted file mode 100644
index fe659e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	void g() {
-		I a= (I)new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/in/A.java
deleted file mode 100644
index b62808f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		A a= (A)new A();
-		((A)this).m1();
-		((A)this).m();
-		(((A)this)).m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/A.java
deleted file mode 100644
index 2af8159..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		I a= (I)new A();
-		((A)this).m1();
-		((I)this).m();
-		(((I)this)).m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/in/A.java
deleted file mode 100644
index e68557f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	protected A g() {
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/A.java
deleted file mode 100644
index 689cc1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	protected I g() {
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/in/A.java
deleted file mode 100644
index b1a453c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		g().m();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/A.java
deleted file mode 100644
index 9bb324d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected I g() {
-		g().m();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/in/A.java
deleted file mode 100644
index 5b3c42a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		g().m1();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/A.java
deleted file mode 100644
index 75151ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		g().m1();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/in/A.java
deleted file mode 100644
index 034048d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		return this;	
-	}
-}
-class A1 extends A{
-	protected A g() {
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/A.java
deleted file mode 100644
index ea612d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected I g() {
-		return this;	
-	}
-}
-class A1 extends A{
-	protected I g() {
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/in/A.java
deleted file mode 100644
index e35e769..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		return this;	
-	}
-}
-class A1 extends A{
-	protected A g() {
-		g().m1();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/A.java
deleted file mode 100644
index 2792500..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		return this;	
-	}
-}
-class A1 extends A{
-	protected A g() {
-		g().m1();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/in/A.java
deleted file mode 100644
index 8dc8224..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class A{
-	public void m(){
-		List list= new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/A.java
deleted file mode 100644
index c598efa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class A implements I{
-	public void m(){
-		List list= new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/in/A.java
deleted file mode 100644
index bd95d6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	A f(A a){
-		f(a).m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/A.java
deleted file mode 100644
index 10362fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	A f(A a){
-		f(a).m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/in/A.java
deleted file mode 100644
index ac7516b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	A f(A a){
-		f(a).m();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/A.java
deleted file mode 100644
index 0cfc234..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((I)this);
-	}
-	I f(I a){
-		f(a).m();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/in/A.java
deleted file mode 100644
index 73697dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/A.java
deleted file mode 100644
index 2424bbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		I a1= a0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/in/A.java
deleted file mode 100644
index dafae2d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/A.java
deleted file mode 100644
index a7373d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/in/A.java
deleted file mode 100644
index 77c79e4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		a1.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/A.java
deleted file mode 100644
index 32d25a1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		I a1= a0;
-		a1.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/in/A.java
deleted file mode 100644
index a374646..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/A.java
deleted file mode 100644
index 82243b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/in/A.java
deleted file mode 100644
index c8eae54..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		f(a0);
-	}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/A.java
deleted file mode 100644
index 416a922..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		f(a0);
-	}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/in/A.java
deleted file mode 100644
index 7b8503c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		f(a0);
-	}
-	void f(A a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/A.java
deleted file mode 100644
index 1070412..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		f(a0);
-	}
-	void f(I a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/in/A.java
deleted file mode 100644
index 0577366..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		a1.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/A.java
deleted file mode 100644
index 93bff1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		I a1;
-		a1= a0;
-		a1.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/in/A.java
deleted file mode 100644
index c59c6b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/A.java
deleted file mode 100644
index b9deeeb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/in/A.java
deleted file mode 100644
index 8ba1965..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements Cloneable{
-	public void m(){
-	}
-	protected Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/A.java
deleted file mode 100644
index 9304981..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements Cloneable, I{
-	public void m(){
-	}
-	protected Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/in/A.java
deleted file mode 100644
index 5af74a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a1;
-		a1= null;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/A.java
deleted file mode 100644
index 17596e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a1;
-		a1= null;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/in/A.java
deleted file mode 100644
index d51ccac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		A a2= a1;
-		a2.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/A.java
deleted file mode 100644
index 1af56bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		A a2= a1;
-		a2.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/in/A.java
deleted file mode 100644
index 640bb01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		A a2;
-		a2= a1;
-		a2.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/A.java
deleted file mode 100644
index 4172720..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		A a2;
-		a2= a1;
-		a2.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/in/A.java
deleted file mode 100644
index bd58ab2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		((A)a0).m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/A.java
deleted file mode 100644
index 4f1549d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		((I)a0).m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/in/A.java
deleted file mode 100644
index 6e991ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		((A)a0).m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/A.java
deleted file mode 100644
index e032247..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		((A)a0).m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/in/A.java
deleted file mode 100644
index 5638537..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/A.java
deleted file mode 100644
index fb1dd55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/in/A.java
deleted file mode 100644
index 4a13bcf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void f(A a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/A.java
deleted file mode 100644
index 2a68a7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(I a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/in/A.java
deleted file mode 100644
index 2795284..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	A g() {
-		A a= new A();
-		g().m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/A.java
deleted file mode 100644
index 4b67e34..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	A g() {
-		A a= new A();
-		g().m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/in/A.java
deleted file mode 100644
index 4691f69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	A f(A a){
-		f(a).m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/A.java
deleted file mode 100644
index 28a0e57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	A f(A a){
-		f(a).m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/in/A.java
deleted file mode 100644
index a11f579..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/A.java
deleted file mode 100644
index dffad44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/in/A.java
deleted file mode 100644
index d5feb01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-class A{
-	public void m() throws IOException{
-		List list= new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/A.java
deleted file mode 100644
index 0be1335..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-class A implements I{
-	public void m() throws IOException{
-		List list= new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java
deleted file mode 100644
index fec6102..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-import java.io.IOException;
-
-/** typecomment template*/
-interface I {
-	public abstract void m() throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/in/A.java
deleted file mode 100644
index 1393e6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	A a;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/A.java
deleted file mode 100644
index 9e7aff4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	A a;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/in/A.java
deleted file mode 100644
index b8d3883..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	A a;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/A.java
deleted file mode 100644
index 5728437..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	I a;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/in/A.java
deleted file mode 100644
index 07f76ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	A fA;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= fA;
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/A.java
deleted file mode 100644
index 4aaa2cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	A fA;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= fA;
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/in/A.java
deleted file mode 100644
index 0c285d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	A fA;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= fA;
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/A.java
deleted file mode 100644
index f10dd01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	I fA;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		I a= fA;
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A.java
deleted file mode 100644
index e507851..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	protected void f(A a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A1.java
deleted file mode 100644
index 2d54186..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected void f(A a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A.java
deleted file mode 100644
index e68d749..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected void f(I a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A1.java
deleted file mode 100644
index 3eccac6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected void f(I a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A.java
deleted file mode 100644
index e507851..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	protected void f(A a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A1.java
deleted file mode 100644
index a4285b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A.java
deleted file mode 100644
index bed1d04..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected void f(A a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A1.java
deleted file mode 100644
index a4285b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A.java
deleted file mode 100644
index dfb823c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A1.java
deleted file mode 100644
index c6b716d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A.java
deleted file mode 100644
index 2e5f384..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A1.java
deleted file mode 100644
index c6b716d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A.java
deleted file mode 100644
index a63fcbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A1.java
deleted file mode 100644
index d29e8f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A.java
deleted file mode 100644
index 1391097..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected I f(){
-		return this;
-	}
-	void test(){
-		f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A1.java
deleted file mode 100644
index 2de0edc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected I f(){
-		return this;
-	}
-	void test(){
-		f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/in/A.java
deleted file mode 100644
index 6529744..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	int f;
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().f=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/A.java
deleted file mode 100644
index 4dd4223..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	int f;
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().f=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/in/A.java
deleted file mode 100644
index 71717be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import p.A;
-class A {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/A.java
deleted file mode 100644
index 709538d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import p.A;
-class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/in/A.java
deleted file mode 100644
index 075d6ae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A{
-	public List m(Set set) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/A.java
deleted file mode 100644
index 7514b5e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java
deleted file mode 100644
index df6e9a1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-/** typecomment template*/
-interface I {
-	List m(Set set) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/in/A.java
deleted file mode 100644
index a45dd6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	public static void s() {}
-	void t(){
-		A.s();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/A.java
deleted file mode 100644
index ba23032..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	public static void s() {}
-	void t(){
-		A.s();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/in/A.java
deleted file mode 100644
index 373a7ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	public static int s= 0;
-	void t(){
-		A.s= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/A.java
deleted file mode 100644
index c16b697..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	public static int s= 0;
-	void t(){
-		A.s= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/in/A.java
deleted file mode 100644
index 1b847e9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void t(){
-		new A(){
-			void g(){
-				A.this.m1();
-			}
-		};	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/A.java
deleted file mode 100644
index d2a5048..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void t(){
-		new A(){
-			void g(){
-				A.this.m1();
-			}
-		};	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/in/A.java
deleted file mode 100644
index a2b831a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void t(){
-		new A(){
-			void g() throws InterruptedException{
-				A.super.wait();
-			}
-		};	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/A.java
deleted file mode 100644
index 98bff3d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void t(){
-		new A(){
-			void g() throws InterruptedException{
-				A.super.wait();
-			}
-		};	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/A.java
deleted file mode 100644
index 227d1d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void f(Inter i){
-		A a= new A();
-		i.work(a);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/Inter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/Inter.java
deleted file mode 100644
index 06fa9e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/Inter.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-public interface Inter {
-	void work(A a);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/A.java
deleted file mode 100644
index 6eea703..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(Inter i){
-		I a= new A();
-		i.work(a);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/Inter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/Inter.java
deleted file mode 100644
index 505676f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/Inter.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-public interface Inter {
-	void work(I a);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/in/A.java
deleted file mode 100644
index ef34364..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= create();
-		a.m1();
-	}
-	A create(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/A.java
deleted file mode 100644
index 35d13b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= create();
-		a.m1();
-	}
-	A create(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/in/A.java
deleted file mode 100644
index 5be3103..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= create();
-		a.m();
-	}
-	A create(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/A.java
deleted file mode 100644
index 5cc489b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(){
-		I a= create();
-		a.m();
-	}
-	I create(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/A.java
deleted file mode 100644
index a374646..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Inter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Inter.java
deleted file mode 100644
index 147dd9a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Inter.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public interface Inter {
-	void work(A a);
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Outer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Outer.java
deleted file mode 100644
index e09d286..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Outer.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-public class Outer{
-	public static class Implementor implements Inter{	
-		public void work(A a) {}
-	}
-	Implementor implementor;
-	void f(){
-		A a= new A();
-		implementor.work(a);
-	}
-}	

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/A.java
deleted file mode 100644
index 82243b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Inter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Inter.java
deleted file mode 100644
index a6b6364..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Inter.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public interface Inter {
-	void work(I a);
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Outer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Outer.java
deleted file mode 100644
index 3c1a5ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Outer.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-public class Outer{
-	public static class Implementor implements Inter{	
-		public void work(I a) {}
-	}
-	Implementor implementor;
-	void f(){
-		I a= new A();
-		implementor.work(a);
-	}
-}	

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/A.java
deleted file mode 100644
index 4f1f8c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	static A getA(){
-		return null;
-	}
-	public void m(){}
-	public void m1(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/As.java
deleted file mode 100644
index 5aa68d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/As.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		A a= A.getA();
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/A.java
deleted file mode 100644
index 61b7b47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-	static A getA(){
-		return null;
-	}
-	public void m(){}
-	public void m1(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/As.java
deleted file mode 100644
index 5aa68d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/As.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		A a= A.getA();
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/A.java
deleted file mode 100644
index 4f1f8c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	static A getA(){
-		return null;
-	}
-	public void m(){}
-	public void m1(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/As.java
deleted file mode 100644
index 156c195..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/As.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		A a= A.getA();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/A.java
deleted file mode 100644
index be71c7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-	static I getA(){
-		return null;
-	}
-	public void m(){}
-	public void m1(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/As.java
deleted file mode 100644
index 5dfb4a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/As.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		I a= A.getA();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java
deleted file mode 100644
index 2d11b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/in/A.java
deleted file mode 100644
index 4120bb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A{
-	public List m(Set set, Set set1) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/A.java
deleted file mode 100644
index ab8e79e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set, Set set1) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java
deleted file mode 100644
index 6729aef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.Set;
-import java.util.List;
-/** typecomment template*/
-interface I {
-	List m(Set set, Set set1) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/in/A.java
deleted file mode 100644
index 8dc037d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/A.java
deleted file mode 100644
index 7795837..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java
deleted file mode 100644
index c154072..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/A.java
deleted file mode 100644
index 8dc037d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/As.java
deleted file mode 100644
index e0c24ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/As.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		A a= new A();
-		if (a instanceof A){
-		} else {
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/A.java
deleted file mode 100644
index 7795837..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/As.java
deleted file mode 100644
index 2c3680f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/As.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		I a= new A();
-		if (a instanceof I){
-		} else {
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java
deleted file mode 100644
index c154072..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/A.java
deleted file mode 100644
index 90fe4bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-    public void m(A foo) {
-        foo.m(foo);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/As.java
deleted file mode 100644
index b19dc18..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/As.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class As {
-    void r(A foo) {
-        A local= null;
-        foo.m(local);
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/A.java
deleted file mode 100644
index 77fc769..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A implements I {
-    public void m(I foo) {
-        foo.m(foo);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/As.java
deleted file mode 100644
index a18bf9a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/As.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class As {
-    void r(I foo) {
-        I local= null;
-        foo.m(local);
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java
deleted file mode 100644
index eb5999a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m(I foo);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/A.java
deleted file mode 100644
index 4909214..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-public class A implements OldInterface{
-  public int amount(){ return 1;}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/B.java
deleted file mode 100644
index a04ba1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class B implements OldInterface{
-	private void s(){
-		OldInterface i= find();
-	}
-	private A find(){
-		return new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/OldInterface.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/OldInterface.java
deleted file mode 100644
index f140f1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/OldInterface.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public interface OldInterface {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/A.java
deleted file mode 100644
index fbd4aed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-public class A implements OldInterface, I{
-  public int amount(){ return 1;}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/B.java
deleted file mode 100644
index a04ba1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class B implements OldInterface{
-	private void s(){
-		OldInterface i= find();
-	}
-	private A find(){
-		return new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java
deleted file mode 100644
index 6225f07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract int amount();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/OldInterface.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/OldInterface.java
deleted file mode 100644
index f140f1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/OldInterface.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public interface OldInterface {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/A.java
deleted file mode 100644
index 4909214..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-public class A implements OldInterface{
-  public int amount(){ return 1;}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/B.java
deleted file mode 100644
index bdacf80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-public class B implements OldInterface{
-	private void s(){
-		OldInterface i;
-		i= find();
-	}
-	private A find(){
-		return new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/OldInterface.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/OldInterface.java
deleted file mode 100644
index f140f1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/OldInterface.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public interface OldInterface {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/A.java
deleted file mode 100644
index fbd4aed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-public class A implements OldInterface, I{
-  public int amount(){ return 1;}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/B.java
deleted file mode 100644
index bdacf80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-public class B implements OldInterface{
-	private void s(){
-		OldInterface i;
-		i= find();
-	}
-	private A find(){
-		return new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java
deleted file mode 100644
index 6225f07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract int amount();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/OldInterface.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/OldInterface.java
deleted file mode 100644
index f140f1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/OldInterface.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public interface OldInterface {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/A.java
deleted file mode 100644
index 535c1d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A {
-  public int amount(){ return 1;}
-  public void add(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/B.java
deleted file mode 100644
index cdad777..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class B {
-	B(int t, A a){
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/C.java
deleted file mode 100644
index 399856f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-public class C {
-	A fA;
-	void f(){
-		B b= new B(2, fA);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/A.java
deleted file mode 100644
index 910b1ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A implements I {
-  public int amount(){ return 1;}
-  public void add(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/B.java
deleted file mode 100644
index 53bece1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class B {
-	B(int t, I a){
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/C.java
deleted file mode 100644
index 623defa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-public class C {
-	I fA;
-	void f(){
-		B b= new B(2, fA);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java
deleted file mode 100644
index 6225f07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract int amount();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/A.java
deleted file mode 100644
index 535c1d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A {
-  public int amount(){ return 1;}
-  public void add(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/B.java
deleted file mode 100644
index d07a15d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class B {
-	B(int t, A a){
-		a.add();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/C.java
deleted file mode 100644
index 399856f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-public class C {
-	A fA;
-	void f(){
-		B b= new B(2, fA);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/A.java
deleted file mode 100644
index 910b1ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A implements I {
-  public int amount(){ return 1;}
-  public void add(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/B.java
deleted file mode 100644
index d07a15d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class B {
-	B(int t, A a){
-		a.add();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/C.java
deleted file mode 100644
index 399856f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-public class C {
-	A fA;
-	void f(){
-		B b= new B(2, fA);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java
deleted file mode 100644
index 6225f07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract int amount();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/A.java
deleted file mode 100644
index 23ebd6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A {
-	class Inner {
-	  public int amount(){ return 1;}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/B.java
deleted file mode 100644
index 831a28b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class B {
-	B(int t, A.Inner a){
-		a.amount();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/A.java
deleted file mode 100644
index 1278dd9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A {
-	class Inner implements I {
-	  public int amount(){ return 1;}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/B.java
deleted file mode 100644
index 7c02a24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class B {
-	B(int t, I a){
-		a.amount();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java
deleted file mode 100644
index 98b5d6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract int amount();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/in/A.java
deleted file mode 100644
index 249d15e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-    public A m(A foo) {
-        foo.m(foo);
-        return null;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/A.java
deleted file mode 100644
index 8de951a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A implements I {
-    public I m(I foo) {
-        foo.m(foo);
-        return null;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java
deleted file mode 100644
index af9c5f2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract I m(I foo);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/in/A.java
deleted file mode 100644
index 8a60a2a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-    public A getFoo() {
-        return null;
-    }
-    public void foo(A foo) {
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/A.java
deleted file mode 100644
index b0e08bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-    public I getFoo() {
-        return null;
-    }
-    public void foo(I foo) {
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java
deleted file mode 100644
index c6db642..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract I getFoo();
-	public abstract void foo(I foo);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/in/A.java
deleted file mode 100644
index 391f87d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A{
-	public List m(Set set, String string) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/A.java
deleted file mode 100644
index f105f3a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set, String string) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java
deleted file mode 100644
index 31f4af7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-/** typecomment template*/
-interface I {
-	List m(Set set, String string) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/in/A.java
deleted file mode 100644
index b5e6427..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/in/A.java
+++ /dev/null

@@ -1,51 +0,0 @@
-package p;
-
-public class A {
-	/**
-	 * comment f
-	 */
-	public void f(){
-	} 
-
-	/** comment fz*/
-	public void fz(){
-	} 
-
-	/**
-	 * comment f1
-	 */
-	public void f1(){
-	} 
-
-	/** comment f1z*/
-	public void f1z(){
-	} 
-
-	//comment f11
-	public void f11(){
-	}
-
-	public void f2(){
-	}
-	
-	/** 
-	 * jdoc I1
-	 */
-	public static final int I1= 0;
-
-	/** jdoc I1z*/
-	public static final int I1z= 0;
-
-	/** 
-	 * comI2
-	 */
-	public static final int I2= 0;
-
-	/** com I2z*/
-	public static final int I2z= 0;
-
-	//comment I3
-	public static final int I3= 0;
-
-	public static final int I4= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/A.java
deleted file mode 100644
index d6c56cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/A.java
+++ /dev/null

@@ -1,30 +0,0 @@
-package p;
-
-public class A implements I {
-	/**
-	 * comment f
-	 */
-	public void f(){
-	} 
-
-	/** comment fz*/
-	public void fz(){
-	} 
-
-	/**
-	 * comment f1
-	 */
-	public void f1(){
-	} 
-
-	/** comment f1z*/
-	public void f1z(){
-	} 
-
-	//comment f11
-	public void f11(){
-	}
-
-	public void f2(){
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java
deleted file mode 100644
index f320f1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	/**
-	 * comment f
-	 */
-	public abstract void f();
-	/** comment fz*/
-	public abstract void fz();
-	/**
-	 * comment f1
-	 */
-	public abstract void f1();
-	/** comment f1z*/
-	public abstract void f1z();
-	//comment f11
-	public abstract void f11();
-	public abstract void f2();
-	/** 
-	 * jdoc I1
-	 */
-	public static final int I1= 0;
-
-	/** jdoc I1z*/
-	public static final int I1z= 0;
-
-	/** 
-	 * comI2
-	 */
-	public static final int I2= 0;
-
-	/** com I2z*/
-	public static final int I2z= 0;
-
-	//comment I3
-	public static final int I3= 0;
-
-	public static final int I4= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/in/A.java
deleted file mode 100644
index e2cb58a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A {
-	private int x;
-	private A[] v2= null; 
-	void f(A[] v){
-		A[] a= v;
-		a[0].x= 0;
-		A[] v1= null;
-		a= v1;
-		a= v2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/A.java
deleted file mode 100644
index 50afd04..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A implements I {
-	private int x;
-	private A[] v2= null; 
-	void f(A[] v){
-		A[] a= v;
-		a[0].x= 0;
-		A[] v1= null;
-		a= v1;
-		a= v2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/in/A.java
deleted file mode 100644
index 9998396..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	private int x;
-	void f(A[] v){
-		A[] a= v;
-		a[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/A.java
deleted file mode 100644
index 28e3dc3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-	private int x;
-	void f(A[] v){
-		A[] a= v;
-		a[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/in/A.java
deleted file mode 100644
index 5a3af0b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	private int x;
-	void f(A[] v){
-		A[] a= v;
-		g(a);
-	}
-	void g(A[] x){
-		x[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/A.java
deleted file mode 100644
index f470b9f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A implements I {
-	private int x;
-	void f(A[] v){
-		A[] a= v;
-		g(a);
-	}
-	void g(A[] x){
-		x[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/in/A.java
deleted file mode 100644
index c198bd9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	int x;
-}
-class B {
-	A f(){
-		A a= null;
-		return (a);	
-	}
-	void x(){
-		f().x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/A.java
deleted file mode 100644
index 8dea002..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A implements I{
-	int x;
-}
-class B {
-	A f(){
-		A a= null;
-		return (a);	
-	}
-	void x(){
-		f().x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/in/A.java
deleted file mode 100644
index c55a5d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class T{
-	A[] cs;
-	void add(A c){
-		cs[0]= c;
-	}
-	void f(){
-		cs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/A.java
deleted file mode 100644
index a76fdcd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class T{
-	A[] cs;
-	void add(A c){
-		cs[0]= c;
-	}
-	void f(){
-		cs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/in/A.java
deleted file mode 100644
index c38d60a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class Y{
-	A[] cs;
-	void add(A c){
-		cs[0]= c;
-	}
-	void f(){
-		cs[0].x= 0;
-	}
-	void foo(){
-		A[] tab= null;
-		add(tab[0]);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/A.java
deleted file mode 100644
index d288692..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class Y{
-	A[] cs;
-	void add(A c){
-		cs[0]= c;
-	}
-	void f(){
-		cs[0].x= 0;
-	}
-	void foo(){
-		A[] tab= null;
-		add(tab[0]);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/in/A.java
deleted file mode 100644
index 58ba48d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	void add(A c){
-		new A[]{null}[0]= c;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/A.java
deleted file mode 100644
index be66523..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	void add(I c){
-		new I[]{null}[0]= c;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/in/A.java
deleted file mode 100644
index 30f5356..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	A[] cs;
-	void add(A c){
-		(cs= cs)[0]= c;
-		cs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/A.java
deleted file mode 100644
index ea14737..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	A[] cs;
-	void add(A c){
-		(cs= cs)[0]= c;
-		cs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/in/A.java
deleted file mode 100644
index befe09b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	A[] cs;
-	void add(A c){
-		((3 > 4) ? cs: cs)[0]= c;
-		cs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/A.java
deleted file mode 100644
index 7887c32..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	A[] cs;
-	void add(A c){
-		((3 > 4) ? cs: cs)[0]= c;
-		cs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/in/A.java
deleted file mode 100644
index 8dd8734..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	public void m(int i, boolean b, short s, char c, long l, double d){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/A.java
deleted file mode 100644
index 44f67ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public void m(int i, boolean b, short s, char c, long l, double d){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java
deleted file mode 100644
index 873c79f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void m(int i, boolean b, short s, char c, long l, double d);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/in/A.java
deleted file mode 100644
index 082c5c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/in/A.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	void add(A c){
-		gm()[0]= c;
-		
-		gm1()[0]= c;
-		gm1()[0].x= 0;
-	}
-	A[] gm() {
-		return null;
-	}
-	A[] gm1() {
-		return null;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/A.java
deleted file mode 100644
index a5ecb03..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/A.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	void add(A c){
-		gm()[0]= c;
-		
-		gm1()[0]= c;
-		gm1()[0].x= 0;
-	}
-	I[] gm() {
-		return null;
-	}
-	A[] gm1() {
-		return null;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/in/A.java
deleted file mode 100644
index e30a0ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	static A[] scs;
-	void add(A c){
-		p.T.scs[0]= c;
-		p.T.scs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/A.java
deleted file mode 100644
index 5c9a871..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	static A[] scs;
-	void add(A c){
-		p.T.scs[0]= c;
-		p.T.scs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/in/A.java
deleted file mode 100644
index 8140b37..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	A[] cs;
-	void add(A c){
-		(cs)[0]= c;
-		cs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/A.java
deleted file mode 100644
index 9b94fae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class ST{
-}
-class T extends ST{
-	A[] cs;
-	void add(A c){
-		(cs)[0]= c;
-		cs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/in/A.java
deleted file mode 100644
index b936118..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class ST{
-	A[] supercs;
-}
-class T extends ST{
-	void add(A c){
-		super.supercs[0]= c;
-		super.supercs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/A.java
deleted file mode 100644
index 4bcd521..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class ST{
-	A[] supercs;
-}
-class T extends ST{
-	void add(A c){
-		super.supercs[0]= c;
-		super.supercs[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/in/A.java
deleted file mode 100644
index 919c0d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A {
-	int x;
-}
-class ST{
-	 A[] gm() {
-		return null;
-	}
-}
-class T extends ST{
-	void add(A c){
-		super.gm()[0]= c;
-		super.gm()[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/A.java
deleted file mode 100644
index 52e4ed8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A implements I {
-	int x;
-}
-class ST{
-	 A[] gm() {
-		return null;
-	}
-}
-class T extends ST{
-	void add(A c){
-		super.gm()[0]= c;
-		super.gm()[0].x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/in/A.java
deleted file mode 100644
index d12f48e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-	String x[]= {""};
-	A a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/A.java
deleted file mode 100644
index 2fe5c11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A implements I {
-	String x[]= {""};
-	I a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/in/A.java
deleted file mode 100644
index 8e3ee8d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-	String[] x[]= {{""}, {}};
-	A a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/A.java
deleted file mode 100644
index 6491918..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A implements I {
-	String[] x[]= {{""}, {}};
-	I a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/in/A.java
deleted file mode 100644
index 2f12402..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-public class A {
-	public int foo() {
-		return 0;
-	}
-}
-
-class Tester {
-	void bar() {
-		A t= null;
-		int i= t.foo();
-		t.hashCode();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/A.java
deleted file mode 100644
index 57bcc12..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-public class A implements I {
-	public int foo() {
-		return 0;
-	}
-}
-
-class Tester {
-	void bar() {
-		I t= null;
-		int i= t.foo();
-		t.hashCode();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java
deleted file mode 100644
index 5cc02cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract int foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Bar.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Bar.java
deleted file mode 100644
index fc032f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Bar.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-public class Bar {
-
-  private Foo foo;
-  
-  public Foo getFoo() {
-	return foo;
-  }
-
-  public void setFoo(Foo foo) {
-	this.foo = foo;
-  }
-
-  public void useFoo() {
-	foo.foo();
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Foo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Foo.java
deleted file mode 100644
index b9a6a1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Foo.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class Foo {
-  public void foo() {
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Bar.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Bar.java
deleted file mode 100644
index 0add8fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Bar.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-public class Bar {
-
-  private IFoo foo;
-  
-  public IFoo getFoo() {
-	return foo;
-  }
-
-  public void setFoo(IFoo foo) {
-	this.foo = foo;
-  }
-
-  public void useFoo() {
-	foo.foo();
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Foo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Foo.java
deleted file mode 100644
index 6fe8417..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Foo.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class Foo implements IFoo {
-  public void foo() {
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java
deleted file mode 100644
index ab2ea42..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface IFoo {
-	public abstract void foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/A.java
deleted file mode 100644
index 846d1b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-public class A {
-	
-	void bar() {
-		B site = null;
-		baz(site.f, site.f);
-	}
-
-	void baz(C filters, C fs) {
-		filters.foo();
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/B.java
deleted file mode 100644
index 1ca780b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class B  {
-
-	C f = null;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/C.java
deleted file mode 100644
index 4dd423f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/C.java
+++ /dev/null

@@ -1,7 +0,0 @@
-
-package p;
-
-      
-public class C {
-	public void foo () {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/A.java
deleted file mode 100644
index c1693ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-public class A {
-	
-	void bar() {
-		B site = null;
-		baz(site.f, site.f);
-	}
-
-	void baz(C filters, I fs) {
-		filters.foo();
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/B.java
deleted file mode 100644
index 1ca780b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class B  {
-
-	C f = null;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/C.java
deleted file mode 100644
index 12dfe0f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/C.java
+++ /dev/null

@@ -1,7 +0,0 @@
-
-package p;
-
-      
-public class C implements I {
-	public void foo () {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/I.java
deleted file mode 100644
index 8b8de60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/A.java
deleted file mode 100644
index 547553e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-public class A {
-	private void foo() {
-		X idealEndPos[][] = null;
-		X ideal[] = null;
-		ideal[2] = (false
-				? idealEndPos[3][2]
-								 : idealEndPos[2][1]);
-		int j = ideal.length;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/X.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/X.java
deleted file mode 100644
index 63ebf4d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/X.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-
-public class X { }

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/A.java
deleted file mode 100644
index ad5c1c9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-public class A {
-	private void foo() {
-		I idealEndPos[][] = null;
-		I ideal[] = null;
-		ideal[2] = (false
-				? idealEndPos[3][2]
-								 : idealEndPos[2][1]);
-		int j = ideal.length;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/I.java
deleted file mode 100644
index 8b8de60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/X.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/X.java
deleted file mode 100644
index a5cd1ff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/X.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-
-public class X implements I { }

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/A.java
deleted file mode 100644
index dc1caca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A {
-	void foo() {
-		X v1[] = null;
-		X v2[] = null;
-		v2[1] = (true ? null : v1[1]); // BUG
-		v1[1].dot(v2[1]);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/X.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/X.java
deleted file mode 100644
index 3a14843..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/X.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-public class X {
-	public double x;
-	public final double dot(X v) {
-		return v.x;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/A.java
deleted file mode 100644
index dc1caca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A {
-	void foo() {
-		X v1[] = null;
-		X v2[] = null;
-		v2[1] = (true ? null : v1[1]); // BUG
-		v1[1].dot(v2[1]);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java
deleted file mode 100644
index e45987a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	public abstract double dot(X v);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/X.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/X.java
deleted file mode 100644
index 0d6d759..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/X.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-public class X implements I {
-	public double x;
-	public final double dot(X v) {
-		return v.x;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/in/A.java
deleted file mode 100644
index 2e0193a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	public static final int X= 0;
-}
-class Test{
-	void f(A a){
-		int i= a.X;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/A.java
deleted file mode 100644
index cebf70c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-}
-class Test{
-	void f(I a){
-		int i= a.X;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java
deleted file mode 100644
index c6bb871..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/in/A.java
deleted file mode 100644
index ccd75f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	public static final int X= 0;
-}
-class Test{
-	void f(){
-		int i= A.X;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/A.java
deleted file mode 100644
index 8d0c9cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-}
-class Test{
-	void f(){
-		int i= I.X;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java
deleted file mode 100644
index c6bb871..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/in/A.java
deleted file mode 100644
index 1fa8e13..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	public static final int X= 0;
-	public static final int Y= 0;
-}
-class Test{
-	void f(){
-		int i= A.X;
-		i= A.Y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/A.java
deleted file mode 100644
index 4db9edd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A implements I {
-	public static final int Y= 0;
-}
-class Test{
-	void f(){
-		int i= I.X;
-		i= A.Y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java
deleted file mode 100644
index c6bb871..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/in/A.java
deleted file mode 100644
index 35145b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	public static final int X= 0;
-	public static final int Y= 0;
-}
-class Test{
-	void f(A a){
-		int i= a.X;
-		i= a.Y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/A.java
deleted file mode 100644
index b6ef13d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A implements I {
-	public static final int Y= 0;
-}
-class Test{
-	void f(A a){
-		int i= a.X;
-		i= a.Y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java
deleted file mode 100644
index c6bb871..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/in/A.java
deleted file mode 100644
index 82caf1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/in/A.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p;
-class A {
-	public static final int Y= 0;
-	public static final int X= 0;
-}
-class Test{
-	void f(){
-		A a= null;
-		int i= a.X;
-		u(a);
-
-		A a1= null;
-		int i1= a.X;
-		u1(a1);
-	}
-	void u(A a){
-		int u= a.X;
-	}
-	void u1(A a){
-		int u= a.Y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/A.java
deleted file mode 100644
index 74633ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/A.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-class A implements I {
-	public static final int Y= 0;
-}
-class Test{
-	void f(){
-		I a= null;
-		int i= a.X;
-		u(a);
-
-		A a1= null;
-		int i1= a.X;
-		u1(a1);
-	}
-	void u(I a){
-		int u= a.X;
-	}
-	void u1(A a){
-		int u= a.Y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java
deleted file mode 100644
index c6bb871..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/in/A.java
deleted file mode 100644
index 6a6d112..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-
-class A extends ArrayList{
-	public static final int X= 0;
-}
-class Test{
-	void f(A a){
-		x(a);
-	}
-	void x(ArrayList o){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/A.java
deleted file mode 100644
index db15ce3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-
-class A extends ArrayList implements I{
-}
-class Test{
-	void f(A a){
-		x(a);
-	}
-	void x(ArrayList o){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java
deleted file mode 100644
index c6bb871..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/in/A.java
deleted file mode 100644
index 12c8052..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	public static final int X= 0; /*constant comment*/
-
-	public static final int Y= 0; //constant line comment
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/A.java
deleted file mode 100644
index 707deb5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A implements I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java
deleted file mode 100644
index d5db6f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0; /*constant comment*/
-
-	public static final int Y= 0; //constant line comment
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/in/A.java
deleted file mode 100644
index 12c8052..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	public static final int X= 0; /*constant comment*/
-
-	public static final int Y= 0; //constant line comment
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/A.java
deleted file mode 100644
index 707deb5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A implements I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java
deleted file mode 100644
index d5db6f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0; /*constant comment*/
-
-	public static final int Y= 0; //constant line comment
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/in/A.java
deleted file mode 100644
index c0b0f53..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	public static final int X= 0;
-
-	public static final int Y= A.X + A.X;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/A.java
deleted file mode 100644
index 707deb5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A implements I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java
deleted file mode 100644
index 758297c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int X= 0;
-
-	public static final int Y= I.X + I.X;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail/in/A.java
deleted file mode 100644
index 6b249e3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-interface A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail0/in/A.java
deleted file mode 100644
index 6b249e3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail0/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-interface A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail1/in/A.java
deleted file mode 100644
index af50958..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail1/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{}
-interface I{}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/in/A.java
deleted file mode 100644
index 11361e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/A.java
deleted file mode 100644
index 2e796c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface A extends I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/in/A.java
deleted file mode 100644
index 83e7e98..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A extends Cloneable{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/A.java
deleted file mode 100644
index 56853ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface A extends Cloneable, I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/in/A.java
deleted file mode 100644
index 1adef63..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-interface A{
-	public static final int i= 0;
-	int j= 1;
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/A.java
deleted file mode 100644
index 2e796c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface A extends I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java
deleted file mode 100644
index 356c548..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public static final int i= 0;
-
-	int j= 1;
-
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/in/A.java
deleted file mode 100644
index d9a06e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/in/A.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package p;
-interface A{
-	/** method m javadoc comment */
-	void m();
-
-	/** field I javadoc comment */
-	int I= 9;
-
-	/* method m1 regular comment */
-	void m1();
-
-	/* field i1 regular comment */
-	int I1= 9;
-
-	// method m2 line comment
-	void m2();
-
-	// field i2 line comment
-	int I2= 9;
-
-	void m4(); /* method m4 regular comment */
-
-	int I4= 9; /* field i4 regular comment */
-
-	void m5(); // method m5 line comment
-
-	int I5= 9; // field i5 line comment
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/A.java
deleted file mode 100644
index 2e796c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface A extends I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java
deleted file mode 100644
index 80242bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java
+++ /dev/null

@@ -1,29 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	/** method m javadoc comment */
-	void m();
-
-	/** field I javadoc comment */
-	int I= 9;
-
-	/* method m1 regular comment */
-	void m1();
-
-	/* field i1 regular comment */
-	int I1= 9;
-
-	// method m2 line comment
-	void m2();
-
-	// field i2 line comment
-	int I2= 9;
-
-	void m4(); /* method m4 regular comment */
-
-	int I4= 9; /* field i4 regular comment */
-
-	void m5(); // method m5 line comment
-
-	int I5= 9; // field i5 line comment
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/in/A.java
deleted file mode 100644
index dc11ee7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A{
-	A a(A a1, A a2);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/A.java
deleted file mode 100644
index 2e796c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface A extends I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java
deleted file mode 100644
index 9ed2759..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	I a(I a1, I a2);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/in/A.java
deleted file mode 100644
index d01e517..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A{
-	A a();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/A.java
deleted file mode 100644
index 2e796c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface A extends I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java
deleted file mode 100644
index eea1f32..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	I a();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/in/A.java
deleted file mode 100644
index 0aac8d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-interface A{
-	public abstract void foo0();
-	
-	abstract void foo1();
-	
-	public void foo2();	
-	
-	void foo3();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/A.java
deleted file mode 100644
index 2e796c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface A extends I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java
deleted file mode 100644
index f9fbe86..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	public abstract void foo0();
-
-	abstract void foo1();
-
-	public void foo2();
-
-	void foo3();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/in/A.java
deleted file mode 100644
index f8f8d57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/in/A.java
+++ /dev/null

@@ -1,76 +0,0 @@
-package p;
-
-class A {
-	int size = 0;
-	Comparable[] elems = new Comparable[10];
-	public java.util.Iterator iterator() {
-		return new Iterator(this);
-	}
-	public A add(Comparable e) {
-		if (this.size + 1 == this.elems.length) {
-			Comparable[] newElems = new Comparable[2 * this.size];
-			System.arraycopy(this.elems, 0, newElems, 0, this.size);
-			this.elems = newElems;
-		}
-		this.elems[this.size++] = e;
-		return this;
-	}
-	public A addAll(A v1) {
-		java.util.Iterator i = v1.iterator();
-		for (; i.hasNext(); this.add((Comparable) i.next()));
-		return this;
-	}
-	public void sort() { /* insertion sort */
-		for (int i = 1; i < this.size; i++) {
-			Comparable e1 = this.elems[i];
-			int j = i;
-			while ((j > 0) && (this.elems[j - 1].compareTo(e1) > 0)) {
-				this.elems[j] = this.elems[j - 1];
-				j--;
-			}
-			this.elems[j] = e1;
-		}
-	}
-}
-class Iterator implements java.util.Iterator {
-	private int count = 0;
-	private A v2;
-	Iterator(A v3) {
-		this.v2 = v3;
-	}
-	public boolean hasNext() {
-		return this.count < this.v2.size;
-	}
-	public Object next() {
-		return this.v2.elems[this.count++];
-	}
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-}
-class Client {
-	public static void main(String[] args) {
-		A v4 = createList();
-		populate(v4);
-		update(v4);
-		sortList(v4);
-		print(v4);
-	}
-	static A createList() {
-		return new A();
-	}
-	static void populate(A v5) {
-		v5.add("foo").add("bar");
-	}
-	static void update(A v6) {
-		A v7 = new A().add("zap").add("baz");
-		v6.addAll(v7);
-	}
-	static void sortList(A v8) {
-		v8.sort();
-	}
-	static void print(A v9) {
-		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
-			System.out.println("Object: " + iter.next());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/A.java
deleted file mode 100644
index fd4e6df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/A.java
+++ /dev/null

@@ -1,76 +0,0 @@
-package p;
-
-class A implements Bag {
-	int size = 0;
-	Comparable[] elems = new Comparable[10];
-	public java.util.Iterator iterator() {
-		return new Iterator(this);
-	}
-	public Bag add(Comparable e) {
-		if (this.size + 1 == this.elems.length) {
-			Comparable[] newElems = new Comparable[2 * this.size];
-			System.arraycopy(this.elems, 0, newElems, 0, this.size);
-			this.elems = newElems;
-		}
-		this.elems[this.size++] = e;
-		return this;
-	}
-	public Bag addAll(Bag v1) {
-		java.util.Iterator i = v1.iterator();
-		for (; i.hasNext(); this.add((Comparable) i.next()));
-		return this;
-	}
-	public void sort() { /* insertion sort */
-		for (int i = 1; i < this.size; i++) {
-			Comparable e1 = this.elems[i];
-			int j = i;
-			while ((j > 0) && (this.elems[j - 1].compareTo(e1) > 0)) {
-				this.elems[j] = this.elems[j - 1];
-				j--;
-			}
-			this.elems[j] = e1;
-		}
-	}
-}
-class Iterator implements java.util.Iterator {
-	private int count = 0;
-	private A v2;
-	Iterator(A v3) {
-		this.v2 = v3;
-	}
-	public boolean hasNext() {
-		return this.count < this.v2.size;
-	}
-	public Object next() {
-		return this.v2.elems[this.count++];
-	}
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-}
-class Client {
-	public static void main(String[] args) {
-		A v4 = createList();
-		populate(v4);
-		update(v4);
-		sortList(v4);
-		print(v4);
-	}
-	static A createList() {
-		return new A();
-	}
-	static void populate(Bag v5) {
-		v5.add("foo").add("bar");
-	}
-	static void update(Bag v6) {
-		Bag v7 = new A().add("zap").add("baz");
-		v6.addAll(v7);
-	}
-	static void sortList(A v8) {
-		v8.sort();
-	}
-	static void print(Bag v9) {
-		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
-			System.out.println("Object: " + iter.next());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java
deleted file mode 100644
index 4856a01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.Iterator;
-
-/** typecomment template*/
-interface Bag {
-	public abstract java.util.Iterator iterator();
-	public abstract Bag add(Comparable e);
-	public abstract Bag addAll(Bag v1);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/in/A.java
deleted file mode 100644
index 02d5d06..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/in/A.java
+++ /dev/null

@@ -1,76 +0,0 @@
-package p;
-
-class A {
-	int size = 0;
-	Comparable[] elems = new Comparable[10];
-	public java.util.Iterator iterator() {
-		return new Iterator(this);
-	}
-	public A add(Comparable e) {
-		if (size + 1 == elems.length) {
-			Comparable[] newElems = new Comparable[2 * size];
-			System.arraycopy(elems, 0, newElems, 0, size);
-			elems = newElems;
-		}
-		elems[size++] = e;
-		return this;
-	}
-	public A addAll(A v1) {
-		java.util.Iterator i = v1.iterator();
-		for (; i.hasNext(); add((Comparable) i.next()));
-		return this;
-	}
-	public void sort() { /* insertion sort */
-		for (int i = 1; i < size; i++) {
-			Comparable e1 = elems[i];
-			int j = i;
-			while ((j > 0) && (elems[j - 1].compareTo(e1) > 0)) {
-				elems[j] = elems[j - 1];
-				j--;
-			}
-			elems[j] = e1;
-		}
-	}
-}
-class Iterator implements java.util.Iterator {
-	private int count = 0;
-	private A v2;
-	Iterator(A v3) {
-		v2 = v3;
-	}
-	public boolean hasNext() {
-		return count < v2.size;
-	}
-	public Object next() {
-		return v2.elems[count++];
-	}
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-}
-class Client {
-	public static void main(String[] args) {
-		A v4 = createList();
-		populate(v4);
-		update(v4);
-		sortList(v4);
-		print(v4);
-	}
-	static A createList() {
-		return new A();
-	}
-	static void populate(A v5) {
-		v5.add("foo").add("bar");
-	}
-	static void update(A v6) {
-		A v7 = new A().add("zap").add("baz");
-		v6.addAll(v7);
-	}
-	static void sortList(A v8) {
-		v8.sort();
-	}
-	static void print(A v9) {
-		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
-			System.out.println("Object: " + iter.next());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/A.java
deleted file mode 100644
index 386c09e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/A.java
+++ /dev/null

@@ -1,76 +0,0 @@
-package p;
-
-class A implements Bag {
-	int size = 0;
-	Comparable[] elems = new Comparable[10];
-	public java.util.Iterator iterator() {
-		return new Iterator(this);
-	}
-	public Bag add(Comparable e) {
-		if (size + 1 == elems.length) {
-			Comparable[] newElems = new Comparable[2 * size];
-			System.arraycopy(elems, 0, newElems, 0, size);
-			elems = newElems;
-		}
-		elems[size++] = e;
-		return this;
-	}
-	public Bag addAll(Bag v1) {
-		java.util.Iterator i = v1.iterator();
-		for (; i.hasNext(); add((Comparable) i.next()));
-		return this;
-	}
-	public void sort() { /* insertion sort */
-		for (int i = 1; i < size; i++) {
-			Comparable e1 = elems[i];
-			int j = i;
-			while ((j > 0) && (elems[j - 1].compareTo(e1) > 0)) {
-				elems[j] = elems[j - 1];
-				j--;
-			}
-			elems[j] = e1;
-		}
-	}
-}
-class Iterator implements java.util.Iterator {
-	private int count = 0;
-	private A v2;
-	Iterator(A v3) {
-		v2 = v3;
-	}
-	public boolean hasNext() {
-		return count < v2.size;
-	}
-	public Object next() {
-		return v2.elems[count++];
-	}
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-}
-class Client {
-	public static void main(String[] args) {
-		A v4 = createList();
-		populate(v4);
-		update(v4);
-		sortList(v4);
-		print(v4);
-	}
-	static A createList() {
-		return new A();
-	}
-	static void populate(Bag v5) {
-		v5.add("foo").add("bar");
-	}
-	static void update(Bag v6) {
-		Bag v7 = new A().add("zap").add("baz");
-		v6.addAll(v7);
-	}
-	static void sortList(A v8) {
-		v8.sort();
-	}
-	static void print(Bag v9) {
-		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
-			System.out.println("Object: " + iter.next());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java
deleted file mode 100644
index 4856a01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.Iterator;
-
-/** typecomment template*/
-interface Bag {
-	public abstract java.util.Iterator iterator();
-	public abstract Bag add(Comparable e);
-	public abstract Bag addAll(Bag v1);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/in/A.java
deleted file mode 100644
index 5a77a02..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	int notExtracted= 0;
-	private A v2;
-	void f(A v3){
-		this.v2= v3;
-		this.v2.notExtracted= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/A.java
deleted file mode 100644
index 0f93cdc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements Bag {
-	int notExtracted= 0;
-	private A v2;
-	void f(A v3){
-		this.v2= v3;
-		this.v2.notExtracted= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/Bag.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/Bag.java
deleted file mode 100644
index 6e5fc34..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/Bag.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface Bag {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/.cvsignore
deleted file mode 100644
index 9caf6f2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-.metadata

-bin

-*.class
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.classpath b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.classpath
deleted file mode 100644
index 5aeb3db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.classpath
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-    <classpathentry kind="src" path=""/>

-    <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>

-    <classpathentry kind="output" path="bin"/>

-</classpath>


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.cvsignore
deleted file mode 100644
index 4fdcfd7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin

-.classpath

-*.class
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.project b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.project
deleted file mode 100644
index c1e1775..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>ExtractMethodTests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A.java
deleted file mode 100644
index d70a00b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-public class A{
-	public void foo() {
-		int i= 0;
-		int y= 0;
-		
-		int system= 0;
-		
-		System.out.println(i + y);
-
-		System.out.println("Dirk");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A_test450.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A_test450.java
deleted file mode 100644
index 3e31e3a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A_test450.java
+++ /dev/null

@@ -1,10 +0,0 @@
-public class A_test450 {
-	public void foo() {
-		try {
-			/*]*/g();/*[*/
-		} catch (java.io.IOException e) {
-		}
-	}
-	public void g() throws java.io.IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/BBB.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/BBB.java
deleted file mode 100644
index 60e421a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/BBB.java
+++ /dev/null

@@ -1,46 +0,0 @@
-public class BBB {
-	public void foo() {
-		int i= 0;
-		BBB b= new BBB();
-		BBB[] bb= new BBB[10];
-		if (i == 0 && i == 10 && b instanceof BBB)
-			foo();
-		while(i++ == 10) {
-			foo();
-		}
-		i--;
-		
-		while(i++ == 10)
-			foo();
-		i--;
-		
-		do {
-		} while (i < 10);	
-		
-		for (int x= 0, o= 0; x < 10; x++, o++);
-		 {
-			foo();
-			int z;//= x;
-		}
-		
-		try {
-			foo();
-		} catch (Exception e) {
-		} finally {
-		}
-		
-		switch (i) {
-			case 10:
-				foo();
-			case 20:
-				foo();
-			default:
-				foo();
-		}
-	}
-	public int g() {
-		g();
-		return 1;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_5690.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_5690.java
deleted file mode 100644
index 559cf1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_5690.java
+++ /dev/null

@@ -1,13 +0,0 @@
-public class Bug_5690 {
-	public void foo() {
-		Object runnable= null;
-		Object[] disposeList= null;
-		for (int i=0; i < disposeList.length; i++) {
-			if (disposeList [i] == null) {
-				disposeList [i] = runnable;
-				return;
-			}
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/C.java
deleted file mode 100644
index 5dbee96..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/C.java
+++ /dev/null

@@ -1,5 +0,0 @@
-public class C {
-	void f(){
-		C i= new /*[*/C/*]*/();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java
deleted file mode 100644
index 35673b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java
+++ /dev/null

@@ -1,29 +0,0 @@
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-public class D {
-	public static class MyException extends Exception {
-	}
-	
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 10;
-		try {
-			try {
-				if (flag)
-					throw new IOException();
-				if (!flag)
-					throw new MyException();
-			} catch (IOException e) {
-			}
-			i= 10;
-		} catch (MyException e) {
-		}
-		read(i);
-	}
-
-	private void read(int i) {
-	}	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/E.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/E.java
deleted file mode 100644
index ad6960f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/E.java
+++ /dev/null

@@ -1,12 +0,0 @@
-public class E {
-	boolean flag;
-	public void foo() {
-		int i= 0;
-		if (flag) {
-			i= 1;
-		} else {
-			i= 2;
-		}
-		System.out.println(i);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/L.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/L.java
deleted file mode 100644
index 91d302c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/L.java
+++ /dev/null

@@ -1,20 +0,0 @@
-public class L {
-
-	public void foo() {
-		int x= 0;
-		
-		x++;
-		
-		// x= 10;
-		int y= x;
-	}
-	
-	public void g(int x) {
-	}
-	
-	public int bar() {
-		bar();
-		return 10;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/MyTest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/MyTest.java
deleted file mode 100644
index 949aaa9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/MyTest.java
+++ /dev/null

@@ -1,8 +0,0 @@
-public class MyTest {
-  public void test() {
-    Object object = new Object() {
-      public void name() {
-      }
-    };
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Philippe.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Philippe.java
deleted file mode 100644
index f7df895..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Philippe.java
+++ /dev/null

@@ -1,13 +0,0 @@
-public class Philippe {
-	void foo(final int out){
-		String tab[] = /*START*/{"hello", "world" } /*END*/;       
-	}
-	
-	public void foo2(int i) {
-		String /*START*/str = "ggg"/*END*/;
-	}
-	
-	public void foo3() {
-		int i= 10, j= 30;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10031.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10031.java
deleted file mode 100644
index 5a65aed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10031.java
+++ /dev/null

@@ -1,15 +0,0 @@
-public class T10031 {
-	private static Object fValue;
-	
-	public static void foo() {
-		setValue(null);
-	}
-
-	public static void setValue(Object value) {
-		fValue= value;
-	}
-
-	public static Object getValue() {
-		return fValue;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10245.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10245.java
deleted file mode 100644
index 9bd2ef6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10245.java
+++ /dev/null

@@ -1,12 +0,0 @@
-public class T10245 {
-	T10245 f;
-	public T10245 a() {
-		a().f= a();
-		
-		/*[*/
-		int y= 0;
-		a().f= a(); /*[*/
-		return null;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337.java
deleted file mode 100644
index 8bbc782..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337.java
+++ /dev/null

@@ -1,6 +0,0 @@
-public class T11337 {
-	void f(byte bytes) {
-		String s= "k";
-		/*[*/System.out.println(s + " " + bytes); /*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337_1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337_1.java
deleted file mode 100644
index 2b17b7f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337_1.java
+++ /dev/null

@@ -1,5 +0,0 @@
-public class T11337_1 {
-	void f(byte bytes) {
-		/*[*/System.out.println(bytes); /*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T4165.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T4165.java
deleted file mode 100644
index c53aee0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T4165.java
+++ /dev/null

@@ -1,13 +0,0 @@
-public class T4165 {
-	void m(int i) {
-		for (;;) {
-			//---
-			if (i == 0)
-				continue;	
-			if (i != 5)	
-				continue;	
-			//---	
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T7368.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T7368.java
deleted file mode 100644
index a506c77..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T7368.java
+++ /dev/null

@@ -1,6 +0,0 @@
-public class T7368 {
-	public void foo() {
-		int f= (/*[*/2/*]*/);
-		// int u= new T7368[/*[*/1+ 3/*[*/].length;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T9815.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T9815.java
deleted file mode 100644
index c7e194e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T9815.java
+++ /dev/null

@@ -1,10 +0,0 @@
-public class T9815 {
-	void f1() {
-		String j= ex();
-	}
-
-	String ex() {
-		return /*[*/"text"/*]*/;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Test.java
deleted file mode 100644
index 01c1179..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Test.java
+++ /dev/null

@@ -1,9 +0,0 @@
-public class Test {
-	public void foo() {
-		foo();
-		/* comment */int i= 0;/*[*/
-		// comment
-		/** comment */
-		foo();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Wcf.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Wcf.java
deleted file mode 100644
index 651c238..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Wcf.java
+++ /dev/null

@@ -1,13 +0,0 @@
-public class Wcf {
-	void hg(){
-		class A extends B {
-			void m(){
-				f();   //<<<<<<<<
-			}
-		}
-	}  
-}  
-
-class B {
-	void f(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/X.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/X.java
deleted file mode 100644
index c57bf9f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/X.java
+++ /dev/null

@@ -1,22 +0,0 @@
-public class X {
-	class Inner extends Exception {
-	}
-}
-class DD extends X.Inner {
-	DD() {
-		new X().super();
-	}
-	public final static boolean DEBUG= true;
-	public void foo0() {
-		try {
-			d();
-		} catch (X.Inner e) {
-		}
-	}
-
-	protected void d() throws X.Inner {
-		if (DEBUG)
-			throw new X().new Inner();//<<SELECT AND EXTRACT
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Z.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Z.java
deleted file mode 100644
index 167588f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Z.java
+++ /dev/null

@@ -1,26 +0,0 @@
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public abstract class Z {
-	public volatile boolean flag;
-	
-	public Object foo() throws NumberFormatException {
-		InputStreamReader in= null;
-		try {
-			bar();
-			return new Object();
-		} catch (IOException e) {
-			throw new NumberFormatException();
-		} finally {
-			if (in != null) {
-				try {
-					in.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-	
-	public abstract void bar() throws IOException;
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test750.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test750.java
deleted file mode 100644
index 4c696e9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test750.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package branch_in;
-
-public class A_test750 {
-	public volatile boolean flag;
-
-	public void foo() {
-		/*[*/for (int i= 0; i < 10; i++) {
-			if (flag)
-				continue;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test751.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test751.java
deleted file mode 100644
index eefb9da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test751.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package branch_in;
-
-public class A_test751 {
-	public volatile boolean flag;
-
-	public void foo() {
-		/*[*/for (int i= 0; i < 10; i++) {
-			if (flag)
-				break;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test752.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test752.java
deleted file mode 100644
index f349591..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test752.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package branch_in;
-
-public class A_test752 {
-	public volatile boolean flag;
-
-	public void foo() {
-		/*[*/while (flag) {
-			if (flag)
-				continue;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test753.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test753.java
deleted file mode 100644
index f029505..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test753.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package branch_in;
-
-public class A_test753 {
-	public volatile boolean flag;
-
-	public void foo() {
-		/*[*/while (flag) {
-			if (flag)
-				break;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test754.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test754.java
deleted file mode 100644
index 7673402..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test754.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package branch_in;
-
-public class A_test754 {
-	public volatile boolean flag;
-
-	public void foo() {
-		/*[*/do {
-			if (flag)
-				continue;
-		} while (flag);/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test755.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test755.java
deleted file mode 100644
index 3de0c89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test755.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package branch_in;
-
-public class A_test755 {
-	public volatile boolean flag;
-
-	public void foo() {
-		/*[*/do {
-			if (flag)
-				break;
-		} while (flag);/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test750.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test750.java
deleted file mode 100644
index c3b9ca3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test750.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package branch_out;
-
-public class A_test750 {
-	public volatile boolean flag;
-
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/for (int i= 0; i < 10; i++) {
-			if (flag)
-				continue;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test751.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test751.java
deleted file mode 100644
index b28abf6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test751.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package branch_out;
-
-public class A_test751 {
-	public volatile boolean flag;
-
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/for (int i= 0; i < 10; i++) {
-			if (flag)
-				break;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test752.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test752.java
deleted file mode 100644
index b2ec754..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test752.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package branch_out;
-
-public class A_test752 {
-	public volatile boolean flag;
-
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/while (flag) {
-			if (flag)
-				continue;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test753.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test753.java
deleted file mode 100644
index 13597d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test753.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package branch_out;
-
-public class A_test753 {
-	public volatile boolean flag;
-
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/while (flag) {
-			if (flag)
-				break;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test754.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test754.java
deleted file mode 100644
index 416e15e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test754.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package branch_out;
-
-public class A_test754 {
-	public volatile boolean flag;
-
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/do {
-			if (flag)
-				continue;
-		} while (flag);/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test755.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test755.java
deleted file mode 100644
index 0cd6867..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test755.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package branch_out;
-
-public class A_test755 {
-	public volatile boolean flag;
-
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/do {
-			if (flag)
-				break;
-		} while (flag);/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1050.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1050.java
deleted file mode 100644
index 3b03391..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1050.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package destination_in;
-
-public class A_test1050 {
-	public class Inner {
-		public void foo() {
-			/*[*/bar();/*]*/
-		}
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1051.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1051.java
deleted file mode 100644
index 3415bcd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1051.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package destination_in;
-
-public class A_test1051 {
-	public void foo() {
-		Runnable r= new Runnable() {
-			public void run() {
-				/*[*/bar();/*]*/
-			}
-		};
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1050.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1050.java
deleted file mode 100644
index b18f35a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1050.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package destination_out;
-
-public class A_test1050 {
-	public class Inner {
-		public void foo() {
-			extracted();
-		}
-	}
-	public void bar() {
-	}
-	protected void extracted() {
-		/*[*/bar();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1051.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1051.java
deleted file mode 100644
index 5b63d61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1051.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package destination_out;
-
-public class A_test1051 {
-	public void foo() {
-		Runnable r= new Runnable() {
-			public void run() {
-				extracted();
-			}
-		};
-	}
-	public void bar() {
-	}
-	protected void extracted() {
-		/*[*/bar();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test950.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test950.java
deleted file mode 100644
index 131e7fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test950.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package duplicates_in;
-
-public class A_test950 {
-	void f(){
-		int i= 0;
-		int j= 1;
-		int k= /*[*/i+j/*]*/;
-
-		int i1= 0;
-		int j1= 1;
-		int k1= i+j;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test951.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test951.java
deleted file mode 100644
index 663aae4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test951.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package duplicates_in;
-
-public class A_test951 {
-	void foo() {
-		/*[*/System.out.println("Eclipse");/*]*/
-		System.out.println("Eclipse");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test952.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test952.java
deleted file mode 100644
index f018b9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test952.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package duplicates_in;
-
-public class A_test952 {
-	void foo() {
-		/*[*/bar();/*]*/
-		bar();
-	}
-	
-	void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test953.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test953.java
deleted file mode 100644
index b25e79e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test953.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package duplicates_in;
-
-public class A_test953 {
-	void foo() {
-		int i =10;
-		/*[*/bar(i);/*]*/
-		
-		int j= 10;
-		bar(j);
-	}
-	
-	void bar(int x) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test954.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test954.java
deleted file mode 100644
index 5c2b645..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test954.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package duplicates_in;
-
-public class A_test954 {
-	void foo() {
-		/*[*/System.out.println("Eclipse");/*]*/
-		if (true)
-			System.out.println("Eclipse");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test955.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test955.java
deleted file mode 100644
index 5c1abb3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test955.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package duplicates_in;
-
-public class A_test955 {
-	void foo() {
-		/*[*/bar();
-		bar();/*]*/
-		bar();
-		bar();
-	}
-	void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test956.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test956.java
deleted file mode 100644
index 732a78a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test956.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package duplicates_in;
-
-// don't extract second occurence of
-// 2 since it is in a inner class
-public class A_test956 {
-	void foo() {
-		int y= /*[*/2/*]*/;
-	}
-	class Inner {
-		void foo() {
-			int y1= 2;
-		}
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test957.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test957.java
deleted file mode 100644
index 19019e9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test957.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package duplicates_in;
-
-public class A_test957 {
-	public void f() {
-		int i = 17;
-		int k = 1;
-
-		/*[*/i++;/*]*/
-		k++;
-
-		System.out.println(i);
-		System.out.println(k);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test958.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test958.java
deleted file mode 100644
index 796f4fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test958.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package duplicates_in;
-
-public class A_test958 {
-	private Object fO;
-
-	public void method0() {
-		/*[*/Object o2= fO;/*]*/
-		fO= o2;
-	}
-
-	public void method1() {
-		Object o= fO;
-		fO= o;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test959.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test959.java
deleted file mode 100644
index 683fda2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test959.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package duplicates_in;
-
-public class A_test959 {
-	public void foo() {
-		int x= 10;
-		int y= /*[*/x/*]*/;
-		x= 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test960.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test960.java
deleted file mode 100644
index 39390e3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test960.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package duplicates_in;
-
-public class A_test960 {
-	private Object fO;
-
-	public void foo() {
-		/*[*/fO= new Object();/*]*/
-	}
-	public void bar() {
-		foo();
-		fO= new Object();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test961.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test961.java
deleted file mode 100644
index a009a7f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test961.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package duplicates_in;
-
-public class A_test961 {
-	private Object fO;
-
-	public void foo(Object o) {
-		/*[*/fO= o;/*]*/
-	}
-	public void bar(Object x) {
-		foo(x);
-		fO= x;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test962.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test962.java
deleted file mode 100644
index 739c90f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test962.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package duplicates_in;
-
-public class A_test962 {
-	private Object object;
-	public A_test962() {
-	  this.object = new Object();
-	  System.out.println(/*[*/this.object/*]*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test963.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test963.java
deleted file mode 100644
index 6566f9e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test963.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package duplicates_in;
-
-public class A_test963 {
-	void test() {
-		new Object() {
-			public void yes() {
-				/*[*/System.out.println("hello world");/*]*/
-			}
-		};
-		System.out.println("hello world");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test964.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test964.java
deleted file mode 100644
index 502542f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test964.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package duplicates_in;
-
-public class A_test964 {
-	void test() {
-		new Object() {
-			public void yes() {
-				yes();
-				System.out.println("hello world");
-			}
-		};
-		/*[*/System.out.println("hello world");/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test950.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test950.java
deleted file mode 100644
index 80deedd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test950.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package duplicates_out;
-
-public class A_test950 {
-	void f(){
-		int i= 0;
-		int j= 1;
-		int k= extracted(i, j);
-
-		int i1= 0;
-		int j1= 1;
-		int k1= extracted(i, j);
-	}
-
-	protected int extracted(int i, int j) {
-		return /*[*/i+j/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test951.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test951.java
deleted file mode 100644
index 8642d43..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test951.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package duplicates_out;
-
-public class A_test951 {
-	void foo() {
-		extracted();
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/System.out.println("Eclipse");/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test952.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test952.java
deleted file mode 100644
index 1b2f373..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test952.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package duplicates_out;
-
-public class A_test952 {
-	void foo() {
-		extracted();
-		extracted();
-	}
-	
-	protected void extracted() {
-		/*[*/bar();/*]*/
-	}
-
-	void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test953.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test953.java
deleted file mode 100644
index 27a2952..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test953.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package duplicates_out;
-
-public class A_test953 {
-	void foo() {
-		int i =10;
-		extracted(i);
-		
-		int j= 10;
-		extracted(j);
-	}
-	
-	protected void extracted(int i) {
-		/*[*/bar(i);/*]*/
-	}
-
-	void bar(int x) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test954.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test954.java
deleted file mode 100644
index 07a7943..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test954.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package duplicates_out;
-
-public class A_test954 {
-	void foo() {
-		extracted();
-		if (true)
-			extracted();
-	}
-
-	protected void extracted() {
-		/*[*/System.out.println("Eclipse");/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test955.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test955.java
deleted file mode 100644
index 8bd14b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test955.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package duplicates_out;
-
-public class A_test955 {
-	void foo() {
-		extracted();
-		extracted();
-	}
-	protected void extracted() {
-		/*[*/bar();
-		bar();/*]*/
-	}
-	void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test956.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test956.java
deleted file mode 100644
index 7366904..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test956.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package duplicates_out;
-
-// don't extract second occurence of
-// 2 since it is in a inner class
-public class A_test956 {
-	void foo() {
-		int y= extracted();
-	}
-	protected int extracted() {
-		return /*[*/2/*]*/;
-	}
-	class Inner {
-		void foo() {
-			int y1= 2;
-		}
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test957.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test957.java
deleted file mode 100644
index 6c6feb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test957.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package duplicates_out;
-
-public class A_test957 {
-	public void f() {
-		int i = 17;
-		int k = 1;
-
-		i = extracted(i);
-		k = extracted(k);
-
-		System.out.println(i);
-		System.out.println(k);
-	}
-
-	protected int extracted(int i) {
-		/*[*/i++;/*]*/
-		return i;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test958.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test958.java
deleted file mode 100644
index 4d2fca9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test958.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package duplicates_out;
-
-public class A_test958 {
-	private Object fO;
-
-	public void method0() {
-		Object o2 = extracted();
-		fO= o2;
-	}
-
-	protected Object extracted() {
-		/*[*/Object o2= fO;/*]*/
-		return o2;
-	}
-
-	public void method1() {
-		Object o = extracted();
-		fO= o;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test959.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test959.java
deleted file mode 100644
index 92ae853..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test959.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package duplicates_out;
-
-public class A_test959 {
-	public void foo() {
-		int x= 10;
-		int y= extracted(x);
-		x= 20;
-	}
-
-	protected int extracted(int x) {
-		return /*[*/x/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test960.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test960.java
deleted file mode 100644
index bded873..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test960.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package duplicates_out;
-
-public class A_test960 {
-	private Object fO;
-
-	public void foo() {
-		extracted();
-	}
-	protected void extracted() {
-		/*[*/fO= new Object();/*]*/
-	}
-	public void bar() {
-		foo();
-		extracted();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test961.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test961.java
deleted file mode 100644
index 1dbc37a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test961.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package duplicates_out;
-
-public class A_test961 {
-	private Object fO;
-
-	public void foo(Object o) {
-		extracted(o);
-	}
-	protected void extracted(Object o) {
-		/*[*/fO= o;/*]*/
-	}
-	public void bar(Object x) {
-		foo(x);
-		extracted(x);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test962.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test962.java
deleted file mode 100644
index f19304c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test962.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package duplicates_out;
-
-public class A_test962 {
-	private Object object;
-	public A_test962() {
-	  this.object = new Object();
-	  System.out.println(extracted());
-	}
-	protected Object extracted() {
-		return /*[*/this.object/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test963.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test963.java
deleted file mode 100644
index fc592b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test963.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package duplicates_out;
-
-public class A_test963 {
-	void test() {
-		new Object() {
-			public void yes() {
-				extracted();
-			}
-
-			protected void extracted() {
-				/*[*/System.out.println("hello world");/*]*/
-			}
-		};
-		System.out.println("hello world");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test964.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test964.java
deleted file mode 100644
index c578e57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test964.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package duplicates_out;
-
-public class A_test964 {
-	void test() {
-		new Object() {
-			public void yes() {
-				yes();
-				extracted();
-			}
-		};
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/System.out.println("hello world");/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test800.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test800.java
deleted file mode 100644
index e647199..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test800.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package error_in;
-
-public class A_test800 {
-	public void fails() {
-		foo()
-	}
-	public void foo() {
-		/*[*/foo();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test801.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test801.java
deleted file mode 100644
index ac121d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test801.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package error_in;
-
-public class A_test801 {
-	public void foo() {
-		List l;
-		/*[*/g(l);/*]*/
-	}
-
-	public void g(List l) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test802.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test802.java
deleted file mode 100644
index 0583ea8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test802.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package error_in;
-
-public class A_test802 {
-	public List g() {
-		return null;
-	}
-	public void foo() {
-		/*]*/g()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test800.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test800.java
deleted file mode 100644
index d59faa0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test800.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package error_out;
-
-public class A_test800 {
-	public void fails() {
-		foo()
-	}
-	public void foo() {
-		extracted();
-	}
-	protected void extracted() {
-		/*[*/foo();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test801.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test801.java
deleted file mode 100644
index 7a4d01c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test801.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package error_out;
-
-public class A_test801 {
-	public void foo() {
-		List l;
-		extracted(l);
-	}
-
-	protected void extracted(List l) {
-		/*[*/g(l);/*]*/
-	}
-
-	public void g(List l) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test802.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test802.java
deleted file mode 100644
index 6990041..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test802.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package error_out;
-
-public class A_test802 {
-	public List g() {
-		return null;
-	}
-	public void foo() {
-		/*]*/extracted();
-	}
-	protected void extracted() {
-		g()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A.java
deleted file mode 100644
index 1f00ac3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_in;
-
-import java.io.File;
-
-class A {
-	public File getFile() {
-		return null;
-	}
-	public void useFile(File file) {
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test600.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test600.java
deleted file mode 100644
index 94db936..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test600.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package expression_in;
-
-public class A_test600 {
-
-	public void foo() {
-		int i= 10;
-		if (/*[*/i < 10/*]*/)
-			foo();
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test601.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test601.java
deleted file mode 100644
index 193f07a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test601.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package expression_in;
-
-public class A_test601 {
-
-	public void foo() {
-		int i= 10;
-		if (/*[*/i < 10 && i < 20/*]*/)
-			foo();
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test602.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test602.java
deleted file mode 100644
index 0c46ee7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test602.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package expression_in;
-
-public class A_test602 {
-
-	public void foo() {
-		int i= 10;
-		if (/*[*/i < 10 || i < 20/*]*/)
-			foo();
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test603.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test603.java
deleted file mode 100644
index 21f20ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test603.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package expression_in;
-
-public class A_test603 {
-
-	public void foo() {
-		int i= 10;
-		if (/*[*/i == 10/*]*/)
-			foo();
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test604.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test604.java
deleted file mode 100644
index 58e04ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test604.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package expression_in;
-
-public class A_test604 {
-
-	public void foo() {
-		Object o= null;
-		if (/*[*/o == o/*]*/)
-			foo();
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test605.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test605.java
deleted file mode 100644
index 96abbb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test605.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_in;
-
-public class A_test605 {
-
-	public void foo() {
-		int i= 0;
-		while (/*[*/i <= 10/*]*/)
-			foo();
-		foo();	
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test606.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test606.java
deleted file mode 100644
index e719d72..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test606.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_in;
-
-public class A_test606 {
-
-	public void foo() {
-		int i= 0;
-		foo();
-		do {
-			foo();
-		} while (/*[*/i <= 10/*]*/);
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test607.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test607.java
deleted file mode 100644
index 16bdd6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test607.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package expression_in;
-
-public class A_test607 {
-
-	public void foo() {
-		for (int i= 0;/*[*/ i < 10/*]*/; i++)
-			foo();
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test608.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test608.java
deleted file mode 100644
index 8e07b6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test608.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package expression_in;
-
-public class A_test608 {
-
-	public static class Scanner {
-		public int x;
-		public int y;
-	}
-	public static class Selection {
-		public int start;
-		public int end;
-	}
-
-	public void foo(Selection selection) {
-		Scanner scanner= new Scanner();
-		
-		if (/*[*/scanner.x < selection.start && selection.start < scanner.y/*]*/) {
-			g();
-		}
-	}
-
-	public void g() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test609.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test609.java
deleted file mode 100644
index 0bbcf8b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test609.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package expression_in;
-
-public class A_test609 {
-	public void foo() {
-		boolean b;
-		b= 1 < 10 && /*[*/2 < 20/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test610.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test610.java
deleted file mode 100644
index c30d04d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test610.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package expression_in;
-
-public class A_test610 {
-	public void foo() {
-		int i= /*[*/0/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test611.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test611.java
deleted file mode 100644
index 5b94a30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test611.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package expression_in;
-
-public class A_test611 {
-	class Inner {
-	}
-	public void foo() {
-		Inner inner= /*[*/new Inner()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test612.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test612.java
deleted file mode 100644
index ce7e0d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test612.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package expression_in;
-
-public class A_test612 {
-	class Inner {
-	}
-	public void foo() {
-		Inner[] inner= /*[*/new Inner[10]/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test613.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test613.java
deleted file mode 100644
index 8009c6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test613.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package expression_in;
-
-public class A_test613 {
-	public void foo() {
-		A a= null;
-		a.useFile(/*[*/a.getFile()/*]*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java
deleted file mode 100644
index 523806d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package expression_in;
-
-import java.io.File;
-
-public class A_test614 {
-	public void foo() {
-		A a= null;
-		a.useFile(/*[*/a.getFile()/*]*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test615.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test615.java
deleted file mode 100644
index b81a13c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test615.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_in;
-
-public class A_test615 {
-	class Inner {
-	}
-	public void foo() {
-		Inner inner= null;
-		boolean b;
-		b= /*[*/inner instanceof Inner/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test616.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test616.java
deleted file mode 100644
index 8379887..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test616.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package expression_in;
-
-public class A_test616 {
-	public void foo() {
-		A a= null;
-		/*]*/a.getFile()/*]*/.getName();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test617.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test617.java
deleted file mode 100644
index 2e13e44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test617.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package expression_in;
-
-public class A_test617 {
-	public int foo() {
-		return 10 + /*[*/20 * 30/*]*/ + 10;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test618.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test618.java
deleted file mode 100644
index 48db0c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test618.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package expression_in;
-
-public class A_test618 {
-	public void foo() {
-		int i= 20 + /*[*/10 * 30/*]*/ + 10;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test619.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test619.java
deleted file mode 100644
index 54b0113..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test619.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package expression_in;
-
-public class A_test619 {
-	public void foo() {
-		int f= new A[/*[*/1 + 2/*]*/].length;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test620.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test620.java
deleted file mode 100644
index 304d772..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test620.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package expression_in;
-
-public class A_test620 {
-	public void foo() {
-		B b= new B();
-		Object o= /*[*/b.foo()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test621.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test621.java
deleted file mode 100644
index 5001b8f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test621.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package expression_in;
-
-public class A_test621 {
-	public A_test621() {
-		this(/*[*/5 + 6/*]*/);
-	}
-	public A_test621(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test622.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test622.java
deleted file mode 100644
index c9c9b83..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test622.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_in;
-
-public class A_test622 {
-	public A_test622(int i) {
-	}
-	static class Inner extends A_test622 {
-		public Inner() {
-			super(/*[*/5 + 6/*]*/);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/B.java
deleted file mode 100644
index 368e3d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package expression_in;
-
-import java.util.List;
-
-public class B {
-	public List[] foo() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A.java
deleted file mode 100644
index 22a4113..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_out;
-
-import java.io.File;
-
-class A {
-	public File getFile() {
-		return null;
-	}
-	public void useFile(File file) {
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test600.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test600.java
deleted file mode 100644
index ea11d99..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test600.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-public class A_test600 {
-
-	public void foo() {
-		int i= 10;
-		if (extracted(i))
-			foo();
-	}
-
-	protected boolean extracted(int i) {
-		return /*[*/i < 10/*]*/;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test601.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test601.java
deleted file mode 100644
index d45a539..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test601.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-public class A_test601 {
-
-	public void foo() {
-		int i= 10;
-		if (extracted(i))
-			foo();
-	}
-
-	protected boolean extracted(int i) {
-		return /*[*/i < 10 && i < 20/*]*/;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test602.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test602.java
deleted file mode 100644
index f3e2cf7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test602.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-public class A_test602 {
-
-	public void foo() {
-		int i= 10;
-		if (extracted(i))
-			foo();
-	}
-
-	protected boolean extracted(int i) {
-		return /*[*/i < 10 || i < 20/*]*/;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test603.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test603.java
deleted file mode 100644
index dbd0213..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test603.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-public class A_test603 {
-
-	public void foo() {
-		int i= 10;
-		if (extracted(i))
-			foo();
-	}
-
-	protected boolean extracted(int i) {
-		return /*[*/i == 10/*]*/;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test604.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test604.java
deleted file mode 100644
index 1715431..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test604.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-public class A_test604 {
-
-	public void foo() {
-		Object o= null;
-		if (extracted(o))
-			foo();
-	}
-
-	protected boolean extracted(Object o) {
-		return /*[*/o == o/*]*/;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test605.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test605.java
deleted file mode 100644
index e6e12f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test605.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package expression_out;
-
-public class A_test605 {
-
-	public void foo() {
-		int i= 0;
-		while (extracted(i))
-			foo();
-		foo();	
-	}
-
-	protected boolean extracted(int i) {
-		return /*[*/i <= 10/*]*/;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test606.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test606.java
deleted file mode 100644
index f1a6c39..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test606.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package expression_out;
-
-public class A_test606 {
-
-	public void foo() {
-		int i= 0;
-		foo();
-		do {
-			foo();
-		} while (extracted(i));
-	}
-
-	protected boolean extracted(int i) {
-		return /*[*/i <= 10/*]*/;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test607.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test607.java
deleted file mode 100644
index 765271b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test607.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package expression_out;
-
-public class A_test607 {
-
-	public void foo() {
-		for (int i= 0;extracted(i); i++)
-			foo();
-	}
-
-	protected boolean extracted(int i) {
-		return /*[*/ i < 10/*]*/;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test608.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test608.java
deleted file mode 100644
index 23a3e43..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test608.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package expression_out;
-
-public class A_test608 {
-
-	public static class Scanner {
-		public int x;
-		public int y;
-	}
-	public static class Selection {
-		public int start;
-		public int end;
-	}
-
-	public void foo(Selection selection) {
-		Scanner scanner= new Scanner();
-		
-		if (extracted(selection, scanner)) {
-			g();
-		}
-	}
-
-	protected boolean extracted(Selection selection, Scanner scanner) {
-		return /*[*/scanner.x < selection.start && selection.start < scanner.y/*]*/;
-	}
-
-	public void g() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test609.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test609.java
deleted file mode 100644
index 859f641..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test609.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_out;
-
-public class A_test609 {
-	public void foo() {
-		boolean b;
-		b= 1 < 10 && extracted();
-	}
-
-	protected boolean extracted() {
-		return /*[*/2 < 20/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test610.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test610.java
deleted file mode 100644
index 89149ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test610.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_out;
-
-public class A_test610 {
-	public void foo() {
-		int i= extracted();
-	}
-
-	protected int extracted() {
-		return /*[*/0/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test611.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test611.java
deleted file mode 100644
index f30f669..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test611.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_out;
-
-public class A_test611 {
-	class Inner {
-	}
-	public void foo() {
-		Inner inner= extracted();
-	}
-	protected Inner extracted() {
-		return /*[*/new Inner()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test612.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test612.java
deleted file mode 100644
index 972f496..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test612.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_out;
-
-public class A_test612 {
-	class Inner {
-	}
-	public void foo() {
-		Inner[] inner= extracted();
-	}
-	protected Inner[] extracted() {
-		return /*[*/new Inner[10]/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test613.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test613.java
deleted file mode 100644
index 8425549..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test613.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-import java.io.File;
-
-public class A_test613 {
-	public void foo() {
-		A a= null;
-		a.useFile(extracted(a));
-	}
-
-	protected File extracted(A a) {
-		return /*[*/a.getFile()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test614.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test614.java
deleted file mode 100644
index 8a74345..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test614.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-import java.io.File;
-
-public class A_test614 {
-	public void foo() {
-		A a= null;
-		a.useFile(extracted(a));
-	}
-
-	protected File extracted(A a) {
-		return /*[*/a.getFile()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test615.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test615.java
deleted file mode 100644
index a5234e2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test615.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-public class A_test615 {
-	class Inner {
-	}
-	public void foo() {
-		Inner inner= null;
-		boolean b;
-		b= extracted(inner);
-	}
-	protected boolean extracted(Inner inner) {
-		return /*[*/inner instanceof Inner/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test616.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test616.java
deleted file mode 100644
index 327b460..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test616.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-import java.io.File;
-
-public class A_test616 {
-	public void foo() {
-		A a= null;
-		/*]*/extracted(a).getName();
-	}
-
-	protected File extracted(A a) {
-		return a.getFile()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test617.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test617.java
deleted file mode 100644
index 00d92a8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test617.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_out;
-
-public class A_test617 {
-	public int foo() {
-		return 10 + extracted() + 10;
-	}
-
-	protected int extracted() {
-		return /*[*/20 * 30/*]*/;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test618.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test618.java
deleted file mode 100644
index 304c5b9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test618.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_out;
-
-public class A_test618 {
-	public void foo() {
-		int i= 20 + extracted() + 10;
-	}
-
-	protected int extracted() {
-		return /*[*/10 * 30/*]*/;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test619.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test619.java
deleted file mode 100644
index 0d56542..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test619.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_out;
-
-public class A_test619 {
-	public void foo() {
-		int f= new A[extracted()].length;
-	}
-
-	protected int extracted() {
-		return /*[*/1 + 2/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test620.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test620.java
deleted file mode 100644
index e676e6b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test620.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_out;
-
-import java.util.List;
-
-public class A_test620 {
-	public void foo() {
-		B b= new B();
-		Object o= extracted(b);
-	}
-
-	protected List[] extracted(B b) {
-		return /*[*/b.foo()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test621.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test621.java
deleted file mode 100644
index 75966b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test621.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_out;
-
-public class A_test621 {
-	public A_test621() {
-		this(extracted());
-	}
-	protected static int extracted() {
-		return /*[*/5 + 6/*]*/;
-	}
-	public A_test621(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test622.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test622.java
deleted file mode 100644
index 3e0cb45..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test622.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package expression_out;
-
-public class A_test622 {
-	public A_test622(int i) {
-	}
-	static class Inner extends A_test622 {
-		public Inner() {
-			super(extracted());
-		}
-
-		protected static int extracted() {
-			return /*[*/5 + 6/*]*/;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/B.java
deleted file mode 100644
index 2583a2a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package expression_out;
-
-import java.util.List;
-
-public class B {
-	public List[] foo() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/handTests/Comments.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/handTests/Comments.java
deleted file mode 100644
index 8045ae2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/handTests/Comments.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package handTests;
-public class Comments {
-	/* comment */
-	public void foo() {
-		foo();
-		/* comment */
-		// comment
-		/** comment */
-		foo();
-	}
-	/* comment */
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1000.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1000.java
deleted file mode 100644
index 1a07c82..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1000.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package initializer_in;
-
-public class A_test1000 {
-	{
-		/*[*/System.out.println("Eclipse");/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1001.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1001.java
deleted file mode 100644
index 064ea8b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1001.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package initializer_in;
-
-public class A_test1001 {
-	static {
-		/*[*/System.out.println("Eclipse");/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1002.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1002.java
deleted file mode 100644
index 1257274..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1002.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package initializer_in;
-
-public class A_test1002 {
-	{
-		String s= "Eclipse";
-		/*[*/System.out.println(s);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1003.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1003.java
deleted file mode 100644
index 144b06f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1003.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package initializer_in;
-
-public class A_test1003 {
-	static {
-		int i= /*[*/bar()/*]*/;
-	}
-	
-	private static int bar() {
-		return 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1000.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1000.java
deleted file mode 100644
index fc95b7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1000.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package initializer_out;
-
-public class A_test1000 {
-	{
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/System.out.println("Eclipse");/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1001.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1001.java
deleted file mode 100644
index 8f22a51..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1001.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package initializer_out;
-
-public class A_test1001 {
-	static {
-		extracted();
-	}
-
-	protected static void extracted() {
-		/*[*/System.out.println("Eclipse");/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1002.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1002.java
deleted file mode 100644
index 3d52622..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1002.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package initializer_out;
-
-public class A_test1002 {
-	{
-		String s= "Eclipse";
-		extracted(s);
-	}
-
-	protected void extracted(String s) {
-		/*[*/System.out.println(s);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1003.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1003.java
deleted file mode 100644
index 782cba6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1003.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package initializer_out;
-
-public class A_test1003 {
-	static {
-		int i= extracted();
-	}
-	
-	protected static int extracted() {
-		return /*[*/bar()/*]*/;
-	}
-
-	private static int bar() {
-		return 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test010.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test010.java
deleted file mode 100644
index 880e1b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test010.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test010 {
-	public void /*]*/foo() {
-		foo();
-	}/*[*/
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test011.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test011.java
deleted file mode 100644
index 1adf115..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test011.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test011 {
-	public void foo() {
-		/*]*/foo(/*[*/);
-	}
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test012.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test012.java
deleted file mode 100644
index c89c75f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test012.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test012 {
-	public void foo() {
-		/*]*/f();
-		g(/*[*/);
-	}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test013.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test013.java
deleted file mode 100644
index b92d74d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test013.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test013 {
-	public void foo() {/*[*/
-		f();
-		g();
-	}/*[*/
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test014.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test014.java
deleted file mode 100644
index de28005..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test014.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test014 {
-	public void foo() /*]*/{
-		foo();
-	}/*[*/
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test015.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test015.java
deleted file mode 100644
index 32e0e13..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test015.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test015 {
-	public void foo() /*]*/{
-		f();
-		g();
-	/*]*/}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test020.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test020.java
deleted file mode 100644
index d99ed0f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test020.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package invalidSelection;
-
-public class A_test020 {
-	public void foo(int x) {
-		switch(x) {
-			/*]*/case 10:
-				f();
-				break;/*[*/
-			case 11:
-				g();
-				break;
-			default:
-				f();
-				g();		
-		}
-	}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test021.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test021.java
deleted file mode 100644
index a104c30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test021.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package invalidSelection;
-
-public class A_test021 {
-	public void foo(int x) {
-		/*]*/switch(x) {
-			case 10:
-				f();
-				break;/*[*/
-			case 11:
-				g();
-				break;
-			default:
-				f();
-				g();		
-		}
-	}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test022.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test022.java
deleted file mode 100644
index e256a20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test022.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package invalidSelection;
-
-public class A_test022 {
-	public void foo(int x) {
-		switch(x) {
-			/*]*/case 10:
-				f();
-				break;
-			case 11:
-				g();
-				break;
-			default:
-				f();
-				g();		
-		/*]*/}
-	}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test030.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test030.java
deleted file mode 100644
index 79812d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test030.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test030 {
-	public void foo(int x) {
-		{/*[*/
-			f();
-		}/*[*/
-	}	
-	public void f() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test031.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test031.java
deleted file mode 100644
index b8fc35b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test031.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test031 {
-	public void foo(int x) {
-		/*]*/{
-			f();
-		/*]*/}
-	}	
-	public void f() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test040.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test040.java
deleted file mode 100644
index f7a17c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test040.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test040 {
-	public void foo() {
-		for (int i= 0; i /*]*/</*[*/ 10; i++)
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test041.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test041.java
deleted file mode 100644
index e3219e2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test041.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test041 {
-	public void foo() {
-		for (/*]*/int i= 0/*[*/; i < 10; i++)
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test042.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test042.java
deleted file mode 100644
index 87baa6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test042.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test042 {
-	public void foo() {
-		for (int i= 0; i < 10; /*]*/i++/*[*/)
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test043.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test043.java
deleted file mode 100644
index 6782f44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test043.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test043 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)/*[*/
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test044.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test044.java
deleted file mode 100644
index eba8d19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test044.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test044 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)
-			foo(/*[*/);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test045.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test045.java
deleted file mode 100644
index 8553338..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test045.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test045 {
-	public void foo() {
-		for /*]*/(int i= 0; i < 10; i++)
-			foo();/*[*/
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test046.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test046.java
deleted file mode 100644
index ad867fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test046.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test046 {
-	public void foo() {
-		for (int i= 10; i < 10; i++)
-			for (int z= 10; z < 10; z++)
-				/*]*/foo();
-		foo()/*[*/;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test047.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test047.java
deleted file mode 100644
index a84e445..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test047.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test047 {
-	public void foo() {
-		for (int i= 10; i < 10; i++)
-			/*]*/for (int z= 10; z < 10; z++)
-				foo();
-		foo()/*[*/;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test048.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test048.java
deleted file mode 100644
index 69ae79b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test048.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package invalidSelection;
-
-import java.util.Enumeration;
-
-public class A_test048 {
-	public boolean flag;
-	public void foo() {
-		for (/*]*/Enumeration e= tests()/*[*/; e.hasMoreElements(); ) {
-			if (flag)
-				break;
-		}
-	}	
-	public Enumeration tests() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test050.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test050.java
deleted file mode 100644
index 1321a16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test050.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test050 {
-	public void foo() {
-		while(1 /*]*/</*[*/ 10)
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test051.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test051.java
deleted file mode 100644
index e91b2d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test051.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test051 {
-	public void foo() {
-		/*]*/while(1 < 10)/*[*/
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test052.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test052.java
deleted file mode 100644
index b374911..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test052.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package invalidSelection;
-
-public class A_test052 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		while(b())/*[*/
-			while(b())
-				foo();
-		foo()/*[*/;		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test060.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test060.java
deleted file mode 100644
index e1b6bdd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test060.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test060 {
-	public void foo() {
-		do 
-			foo();
-		while(100 /*]*/>/*[*/  10);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test061.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test061.java
deleted file mode 100644
index a1e56d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test061.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test061 {
-	public void foo() {
-		do 
-			/*]*/foo();
-		while(1 < 10);/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test062.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test062.java
deleted file mode 100644
index 4913526..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test062.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test062 {
-	public void foo() {
-		/*]*/do 
-			foo();/*[*/
-		while(1 < 10);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test063.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test063.java
deleted file mode 100644
index d834943..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test063.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test063 {
-	public void foo() {
-		do/*[*/
-			foo();
-		/*]*/while(1 < 10);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test070.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test070.java
deleted file mode 100644
index f2b6365..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test070.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package invalidSelection;
-
-public class A_test070 {
-	public int foo() {
-		int i= foo();
-		switch/*[*/ (i) {
-			case 1:
-				foo();
-			case 2:
-				foo();
-				foo();
-			case 3:
-				foo();
-			default:
-				foo();	
-		}/*[*/
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test071.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test071.java
deleted file mode 100644
index 1e29c19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test071.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package invalidSelection;
-
-public class A_test071 {
-	public int foo() {
-		int i= foo();
-		/*]*/switch (i) {
-			case 1:
-				foo();
-			case 2:
-				foo();
-				foo();
-			case 3:
-				foo();
-			default:
-				foo();	
-		/*]*/}
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test072.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test072.java
deleted file mode 100644
index 786a188..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test072.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package invalidSelection;
-
-public class A_test072 {
-	public int foo() {
-		int i= foo();
-		switch (i) {
-			case 1/*]*/:
-				foo()/*[*/;
-			case 2:
-				foo();
-				foo();
-			case 3:
-				foo();
-			default:
-				foo();	
-		}
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test073.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test073.java
deleted file mode 100644
index 921196e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test073.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package invalidSelection;
-
-public class A_test073 {
-	public int foo() {
-		int i= foo();
-		switch (i) {
-			case 1:/*[*/
-				foo();
-			case/*[*/2:
-				foo();
-				foo();
-			case 3:
-				foo();
-			default:
-				foo();	
-		}
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test080.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test080.java
deleted file mode 100644
index 148661a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test080.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test080 {
-	public boolean fBoolean;
-	public void foo() {
-		if /*]*/(fBoolean/*[*/)
-			foo();
-		else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test081.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test081.java
deleted file mode 100644
index 088e444..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test081.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test081 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();
-		else
-			/*]*/foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test082.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test082.java
deleted file mode 100644
index 8e1e3bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test082.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test082 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();/*[*/
-		else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test083.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test083.java
deleted file mode 100644
index 05af41d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test083.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test083 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();
-		/*]*/else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test084.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test084.java
deleted file mode 100644
index 42cf868..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test084.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test084 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();
-		else/*[*/
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test085.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test085.java
deleted file mode 100644
index 7969c16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test085.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test085 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)
-			foo();
-		/*]*/else
-			foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test090.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test090.java
deleted file mode 100644
index 18c6c71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test090.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test090 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			/*]*/break/*[*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test091.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test091.java
deleted file mode 100644
index a2e5c4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test091.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test091 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			/*]*/continue/*[*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test092.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test092.java
deleted file mode 100644
index ccaed03..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test092.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test092 {
-	public void foo() {
-		while (true)
-			/*]*/break/*[*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test093.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test093.java
deleted file mode 100644
index 165eb67..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test093.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test093 {
-	public void foo() {
-		while (true)
-			/*]*/continue/*[*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test094.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test094.java
deleted file mode 100644
index d3c0b17..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test094.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test094 {
-	public void foo() {
-		do
-			/*]*/break/*[*/;
-		while(true);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test095.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test095.java
deleted file mode 100644
index e330d16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test095.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test095 {
-	public void foo() {
-		do
-			/*]*/continue/*[*/;
-		while(true);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test096.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test096.java
deleted file mode 100644
index 4b0fe42..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test096.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package invalidSelection;
-
-public class A_test096 {
-	public void foo() {
-		int i= 10;
-		switch(i) {
-			case 10:
-				foo();
-				/*]*/break/*[*/;
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test100.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test100.java
deleted file mode 100644
index 8113e0b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test100.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test100 {
-	public void foo() {
-		try /*]*/{
-			foo();
-		}/*[*/ catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test101.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test101.java
deleted file mode 100644
index 26e171f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test101.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test101 {
-	public void foo() {
-		try /*]*/{
-			foo();
-		/*]*/} catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test102.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test102.java
deleted file mode 100644
index 39fd3ff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test102.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test102 {
-	public void foo() {
-		try {/*[*/
-			foo();
-		}/*[*/ catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test103.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test103.java
deleted file mode 100644
index ffe0310..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test103.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test103 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) /*]*/{
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test104.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test104.java
deleted file mode 100644
index 6bb367b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test104.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test104 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {/*[*/
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test105.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test105.java
deleted file mode 100644
index d8f6c1f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test105.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test105 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) /*]*/{
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test106.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test106.java
deleted file mode 100644
index d5c166f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test106.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test106 {
-	public void foo() {
-		try {
-			foo();
-		} finally /*]*/{
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test107.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test107.java
deleted file mode 100644
index 4d8f1bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test107.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test107 {
-	public void foo() {
-		try {
-			foo();
-		} finally {/*[*/
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test108.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test108.java
deleted file mode 100644
index 4c79c88..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test108.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test108 {
-	public void foo() {
-		try {
-			foo();
-		} finally /*]*/{
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test109.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test109.java
deleted file mode 100644
index fa68c05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test109.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test109 {
-	public void foo() {
-		/*]*/try {
-			foo();
-		} finally {
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test110.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test110.java
deleted file mode 100644
index 6ecade3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test110.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test110 {
-	public void foo() {
-		try/*[*/{
-			foo();
-		} finally {
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test111.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test111.java
deleted file mode 100644
index c9903ff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test111.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test111 {
-	public void foo() {
-		try {
-			foo();
-		} catch (/*]*/Exception e/*[*/) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test112.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test112.java
deleted file mode 100644
index 689f857..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test112.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test112 {
-	public void foo() {
-		try {
-			foo();
-		} /*]*/catch (Exception e) {
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test113.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test113.java
deleted file mode 100644
index 2c2db9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test113.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test113 {
-	public void foo() {
-		/*]*/try {
-			foo();
-		}/*[*/ catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test114.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test114.java
deleted file mode 100644
index 1cfce05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test114.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test114 {
-	public void foo() {
-		try {
-			foo();
-		} /*]*/finally {
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test115.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test115.java
deleted file mode 100644
index 37a6af2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test115.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test115 {
-	public void foo() {
-		try {
-			foo();
-		} catch /*]*/(Exception e)/*[*/ {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test116.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test116.java
deleted file mode 100644
index 02f8ef4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test116.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test116 {
-	public void foo() {
-		try {
-			foo();
-		} catch (/*]*/Exception e/*[*/) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test120.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test120.java
deleted file mode 100644
index a5fad98..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test120.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test120 {
-	public boolean foo() {
-		/*]*/return/*[*/ false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test121.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test121.java
deleted file mode 100644
index bd734f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test121.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package invalidSelection;
-
-public class A_test121 {
-	public void foo() {
-		int x= 1;
-		int y= 2;
-		
-		/*]*/x= y + x;
-		y= x + y;/*[*/
-		
-		x++;
-		y++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test122.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test122.java
deleted file mode 100644
index c322a8c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test122.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package invalidSelection;
-
-public class A_test122 {
-	public void foo() {
-		int x= 1;
-
-		/*]*/x= x + 2;
-		int y= 10;/*[*/
-		
-		x+= y + 20;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test123.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test123.java
deleted file mode 100644
index ace8f56..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test123.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test123 {
-	public void foo() {
-		Object /*]*/temp/*[*/= null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test130.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test130.java
deleted file mode 100644
index b9b833d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test130.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test130 {
-	public void foo() {
-		class Inner {
-		}
-		
-		/*]*/Inner inner= new Inner();
-		foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test131.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test131.java
deleted file mode 100644
index 4bcbf44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test131.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test131 {
-	public void foo() {
-		
-		/*]*/foo();
-		class Inner {
-		}
-		foo();/*[*/
-		
-		Inner inner= new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test140.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test140.java
deleted file mode 100644
index 19a5f90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test140.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package invalidSelection;
-
-public class A_test140 {
-	public boolean flag;
-	public int foo() {
-		int i= 10;
-		/*]*/switch(i) {
-			case 1:
-				if (flag)
-					break;
-				foo();	
-			case 2:
-				return 10;
-			default:
-				throw new NullPointerException();
-		}/*[*/
-			
-		return 10;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test141.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test141.java
deleted file mode 100644
index c2d0f50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test141.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test141 {
-	private boolean flag;
-	public int foo() {
-		/*]*/while(flag)
-			return 20;/*[*/
-		return 10;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test142.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test142.java
deleted file mode 100644
index 127f394..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test142.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package invalidSelection;
-
-public class A_test142 {
-	private boolean flag;
-	public int foo() {
-		int i= 10;
-		/*]*/if (flag) {
-			i++;
-			return i;
-		}/*[*/
-		int y= i + 10;
-		return y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test143.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test143.java
deleted file mode 100644
index b5719da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test143.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test143 {
-	public boolean foo() {
-		/*]*/try {
-			return true;
-		} catch (Exception e) {
-		}/*[*/
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test144.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test144.java
deleted file mode 100644
index a53244b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test144.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test144 {
-	public boolean foo() {
-		/*]*/try {
-		} catch (Exception e) {
-			return true;
-		}/*[*/
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test145.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test145.java
deleted file mode 100644
index effe0d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test145.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test145 {
-	boolean flag;
-	public boolean foo() {
-		/*]*/do {
-			if (flag)
-				break;
-			return false;
-		} while (flag);/*[*/
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test146.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test146.java
deleted file mode 100644
index d1076db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test146.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package invalidSelection;
-
-public class A_test146 {
-	boolean flag;
-	public boolean foo() {
-		while (flag) {
-			/*]*/for (int i= 0; i < 10; i++) {
-				if (flag)
-					break;
-			}
-			if (flag)
-				break;
-			return false;/*[*/
-		}
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test147.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test147.java
deleted file mode 100644
index 43470ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test147.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package invalidSelection;
-
-public class A_test147 {
-	boolean flag;
-	public boolean foo() {
-		/*]*/target: {
-			for (int i= 0; i < 10; i++) {
-				if (flag)
-					break;
-				else
-					break target;
-			}
-			return false;
-		}/*[*/
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test148.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test148.java
deleted file mode 100644
index f030140..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test148.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package invalidSelection;
-
-public class A_test148 {
-	boolean flag;
-	public boolean foo() {
-		int i= 0;
-		/*]*/switch (i) {
-			case 1:
-				return false;
-			case 2:
-				return true;
-		}/*[*/
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test149.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test149.java
deleted file mode 100644
index adfbf99..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test149.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package invalidSelection;
-
-public class A_test149 {
-	boolean flag;
-	public boolean foo() {
-		int i= 0;
-		/*]*/switch (i) {
-			case 1:
-				break;
-			case 2:
-				return true;
-			default:
-				return false;
-		}/*[*/
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test150.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test150.java
deleted file mode 100644
index e469082..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test150.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test150 {
-
-	public void foo() {
-		/*]*/synchronized (this) {
-			foo();
-		/*]*/}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test151.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test151.java
deleted file mode 100644
index b175d5e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test151.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test151 {
-
-	public void foo() {
-		synchronized/*[*/ (this) {
-			foo();
-		}/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test152.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test152.java
deleted file mode 100644
index 9a29fd8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test152.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test152 {
-
-	public void foo() {
-		synchronized (this) /*]*/{
-			foo();
-		/*]*/}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test153.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test153.java
deleted file mode 100644
index 477b5d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test153.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test153 {
-
-	public void foo() {
-		synchronized(this) {/*[*/
-			foo();
-		}/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test160.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test160.java
deleted file mode 100644
index 965967c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test160.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package invalidSelection;
-
-public class A_test160 {
-	/*]*/public static class Inner {
-	}/*[*/
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test161.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test161.java
deleted file mode 100644
index ee94548..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test161.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test161 {
-	public void foo() {
-		class /*]*/Inner {
-		}/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test170.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test170.java
deleted file mode 100644
index bda6db9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test170.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test170 {
-	public void foo() {
-		String tab[] = /*]*/{"hello", "world" } /*[*/;       
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test171.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test171.java
deleted file mode 100644
index cac9b44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test171.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test171 {
-	public void foo() {
-		String /*]*/str = "ggg"/*[*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test172.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test172.java
deleted file mode 100644
index eca6057..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test172.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test172 {
-	public void foo() {
-		/*]*/int i= 10/*[*/, j= 20;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test173.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test173.java
deleted file mode 100644
index e9364fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test173.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test173 {
-	public void foo() {
-		/*]*/int i= 10, j= 20;/*[*/
-		g(j);
-		g(i);
-	}
-	public void g(int i) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test180.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test180.java
deleted file mode 100644
index 6998bd8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test180.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test180 {
-	public A_test180() {
-		/*]*/this(10);
-		foo();/*[*/
-	}
-	public A_test180(int i) {
-		super();
-	}
-	public void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test181.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test181.java
deleted file mode 100644
index e2ba0ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test181.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test181 {
-	public A_test181() {
-		/*]*/super();
-		foo();/*[*/
-	}
-	public void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test190.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test190.java
deleted file mode 100644
index a3972fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test190.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package invalidSelection;
-
-public class A_test190 {
-	public int foo() {
-		int i= 10;
-		/*]*/switch(i) {
-			case 1:
-				foo();
-				break;
-			case 2:
-				foo();
-			default:
-				return 10;
-		}/*[*/
-		
-		return 20;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test191.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test191.java
deleted file mode 100644
index 8bdbd9d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test191.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package invalidSelection;
-
-public class A_test191 {
-	private boolean foo(){
-		A_test191 m= new A_test191();
-		/*[*/if (m == null)
-			return true;
-		A_test191 d= m;/*]*/
-		if (d == null)
-			return true;	
-		return true;
-	}
-
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test192.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test192.java
deleted file mode 100644
index 228d9ea..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test192.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test192 {
-	private void foo(){
-		int i;
-		/*]*/i/*[*/= 10;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test193.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test193.java
deleted file mode 100644
index 736a228..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test193.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test193 {
-	private void foo(int i, int j){
-		foo(/*]*/10, 10/*[*/);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test194.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test194.java
deleted file mode 100644
index 41a27cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test194.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test194 {
-	A_test194 fff() {
-		return this;
-	}
-	int yyy() {
-		return 32;
-	}
-	void g() {
-		int f = /*[*/fff/*]*/().yyy();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test500.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test500.java
deleted file mode 100644
index 1bad125..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test500.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package locals_in;
-
-public class A_test500 {
-	public void foo() {
-		int x= 10;
-		
-		/*[*/int y= x;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test501.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test501.java
deleted file mode 100644
index 6edae6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test501.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package locals_in;
-
-public class A_test501 {
-	public void foo() {
-		int x= 10;
-		
-		/*[*/x= 20;
-		int y= x;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test502.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test502.java
deleted file mode 100644
index d7fed07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test502.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test502 {
-	public void foo() {
-		int x= 0;
-		int y= 0;
-
-		/*[*/x= 10;
-		y= x;
-		x= y;/*]*/		
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test503.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test503.java
deleted file mode 100644
index 21e1ef3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test503.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package locals_in;
-
-public class A_test503 {
-	public void foo() {
-		int x= 10;
-		
-		/*[*/x++;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test504.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test504.java
deleted file mode 100644
index d9992f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test504.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package locals_in;
-
-public class A_test504 {
-	public void foo() {
-		int x= 10;
-		
-		/*[*/--x;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test505.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test505.java
deleted file mode 100644
index b444a5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test505.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package locals_in;
-
-public class A_test505 {
-	public void foo() {
-		int x= 0;
-		
-		/*[*/x+= 1;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test506.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test506.java
deleted file mode 100644
index f6baf0d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test506.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test506 {
-	public void foo() {
-		int x= 0;
-		
-		/*[*/bar(x);/*]*/
-	}
-
-	public void bar(int i) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test507.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test507.java
deleted file mode 100644
index d2d5ad8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test507.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test507 {
-	public void foo() {
-		int x= 0;
-		
-		/*[*/x= 10;/*]*/
-		
-		int y= x;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test508.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test508.java
deleted file mode 100644
index efc46fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test508.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_in;
-
-public class A_test508 {
-	public void foo() {
-		int x= 0;
-		int y= 0;
-		
-		/*[*/x= 10;
-		y= 20;/*]*/
-		
-		y= x;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test509.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test509.java
deleted file mode 100644
index 9b40179..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test509.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test509 {
-	public void foo() {
-		int x= 0;
-		int y= 0;
-
-		/*[*/y= x;
-		x= 0;/*]*/		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test510.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test510.java
deleted file mode 100644
index fb32dd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test510.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package locals_in;
-
-public class A_test510 {
-	public void foo() {
-		/*[*/int x= 0;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test511.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test511.java
deleted file mode 100644
index f623029..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test511.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package locals_in;
-
-public class A_test511 {
-	public void foo() {
-		/*[*/int x= 0;/*]*/
-		
-		x++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test512.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test512.java
deleted file mode 100644
index d7792d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test512.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package locals_in;
-
-public class A_test512 {
-	public void foo() {
-		/*[*/int x= 0;
-		int y= x;/*]*/
-		
-		x++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test513.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test513.java
deleted file mode 100644
index de84ff8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test513.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package locals_in;
-
-public class A_test513 {
-	public void foo() {
-		/*[*/int x= 0;
-		int y= 0;/*]*/
-		x++;
-		y= 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test514.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test514.java
deleted file mode 100644
index b1d18f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test514.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package locals_in;
-
-public class A_test514 {
-	public void foo() {
-		/*[*/int x;/*]*/
-		x= 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test515.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test515.java
deleted file mode 100644
index 091b116..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test515.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test515 {
-	public void foo() {
-		int y= 10;
-		
-		/*[*/int x= y;/*]*/
-		
-		x++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test516.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test516.java
deleted file mode 100644
index 7d393fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test516.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package locals_in;
-
-public class A_test516 {
-	public void foo() {
-		/*[*/int i= 10, j= 20;/*]*/
-		
-		j++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test517.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test517.java
deleted file mode 100644
index 9d6d133..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test517.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package locals_in;
-
-public class A_test517 {
-	public void foo() {
-		/*[*/int i;
-		int j;
-		j= 20;/*]*/
-		i= j + 10;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test518.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test518.java
deleted file mode 100644
index 05a2a55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test518.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package locals_in;
-
-public class A_test518 {
-	public void foo() {
-		int i;
-		
-		/*[*/i= 10;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test519.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test519.java
deleted file mode 100644
index 6a9996d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test519.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test519 {
-	public void foo() {
-		int i;
-
-		/*[*/i= 10;/*]*/
-		
-		i= 20;		
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test520.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test520.java
deleted file mode 100644
index cfb352b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test520.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test520 {
-	public void foo() {
-		int i= 0;
-
-		/*[*/int y= i;/*]*/
-		
-		i= 20;		
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test521.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test521.java
deleted file mode 100644
index adb0c44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test521.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_in;
-
-public class A_test521 {
-	public volatile boolean flag;
-	
-	public void foo() {
-		int i= 5;
-		/*[*/if (flag)
-			i= 10;/*]*/
-		i--;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test522.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test522.java
deleted file mode 100644
index 6307a55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test522.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_in;
-
-public class A_test522 {
-	public volatile boolean flag;
-	
-	public void foo() {
-		int i= 20;
-		/*[*/target: {
-			if (flag)
-				break target;
-			i= 10;
-		}/*]*/
-		i--;
-	}	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test523.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test523.java
deleted file mode 100644
index cff2b9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test523.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package locals_in;
-
-public class A_test523 {
-	public volatile boolean flag;
-
-	protected void foo() {
-		int i= 0;
-		/*[*/try {
-			if (flag)
-				throw new Exception();
-			i= 10;
-		} catch (Exception e) {
-		}/*]*/
-		read(i);
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test524.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test524.java
deleted file mode 100644
index d693e97..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test524.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package locals_in;
-
-public class A_test524 {
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 0;
-		try {
-			/*[*/if (flag)
-				throw new Exception();
-			i= 10;/*]*/
-		} catch (Exception e) {
-		}
-		read(i);
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test525.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test525.java
deleted file mode 100644
index 21c33dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test525.java
+++ /dev/null

@@ -1,29 +0,0 @@
-package locals_in;
-
-public class A_test525 {
-	private static class Exception1 extends Exception {
-	}
-	private static class Exception2 extends Exception {
-	}
-	
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 10;
-		try {
-			/*[*/try {
-				if (flag)
-					throw new Exception1();
-				if (!flag)
-					throw new Exception2();
-			} catch (Exception1 e) {
-			}
-			i= 10;/*]*/
-		} catch (Exception2 e) {
-		}
-		read(i);
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test526.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test526.java
deleted file mode 100644
index aa98e4f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test526.java
+++ /dev/null

@@ -1,29 +0,0 @@
-package locals_in;
-
-public class A_test526 {
-	private static class Exception1 extends Exception {
-	}
-	private static class Exception2 extends Exception {
-	}
-	
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 10;
-		/*[*/try {
-			try {
-				if (flag)
-					throw new Exception1();
-				if (!flag)
-					throw new Exception2();
-			} catch (Exception1 e) {
-			}
-			i= 10;
-		} catch (Exception2 e) {
-		}/*]*/
-		read(i);
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test527.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test527.java
deleted file mode 100644
index 5ab2be7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test527.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package locals_in;
-
-public class A_test527 {
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 0;
-		/*[*/try {
-			if (flag)
-				throwException();
-			i= 10;
-		} catch (Exception e) {
-		}/*]*/
-		read(i);
-	}
-
-	private void read(int i) {
-	}
-	
-	private void throwException() throws Exception {
-		throw new Exception();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test528.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test528.java
deleted file mode 100644
index abb347c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test528.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_in;
-
-import java.io.IOException;
-
-public class A_test528 {
-	public void foo() throws IOException {
-	}
-
-	static class B extends A_test528 {
-		public void bar() throws IOException {
-			/*[*/super.foo();/*]*/
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test530.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test530.java
deleted file mode 100644
index 2b0b447..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test530.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_in;
-
-public class A_test530 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner= null;
-		
-		/*[*/inner= new Inner();/*]*/
-		
-		inner.x= 10;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test531.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test531.java
deleted file mode 100644
index 0d864f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test531.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_in;
-
-public class A_test531 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner= new Inner();
-		
-		/*[*/inner.x= 10;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test532.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test532.java
deleted file mode 100644
index 03c692b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test532.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_in;
-
-public class A_test532 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner= new Inner();
-		
-		/*[*/inner.x= 10;/*]*/
-		
-		int y= inner.x;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test533.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test533.java
deleted file mode 100644
index 40bd1ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test533.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_in;
-
-public class A_test533 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		/*[*/Inner inner= new Inner();/*]*/
-
-		Inner inner2= inner;		
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test534.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test534.java
deleted file mode 100644
index 2e3ce26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test534.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_in;
-
-public class A_test534 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner= new Inner();
-		
-		/*[*/inner.x= 10;/*]*/
-		
-		int y= inner.x;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test535.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test535.java
deleted file mode 100644
index 830b650..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test535.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_in;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class A_test535 {
-
-	public void bar() {
-		List allElements= new ArrayList();
-		Iterator iter= allElements.iterator();		
-
-		/*[*/while (iter.hasNext()) {
-			allElements.add(iter.next());
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test536.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test536.java
deleted file mode 100644
index 0a9f4c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test536.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_in;
-
-public class A_test536 {
-
-	public void bar() {
-		{ int k= 27; k++; }
-		int i= 37;
-		if (i == 0) {
-			int k= 17;
-			/*[*/k= k + 1;
-			k += 2;
-			i += 2;
-			k++;/*]*/
-		}
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test537.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test537.java
deleted file mode 100644
index cca81a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test537.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_in;
-
-public class A_test537 {
-	public void foo() {
-		final int i= 10;
-		
-		/*[*/Runnable run= new Runnable() {
-			public void run() {
-				System.out.println("" + i);
-			}
-		};/*]*/
-		
-		run.run();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test538.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test538.java
deleted file mode 100644
index f65bab6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test538.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package locals_in;
-
-public class A_test538 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		
-		/*[*/array[i]= 10;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test539.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test539.java
deleted file mode 100644
index cdcdcd6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test539.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test539 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		int[] index= new int[1];
-		
-		/*[*/array[index[i]]= 10;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test540.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test540.java
deleted file mode 100644
index cb9f85e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test540.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test540 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		int[] index= new int[1];
-		
-		/*[*/array[0]= index[0];/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test541.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test541.java
deleted file mode 100644
index 9f2fbd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test541.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_in;
-
-public class A_test541 {
-	class Inner {
-		public int x;
-	}
-	public void foo() {
-		int[] array= new int[10];
-		Inner inner= new Inner();
-		
-		/*[*/array[inner.x]= 10;
-		inner.x= 20;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test542.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test542.java
deleted file mode 100644
index 48c4832..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test542.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package locals_in;
-
-public class A_test542 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		
-		/*[*/array[i++]= 10;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test543.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test543.java
deleted file mode 100644
index 80b6783..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test543.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test543 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		
-		/*[*/array[i++]= 10;/*]*/
-		
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test550.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test550.java
deleted file mode 100644
index b7a3f12..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test550.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test550 {
-
-	public void foo() {
-		int i= 0;
-		while(true) {
-			/*[*/i++;/*]*/
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test551.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test551.java
deleted file mode 100644
index d3e0350..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test551.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test551 {
-
-	public void foo() {
-		int i= 0;
-		do {
-			/*[*/i++;/*]*/
-		} while (true);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test552.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test552.java
deleted file mode 100644
index f1629bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test552.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test552 {
-
-	public void foo() {
-		int i= 0;
-		for (;true;) {
-			/*[*/i++;/*]*/
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test553.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test553.java
deleted file mode 100644
index fc2f2f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test553.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test553 {
-
-	public void foo() {
-		int i= 0;
-		for (int x= i++, y= x;true;) {
-			/*[*/x= i;/*]*/
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test554.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test554.java
deleted file mode 100644
index 61bf2a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test554.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test554 {
-	public boolean flag;
-	public void foo() {
-		int x;
-		/*[*/if (flag)
-			x= 10;/*]*/
-		x= 20;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test555.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test555.java
deleted file mode 100644
index e0015a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test555.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_in;
-
-public class A_test555 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		while (true) {
-			for (int y= x; true; ) {
-				/*[*/x= 20;/*]*/
-			}
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test556.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test556.java
deleted file mode 100644
index ac6c310..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test556.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_in;
-
-public class A_test556 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		while (true) {
-			for (int y= 0; true; y= x) {
-				/*[*/x= 20;/*]*/
-			}
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test557.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test557.java
deleted file mode 100644
index 2bef61c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test557.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test557 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		for (int y= x; true;) {
-			/*[*/x= 20;/*]*/
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test558.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test558.java
deleted file mode 100644
index 33ed604..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test558.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test558 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		for (int y= 0; (x= 20) < 10; y= x) {
-			/*[*/x= 20;/*]*/
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test559.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test559.java
deleted file mode 100644
index ee8f0e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test559.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test559 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		for (int y= 0; x < 10; x= 20) {
-			/*[*/x= 20;/*]*/
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test560.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test560.java
deleted file mode 100644
index 8f76dee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test560.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test560 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		while (x < 10) {
-			/*[*/x= 20;/*]*/
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test561.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test561.java
deleted file mode 100644
index 6dee2ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test561.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test561 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		do {
-			/*[*/x= 20;/*]*/
-		} while (x < 10);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test562.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test562.java
deleted file mode 100644
index 216e4a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test562.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_in;
-
-public class A_test562 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		do {
-			int y= x;
-			/*[*/x= 20;/*]*/
-		} while (true);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test563.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test563.java
deleted file mode 100644
index b50218b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test563.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_in;
-
-public class A_test563 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		do {
-			int y= x;
-			/*[*/x= 20;/*]*/
-		} while ((x= 20) < 10);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test564.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test564.java
deleted file mode 100644
index a0dbe93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test564.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_in;
-
-public class A_test564 {
-	void foo(final int out){
-		int i;
-		if (out > 5){
-			/*[*/i= 1;/*]*/
-		} else {
-			i= 2;
-		}
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test565.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test565.java
deleted file mode 100644
index 250c46d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test565.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package locals_in;
-
-public class A_test565 {
-	void f(byte bytes) {
-		String s= "k";
-		/*[*/System.out.println(s + " " + bytes); /*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test566.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test566.java
deleted file mode 100644
index 508705b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test566.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test566 {
-	public void foo() {
-		String args[]= null;
-		/*[*/for (int i = 0; i < args.length; i++) {
-			args[i]= "";
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test567.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test567.java
deleted file mode 100644
index d3510f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test567.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test567 {
-	public void foo() {
-		String args[]= null;
-		
-		/*[*/args= new String[4];/*]*/
-		
-		args[0]= args[1];
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test568.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test568.java
deleted file mode 100644
index 59ce55b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test568.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_in;
-
-public class A_test568 {
-	public void foo() {
-		String[] args[]= null;
-		/*[*/for (int i = 0; i < args.length; i++) {
-			args[i]= null;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test569.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test569.java
deleted file mode 100644
index 9392123..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test569.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_in;
-
-public class A_test569 {
-	public void foo() {
-		String[] args[]= null;
-		
-		/*[*/args= new String[1][4];/*]*/
-		
-		args[0]= args[1];
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test500.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test500.java
deleted file mode 100644
index 477a376..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test500.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_out;
-
-public class A_test500 {
-	public void foo() {
-		int x= 10;
-		
-		extracted(x);
-	}
-
-	protected void extracted(int x) {
-		/*[*/int y= x;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test501.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test501.java
deleted file mode 100644
index e28911f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test501.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_out;
-
-public class A_test501 {
-	public void foo() {
-		int x= 10;
-		
-		extracted();
-	}
-
-	protected void extracted() {
-		int x;
-		/*[*/x= 20;
-		int y= x;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test502.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test502.java
deleted file mode 100644
index ba1eb89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test502.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package locals_out;
-
-public class A_test502 {
-	public void foo() {
-		int x= 0;
-		int y= 0;
-
-		extracted();		
-	}
-
-	protected void extracted() {
-		int x;
-		int y;
-		/*[*/x= 10;
-		y= x;
-		x= y;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test503.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test503.java
deleted file mode 100644
index 99e9d5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test503.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_out;
-
-public class A_test503 {
-	public void foo() {
-		int x= 10;
-		
-		extracted(x);
-	}
-
-	protected void extracted(int x) {
-		/*[*/x++;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test504.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test504.java
deleted file mode 100644
index 5d2c633..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test504.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_out;
-
-public class A_test504 {
-	public void foo() {
-		int x= 10;
-		
-		extracted(x);
-	}
-
-	protected void extracted(int x) {
-		/*[*/--x;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test505.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test505.java
deleted file mode 100644
index 59cd11c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test505.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_out;
-
-public class A_test505 {
-	public void foo() {
-		int x= 0;
-		
-		extracted(x);
-	}
-
-	protected void extracted(int x) {
-		/*[*/x+= 1;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test506.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test506.java
deleted file mode 100644
index a20ea9a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test506.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_out;
-
-public class A_test506 {
-	public void foo() {
-		int x= 0;
-		
-		extracted(x);
-	}
-
-	protected void extracted(int x) {
-		/*[*/bar(x);/*]*/
-	}
-
-	public void bar(int i) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test507.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test507.java
deleted file mode 100644
index 38b7d00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test507.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test507 {
-	public void foo() {
-		int x= 0;
-		
-		x = extracted();
-		
-		int y= x;
-	}
-
-	protected int extracted() {
-		int x;
-		/*[*/x= 10;/*]*/
-		return x;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test508.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test508.java
deleted file mode 100644
index 5f75344..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test508.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package locals_out;
-
-public class A_test508 {
-	public void foo() {
-		int x= 0;
-		int y= 0;
-		
-		x = extracted();
-		
-		y= x;
-	}
-
-	protected int extracted() {
-		int x;
-		int y;
-		/*[*/x= 10;
-		y= 20;/*]*/
-		return x;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test509.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test509.java
deleted file mode 100644
index 9c78abd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test509.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_out;
-
-public class A_test509 {
-	public void foo() {
-		int x= 0;
-		int y= 0;
-
-		extracted(x);		
-	}
-
-	protected void extracted(int x) {
-		int y;
-		/*[*/y= x;
-		x= 0;/*]*/
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test510.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test510.java
deleted file mode 100644
index 5422943..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test510.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package locals_out;
-
-public class A_test510 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/int x= 0;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test511.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test511.java
deleted file mode 100644
index 3cd1888..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test511.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_out;
-
-public class A_test511 {
-	public void foo() {
-		int x = extracted();
-		
-		x++;
-	}
-
-	protected int extracted() {
-		/*[*/int x= 0;/*]*/
-		return x;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test512.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test512.java
deleted file mode 100644
index 040704c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test512.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_out;
-
-public class A_test512 {
-	public void foo() {
-		int x = extracted();
-		
-		x++;
-	}
-
-	protected int extracted() {
-		/*[*/int x= 0;
-		int y= x;/*]*/
-		return x;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test513.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test513.java
deleted file mode 100644
index eab0b20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test513.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_out;
-
-public class A_test513 {
-	public void foo() {
-		int y;
-		int x = extracted();
-		x++;
-		y= 10;
-	}
-
-	protected int extracted() {
-		/*[*/int x= 0;
-		int y= 0;/*]*/
-		return x;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test514.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test514.java
deleted file mode 100644
index e84c033..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test514.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package locals_out;
-
-public class A_test514 {
-	public void foo() {
-		int x;
-		extracted();
-		x= 10;
-	}
-
-	protected void extracted() {
-		/*[*/int x;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test515.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test515.java
deleted file mode 100644
index 0da8459..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test515.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_out;
-
-public class A_test515 {
-	public void foo() {
-		int y= 10;
-		
-		int x = extracted(y);
-		
-		x++;
-	}
-
-	protected int extracted(int y) {
-		/*[*/int x= y;/*]*/
-		return x;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test516.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test516.java
deleted file mode 100644
index 4db76df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test516.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_out;
-
-public class A_test516 {
-	public void foo() {
-		int j = extracted();
-		
-		j++;
-	}
-
-	protected int extracted() {
-		/*[*/int i= 10, j= 20;/*]*/
-		return j;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test517.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test517.java
deleted file mode 100644
index 50824b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test517.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_out;
-
-public class A_test517 {
-	public void foo() {
-		int i;
-		int j = extracted();
-		i= j + 10;
-	}
-
-	protected int extracted() {
-		/*[*/int i;
-		int j;
-		j= 20;/*]*/
-		return j;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test518.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test518.java
deleted file mode 100644
index 161986d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test518.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_out;
-
-public class A_test518 {
-	public void foo() {
-		int i;
-		
-		extracted();
-	}
-
-	protected void extracted() {
-		int i;
-		/*[*/i= 10;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test519.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test519.java
deleted file mode 100644
index 84f6a85..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test519.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_out;
-
-public class A_test519 {
-	public void foo() {
-		int i;
-
-		extracted();
-		
-		i= 20;		
-	}
-
-	protected void extracted() {
-		int i;
-		/*[*/i= 10;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test520.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test520.java
deleted file mode 100644
index 9114828..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test520.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_out;
-
-public class A_test520 {
-	public void foo() {
-		int i= 0;
-
-		extracted(i);
-		
-		i= 20;		
-	}
-
-	protected void extracted(int i) {
-		/*[*/int y= i;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test521.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test521.java
deleted file mode 100644
index af631f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test521.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package locals_out;
-
-public class A_test521 {
-	public volatile boolean flag;
-	
-	public void foo() {
-		int i= 5;
-		i = extracted(i);
-		i--;
-	}
-
-	protected int extracted(int i) {
-		/*[*/if (flag)
-			i= 10;/*]*/
-		return i;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test522.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test522.java
deleted file mode 100644
index 5b71f59..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test522.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package locals_out;
-
-public class A_test522 {
-	public volatile boolean flag;
-	
-	public void foo() {
-		int i= 20;
-		i = extracted(i);
-		i--;
-	}
-
-	protected int extracted(int i) {
-		/*[*/target: {
-			if (flag)
-				break target;
-			i= 10;
-		}/*]*/
-		return i;
-	}	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test523.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test523.java
deleted file mode 100644
index 5c679b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test523.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package locals_out;
-
-public class A_test523 {
-	public volatile boolean flag;
-
-	protected void foo() {
-		int i= 0;
-		i = extracted(i);
-		read(i);
-	}
-
-	protected int extracted(int i) {
-		/*[*/try {
-			if (flag)
-				throw new Exception();
-			i= 10;
-		} catch (Exception e) {
-		}/*]*/
-		return i;
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test524.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test524.java
deleted file mode 100644
index 197089d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test524.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package locals_out;
-
-public class A_test524 {
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 0;
-		try {
-			i = extracted();
-		} catch (Exception e) {
-		}
-		read(i);
-	}
-
-	protected int extracted() throws Exception {
-		int i;
-		/*[*/if (flag)
-			throw new Exception();
-		i= 10;/*]*/
-		return i;
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test525.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test525.java
deleted file mode 100644
index b1b6665..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test525.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package locals_out;
-
-public class A_test525 {
-	private static class Exception1 extends Exception {
-	}
-	private static class Exception2 extends Exception {
-	}
-	
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 10;
-		try {
-			i = extracted();
-		} catch (Exception2 e) {
-		}
-		read(i);
-	}
-
-	protected int extracted() throws Exception2 {
-		int i;
-		/*[*/try {
-			if (flag)
-				throw new Exception1();
-			if (!flag)
-				throw new Exception2();
-		} catch (Exception1 e) {
-		}
-		i= 10;/*]*/
-		return i;
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test526.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test526.java
deleted file mode 100644
index 33694e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test526.java
+++ /dev/null

@@ -1,34 +0,0 @@
-package locals_out;
-
-public class A_test526 {
-	private static class Exception1 extends Exception {
-	}
-	private static class Exception2 extends Exception {
-	}
-	
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 10;
-		i = extracted(i);
-		read(i);
-	}
-
-	protected int extracted(int i) {
-		/*[*/try {
-			try {
-				if (flag)
-					throw new Exception1();
-				if (!flag)
-					throw new Exception2();
-			} catch (Exception1 e) {
-			}
-			i= 10;
-		} catch (Exception2 e) {
-		}/*]*/
-		return i;
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test527.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test527.java
deleted file mode 100644
index 0f0b169..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test527.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package locals_out;
-
-public class A_test527 {
-	public volatile boolean flag;
-	
-	protected void foo() {
-		int i= 0;
-		i = extracted(i);
-		read(i);
-	}
-
-	protected int extracted(int i) {
-		/*[*/try {
-			if (flag)
-				throwException();
-			i= 10;
-		} catch (Exception e) {
-		}/*]*/
-		return i;
-	}
-
-	private void read(int i) {
-	}
-	
-	private void throwException() throws Exception {
-		throw new Exception();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test528.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test528.java
deleted file mode 100644
index 1168c9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test528.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package locals_out;
-
-import java.io.IOException;
-
-public class A_test528 {
-	public void foo() throws IOException {
-	}
-
-	static class B extends A_test528 {
-		public void bar() throws IOException {
-			extracted();
-		}
-
-		protected void extracted() throws IOException {
-			/*[*/super.foo();/*]*/
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test530.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test530.java
deleted file mode 100644
index a07c7b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test530.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package locals_out;
-
-public class A_test530 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner= null;
-		
-		inner = extracted();
-		
-		inner.x= 10;
-	}
-
-	protected Inner extracted() {
-		Inner inner;
-		/*[*/inner= new Inner();/*]*/
-		return inner;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test531.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test531.java
deleted file mode 100644
index c44b08a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test531.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test531 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner= new Inner();
-		
-		extracted(inner);
-	}
-
-	protected void extracted(Inner inner) {
-		/*[*/inner.x= 10;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test532.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test532.java
deleted file mode 100644
index c451260..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test532.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package locals_out;
-
-public class A_test532 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner= new Inner();
-		
-		extracted(inner);
-		
-		int y= inner.x;
-	}
-
-	protected void extracted(Inner inner) {
-		/*[*/inner.x= 10;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test533.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test533.java
deleted file mode 100644
index 284574b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test533.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package locals_out;
-
-public class A_test533 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner = extracted();
-
-		Inner inner2= inner;		
-	}
-
-	protected Inner extracted() {
-		/*[*/Inner inner= new Inner();/*]*/
-		return inner;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test534.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test534.java
deleted file mode 100644
index ecb9979..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test534.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package locals_out;
-
-public class A_test534 {
-	class Inner {
-		public int x;
-	}
-	
-	public void foo() {
-		Inner inner= new Inner();
-		
-		extracted(inner);
-		
-		int y= inner.x;
-	}
-
-	protected void extracted(Inner inner) {
-		/*[*/inner.x= 10;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test535.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test535.java
deleted file mode 100644
index 78df88b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test535.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package locals_out;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class A_test535 {
-
-	public void bar() {
-		List allElements= new ArrayList();
-		Iterator iter= allElements.iterator();		
-
-		extracted(allElements, iter);
-	}
-
-	protected void extracted(List allElements, Iterator iter) {
-		/*[*/while (iter.hasNext()) {
-			allElements.add(iter.next());
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test536.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test536.java
deleted file mode 100644
index 9109a9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test536.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package locals_out;
-
-public class A_test536 {
-
-	public void bar() {
-		{ int k= 27; k++; }
-		int i= 37;
-		if (i == 0) {
-			int k= 17;
-			i = extracted(i, k);
-		}
-		i++;
-	}
-
-	protected int extracted(int i, int k) {
-		/*[*/k= k + 1;
-		k += 2;
-		i += 2;
-		k++;/*]*/
-		return i;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test537.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test537.java
deleted file mode 100644
index 6c8a274..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test537.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package locals_out;
-
-public class A_test537 {
-	public void foo() {
-		final int i= 10;
-		
-		Runnable run = extracted(i);
-		
-		run.run();
-	}
-
-	protected Runnable extracted(final int i) {
-		/*[*/Runnable run= new Runnable() {
-			public void run() {
-				System.out.println("" + i);
-			}
-		};/*]*/
-		return run;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test538.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test538.java
deleted file mode 100644
index 9e39979..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test538.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_out;
-
-public class A_test538 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		
-		extracted(i, array);
-	}
-
-	protected void extracted(int i, int[] array) {
-		/*[*/array[i]= 10;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test539.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test539.java
deleted file mode 100644
index 746757f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test539.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_out;
-
-public class A_test539 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		int[] index= new int[1];
-		
-		extracted(i, array, index);
-	}
-
-	protected void extracted(int i, int[] array, int[] index) {
-		/*[*/array[index[i]]= 10;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test540.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test540.java
deleted file mode 100644
index 7f2a9c3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test540.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_out;
-
-public class A_test540 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		int[] index= new int[1];
-		
-		extracted(array, index);
-	}
-
-	protected void extracted(int[] array, int[] index) {
-		/*[*/array[0]= index[0];/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test541.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test541.java
deleted file mode 100644
index d855112..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test541.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test541 {
-	class Inner {
-		public int x;
-	}
-	public void foo() {
-		int[] array= new int[10];
-		Inner inner= new Inner();
-		
-		extracted(array, inner);
-	}
-	protected void extracted(int[] array, Inner inner) {
-		/*[*/array[inner.x]= 10;
-		inner.x= 20;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test542.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test542.java
deleted file mode 100644
index 2b40ed6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test542.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package locals_out;
-
-public class A_test542 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		
-		extracted(i, array);
-	}
-
-	protected void extracted(int i, int[] array) {
-		/*[*/array[i++]= 10;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test543.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test543.java
deleted file mode 100644
index 9c35329..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test543.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test543 {
-	public void foo() {
-		int i= 0;
-		int[] array= new int[10];
-		
-		i = extracted(i, array);
-		
-		i++;
-	}
-
-	protected int extracted(int i, int[] array) {
-		/*[*/array[i++]= 10;/*]*/
-		return i;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test550.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test550.java
deleted file mode 100644
index 5c9239e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test550.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test550 {
-
-	public void foo() {
-		int i= 0;
-		while(true) {
-			i = extracted(i);
-		}
-	}
-
-	protected int extracted(int i) {
-		/*[*/i++;/*]*/
-		return i;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test551.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test551.java
deleted file mode 100644
index 5bbdb39..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test551.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test551 {
-
-	public void foo() {
-		int i= 0;
-		do {
-			i = extracted(i);
-		} while (true);
-	}
-
-	protected int extracted(int i) {
-		/*[*/i++;/*]*/
-		return i;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test552.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test552.java
deleted file mode 100644
index b9cf77e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test552.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test552 {
-
-	public void foo() {
-		int i= 0;
-		for (;true;) {
-			i = extracted(i);
-		}
-	}
-
-	protected int extracted(int i) {
-		/*[*/i++;/*]*/
-		return i;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test553.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test553.java
deleted file mode 100644
index 7b1a264..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test553.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test553 {
-
-	public void foo() {
-		int i= 0;
-		for (int x= i++, y= x;true;) {
-			extracted(i);
-		}
-	}
-
-	protected void extracted(int i) {
-		int x;
-		/*[*/x= i;/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test554.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test554.java
deleted file mode 100644
index 0513731..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test554.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_out;
-
-public class A_test554 {
-	public boolean flag;
-	public void foo() {
-		int x;
-		extracted();
-		x= 20;
-	}
-	protected void extracted() {
-		int x;
-		/*[*/if (flag)
-			x= 10;/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test555.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test555.java
deleted file mode 100644
index f41884a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test555.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package locals_out;
-
-public class A_test555 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		while (true) {
-			for (int y= x; true; ) {
-				x = extracted();
-			}
-		}
-	}
-	protected int extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-		return x;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test556.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test556.java
deleted file mode 100644
index 429b007..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test556.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package locals_out;
-
-public class A_test556 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		while (true) {
-			for (int y= 0; true; y= x) {
-				x = extracted();
-			}
-		}
-	}
-	protected int extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-		return x;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test557.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test557.java
deleted file mode 100644
index 384cc2d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test557.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package locals_out;
-
-public class A_test557 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		for (int y= x; true;) {
-			extracted();
-		}
-	}
-	protected void extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test558.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test558.java
deleted file mode 100644
index 57fa418..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test558.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test558 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		for (int y= 0; (x= 20) < 10; y= x) {
-			x = extracted();
-		}
-	}
-	protected int extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-		return x;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test559.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test559.java
deleted file mode 100644
index 049228c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test559.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test559 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		for (int y= 0; x < 10; x= 20) {
-			x = extracted();
-		}
-	}
-	protected int extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-		return x;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test560.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test560.java
deleted file mode 100644
index 36f3839..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test560.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test560 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		while (x < 10) {
-			x = extracted();
-		}
-	}
-	protected int extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-		return x;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test561.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test561.java
deleted file mode 100644
index 40951a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test561.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test561 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		do {
-			x = extracted();
-		} while (x < 10);
-	}
-	protected int extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-		return x;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test562.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test562.java
deleted file mode 100644
index f444bfb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test562.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package locals_out;
-
-public class A_test562 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		do {
-			int y= x;
-			x = extracted();
-		} while (true);
-	}
-	protected int extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-		return x;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test563.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test563.java
deleted file mode 100644
index bc13078..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test563.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package locals_out;
-
-public class A_test563 {
-	public boolean flag;
-	public void foo() {
-		int x= 0;
-		do {
-			int y= x;
-			extracted();
-		} while ((x= 20) < 10);
-	}
-	protected void extracted() {
-		int x;
-		/*[*/x= 20;/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test564.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test564.java
deleted file mode 100644
index 30f68fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test564.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package locals_out;
-
-public class A_test564 {
-	void foo(final int out){
-		int i;
-		if (out > 5){
-			i = extracted();
-		} else {
-			i= 2;
-		}
-		i++;
-	}
-
-	protected int extracted() {
-		int i;
-		/*[*/i= 1;/*]*/
-		return i;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test565.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test565.java
deleted file mode 100644
index 4063f28..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test565.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package locals_out;
-
-public class A_test565 {
-	void f(byte bytes) {
-		String s= "k";
-		extracted(bytes, s);
-	}
-
-	protected void extracted(byte bytes, String s) {
-		/*[*/System.out.println(s + " " + bytes); /*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test566.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test566.java
deleted file mode 100644
index 8c96b2f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test566.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_out;
-
-public class A_test566 {
-	public void foo() {
-		String args[]= null;
-		extracted(args);
-	}
-
-	protected void extracted(String[] args) {
-		/*[*/for (int i = 0; i < args.length; i++) {
-			args[i]= "";
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test567.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test567.java
deleted file mode 100644
index 687d7af..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test567.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package locals_out;
-
-public class A_test567 {
-	public void foo() {
-		String args[]= null;
-		
-		args = extracted();
-		
-		args[0]= args[1];
-	}
-
-	protected String[] extracted() {
-		String[] args;
-		/*[*/args= new String[4];/*]*/
-		return args;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test568.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test568.java
deleted file mode 100644
index eb7f47c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test568.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package locals_out;
-
-public class A_test568 {
-	public void foo() {
-		String[] args[]= null;
-		extracted(args);
-	}
-
-	protected void extracted(String[][] args) {
-		/*[*/for (int i = 0; i < args.length; i++) {
-			args[i]= null;
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test569.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test569.java
deleted file mode 100644
index a18bbaf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test569.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package locals_out;
-
-public class A_test569 {
-	public void foo() {
-		String[] args[]= null;
-		
-		args = extracted();
-		
-		args[0]= args[1];
-	}
-
-	protected String[][] extracted() {
-		String[][] args;
-		/*[*/args= new String[1][4];/*]*/
-		return args;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test650.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test650.java
deleted file mode 100644
index 71c96a8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test650.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package nested_in;
-
-public class A_test650 {
-	public class Inner {
-		public void foo() {
-			/*[*/foo();/*]*/
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test651.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test651.java
deleted file mode 100644
index 52f2c0b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test651.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package nested_in;
-
-public class A_test651 {
-	public void foo() {
-		Runnable run= new Runnable() {
-			public void run() {
-				/*[*/foo();/*]*/
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test652.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test652.java
deleted file mode 100644
index 243b33b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test652.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package nested_in;
-
-public class A_test652 {
-	public void foo() {
-		Runnable run= new Runnable() {
-			public void run() {
-				foo();
-			}
-		};
-		
-		/*[*/foo();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test653.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test653.java
deleted file mode 100644
index 3064141..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test653.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package nested_in;
-
-public class A_test653 {
-	public A_test653() {
-		/*[*/foo();/*]*/
-	}
-	public void foo() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test654.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test654.java
deleted file mode 100644
index bbe1547..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test654.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package nested_in;
-
-public class A_test654 {
-	public void foo() {
-		class Inner {
-			public void foo() {
-				/*[*/foo();/*]*/
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test650.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test650.java
deleted file mode 100644
index 07036b9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test650.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package nested_out;
-
-public class A_test650 {
-	public class Inner {
-		public void foo() {
-			extracted();
-		}
-
-		protected void extracted() {
-			/*[*/foo();/*]*/
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test651.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test651.java
deleted file mode 100644
index efc2c90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test651.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package nested_out;
-
-public class A_test651 {
-	public void foo() {
-		Runnable run= new Runnable() {
-			public void run() {
-				extracted();
-			}
-
-			protected void extracted() {
-				/*[*/foo();/*]*/
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test652.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test652.java
deleted file mode 100644
index 0483b5a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test652.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package nested_out;
-
-public class A_test652 {
-	public void foo() {
-		Runnable run= new Runnable() {
-			public void run() {
-				foo();
-			}
-		};
-		
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/foo();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test653.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test653.java
deleted file mode 100644
index 49c179b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test653.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package nested_out;
-
-public class A_test653 {
-	public A_test653() {
-		extracted();
-	}
-	protected void extracted() {
-		/*[*/foo();/*]*/
-	}
-	public void foo() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test654.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test654.java
deleted file mode 100644
index 8dc1bf7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test654.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package nested_out;
-
-public class A_test654 {
-	public void foo() {
-		class Inner {
-			public void foo() {
-				extracted();
-			}
-
-			protected void extracted() {
-				/*[*/foo();/*]*/
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test900.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test900.java
deleted file mode 100644
index 29b4951..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test900.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package parameterName_in;
-
-public class A_test900 {
-	public void foo() {
-		int i= 0;
-		int y= 0;
-		
-		/*]*/System.out.println(i + y);/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test901.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test901.java
deleted file mode 100644
index 64d1eca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test901.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package parameterName_in;
-
-public class A_test901 {
-	public void foo() {
-		int i= 0;
-		int y= 0;
-		
-		/*]*/System.out.println(i + y);/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test902.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test902.java
deleted file mode 100644
index 11fb646..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test902.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package parameterName_in;
-
-public class A_test902 {
-	public void foo() {
-		int i= 0;
-		int y= 0;
-		
-		/*]*/System.out.println(i + y);/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test903.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test903.java
deleted file mode 100644
index abebe1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test903.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package parameterName_in;
-
-public class A_test903 {
-	public void foo() {
-		int i= 0;
-		float y= 0;
-		
-		/*[*/System.out.println(i + y);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test904.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test904.java
deleted file mode 100644
index 99e4f15..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test904.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package parameterName_in;
-
-public class A_test904 {
-	public void foo() {
-		int i= 0;
-		float y= 0;
-		
-		/*[*/System.out.println(i + y);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test905.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test905.java
deleted file mode 100644
index 4f728be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test905.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package parameterName_in;
-
-public class A_test905 {
-	public void foo() {
-		String x = "x";
-		/*[*/String y = "a" + x;
-		System.out.println(x);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test906.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test906.java
deleted file mode 100644
index 80d475c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test906.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package parameterName_in;
-
-public class A_test906 {
-	public void foo() {
-		int i = 2;
-		/*]*/i = i * 2;/*[*/
-		int a = i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test903.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test903.java
deleted file mode 100644
index 861fdc5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test903.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package parameterName_out;
-
-public class A_test903 {
-	public void foo() {
-		int i= 0;
-		float y= 0;
-		
-		extracted(i, y);
-	}
-
-	protected void extracted(int xxx, float yyyy) {
-		/*[*/System.out.println(xxx + yyyy);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test904.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test904.java
deleted file mode 100644
index 696e22e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test904.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package parameterName_out;
-
-public class A_test904 {
-	public void foo() {
-		int i= 0;
-		float y= 0;
-		
-		extracted(y, i);
-	}
-
-	protected void extracted(float zz, int xx) {
-		/*[*/System.out.println(xx + zz);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test905.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test905.java
deleted file mode 100644
index bf9710c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test905.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package parameterName_out;
-
-public class A_test905 {
-	public void foo() {
-		String x = "x";
-		extracted(x);
-	}
-
-	protected void extracted(String message) {
-		/*[*/String y = "a" + message;
-		System.out.println(message);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test906.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test906.java
deleted file mode 100644
index d3d549b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test906.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package parameterName_out;
-
-public class A_test906 {
-	public void foo() {
-		int i = 2;
-		i = extracted(i);
-		int a = i;
-	}
-
-	protected int extracted(int xxx) {
-		/*]*/xxx = xxx * 2;/*[*/
-		return xxx;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test700.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test700.java
deleted file mode 100644
index 4293ac7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test700.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package return_in;
-
-public class A_test700 {
-	public void foo() {
-		/*[*/return;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test701.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test701.java
deleted file mode 100644
index 5c9c07c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test701.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package return_in;
-
-public class A_test701 {
-	public boolean foo() {
-		/*[*/return true;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test702.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test702.java
deleted file mode 100644
index 0365888..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test702.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package return_in;
-
-public class A_test702 {
-	public boolean foo() {
-		/*[*/if (10 == 10)
-			return true;
-		else
-			return false;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test703.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test703.java
deleted file mode 100644
index 5b44050..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test703.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package return_in;
-
-public class A_test703 {
-	public boolean foo() {
-		/*[*/if (0 == 0) {
-			if (10 == 10)
-				return true;
-			else
-				return false;
-		}
-		foo();
-		return false;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test704.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test704.java
deleted file mode 100644
index d4cb577..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test704.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package return_in;
-
-public class A_test704 {
-	private boolean flag;
-	public boolean foo() {
-		/*[*/do {
-			return true;
-		} while (flag);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test705.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test705.java
deleted file mode 100644
index f9d02a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test705.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package return_in;
-
-public class A_test705 {
-	public boolean foo() {
-		/*[*/try {
-			foo();
-		} catch(Exception e) {
-		} finally {
-			return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test706.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test706.java
deleted file mode 100644
index 260a393..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test706.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package return_in;
-
-public class A_test706 {
-	public boolean foo() {
-		/*[*/try {
-			foo();
-			return true;
-		} catch(Exception e) {
-			return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test707.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test707.java
deleted file mode 100644
index c727af6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test707.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package return_in;
-
-public class A_test707 {
-	boolean flag;
-	public boolean foo() {
-		/*[*/target: {
-			do {
-				if (flag)
-					break target;
-				return false;
-			} while (flag);
-		}
-		return true;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test708.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test708.java
deleted file mode 100644
index 0d80514..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test708.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package return_in;
-
-public class A_test708 {
-	boolean flag;
-	public boolean foo() {
-		/*[*/do {
-			if (flag)
-				foo();
-			return true;
-		} while(flag);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test709.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test709.java
deleted file mode 100644
index 79db65f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test709.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package return_in;
-
-public class A_test709 {
-	public boolean foo() {
-		int i= 0;
-		/*[*/switch (i) {
-			case 1:
-				return true;
-			default:
-				return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test710.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test710.java
deleted file mode 100644
index 9243e89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test710.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package return_in;
-
-public class A_test710 {
-	public boolean foo() {
-		int i= 0;
-		/*[*/switch (i) {
-			case 1:
-			case 2:
-				return true;
-			default:
-				return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test711.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test711.java
deleted file mode 100644
index 8cff14c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test711.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package return_in;
-
-public class A_test711 {
-	public boolean foo() {
-		int i= 0;
-		/*[*/switch (i) {
-			case 1:
-				foo();
-			case 2:
-				return true;
-			default:
-				return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test712.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test712.java
deleted file mode 100644
index 6346f21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test712.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package return_in;
-
-import java.util.List;
-
-public class A_test712 {
-	public List foo() {
-		/*[*/return null;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test713.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test713.java
deleted file mode 100644
index 6a4488c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test713.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package return_in;
-
-public class A_test713 {
-	public java.util.List foo() {
-		/*[*/return null;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test714.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test714.java
deleted file mode 100644
index 8eb6e1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test714.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package return_in;
-
-public class A_test714 {
-	public boolean foo() {
-		/*[*/boolean b= false;
-		foo();
-		return (b == true);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test715.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test715.java
deleted file mode 100644
index ff32407..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test715.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package return_in;
-
-public class A_test715 {
-	public interface I {
-		public boolean run();
-	}
-	public void foo() {
-		/*[*/bar (this, new I() {
-			public boolean run() {
-				return true;
-			}
-		});/*]*/
-	}
-	public void bar(A_test715 a, I i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test716.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test716.java
deleted file mode 100644
index 0ef56eb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test716.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package return_in;
-
-public class A_test716 {
-	public boolean flag;
-	public boolean foo() {
-		/*[*/if (flag)
-			return false;
-		else
-			throw new NullPointerException();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test717.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test717.java
deleted file mode 100644
index 671ac2f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test717.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package return_in;
-
-public class A_test717 {
-	public boolean foo() {
-		int i= 0;
-		/*[*/switch(i) {
-			case 10:
-				return false;
-			default:
-				throw new NullPointerException();	
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test718.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test718.java
deleted file mode 100644
index 3db6861..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test718.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package return_in;
-
-public class A_test718 {
-	public boolean foo() {
-		int i= 0;
-		/*[*/switch(i) {
-			case 10:
-				throw new NullPointerException();	
-			default:
-				return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test719.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test719.java
deleted file mode 100644
index a8dfced..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test719.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package return_in;
-public class A_test719 {
-	public boolean foo() {
-		/*[*/if (foo())
-			return true;
-		if (foo())
-			return true;
-		else
-			return false;/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test720.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test720.java
deleted file mode 100644
index 83632b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test720.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package return_in;
-
-public class A_test720 {
-	private boolean flag;
-	public boolean foo() {
-		if (flag) {
-			/*[*/try {
-				foo();
-			} catch(Exception e) {
-			}
-			return false;/*]*/
-		}
-		return true;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test721.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test721.java
deleted file mode 100644
index bab478d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test721.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package return_in;
-
-public class A_test721 {
-	public volatile boolean flag;
-	
-	public void foo() {
-		int i;
-		/*[*/i= 10;/*]*/
-		if (flag)
-			i= 20;
-		i--;
-	}
-
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test722.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test722.java
deleted file mode 100644
index c46db8e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test722.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package return_in;
-
-public class A_test722 {
-	void f(){
-		for (int i = 0; i < 10; i++) {
-			/*[*/for (int j = 0; j < 10; j++) {
-			}/*]*/
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test723.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test723.java
deleted file mode 100644
index 40223ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test723.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package return_in;
-
-public class A_test723 {
-	public void foo() {
-		{
-			int i= 0;
-			/*[*/i--;/*]*/
-			i++;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test724.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test724.java
deleted file mode 100644
index e2565c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test724.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package return_in;
-
-public class A_test724 {
-	protected void foo() {
-		int i= 0;
-		int j= 1;
-		switch (j) {
-			case 1 :
-				/*[*/
-				i= 1;/*]*/
-				break;
-			default :
-				i= -1;
-				break;
-		}
-		System.out.println(i);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test725.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test725.java
deleted file mode 100644
index 9b3d2a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test725.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package return_in;
-
-public class A_test725 {
-	private boolean flag;
-	protected void foo() {
-		int i= 0;
-		if (flag) {
-			/*[*/i= 10;/*]*/
-			i= 20;
-		} else {
-			read(i);
-		}
-		read(i);
-	}
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test726.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test726.java
deleted file mode 100644
index 93713db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test726.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package return_in;
-
-public class A_test726 {
-
-	boolean flag;
-
-	protected void foo() {
-		int j= 0;
-		for(int i= 0; i < 10; i++) {
-			if (flag) {
-				/*[*/j= 10;/*]*/
-			} else {
-				read(j);
-			}
-		}
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test727.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test727.java
deleted file mode 100644
index c58037d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test727.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package return_in;
-
-public class A_test727 {
-	public void foo() {
-		/*[*/if (true) return;
-		bar();/*]*/
-	}
-
-	public void bar() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test728.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test728.java
deleted file mode 100644
index 73b63e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test728.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package return_in;
-
-public class A_test728 {
-	public void foo() {
-		Object runnable= null;
-		Object[] disposeList= null;
-		/*[*/for (int i=0; i < disposeList.length; i++) {
-			if (disposeList [i] == null) {
-				disposeList [i] = runnable;
-				return;
-			}
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test700.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test700.java
deleted file mode 100644
index 07feb81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test700.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package return_out;
-
-public class A_test700 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/return;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test701.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test701.java
deleted file mode 100644
index 9f106b9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test701.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package return_out;
-
-public class A_test701 {
-	public boolean foo() {
-		return extracted();
-	}
-
-	protected boolean extracted() {
-		/*[*/return true;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test702.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test702.java
deleted file mode 100644
index e7953fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test702.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package return_out;
-
-public class A_test702 {
-	public boolean foo() {
-		return extracted();
-	}
-
-	protected boolean extracted() {
-		/*[*/if (10 == 10)
-			return true;
-		else
-			return false;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test703.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test703.java
deleted file mode 100644
index e773bc2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test703.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package return_out;
-
-public class A_test703 {
-	public boolean foo() {
-		return extracted();
-	}
-
-	protected boolean extracted() {
-		/*[*/if (0 == 0) {
-			if (10 == 10)
-				return true;
-			else
-				return false;
-		}
-		foo();
-		return false;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test704.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test704.java
deleted file mode 100644
index daca0c9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test704.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package return_out;
-
-public class A_test704 {
-	private boolean flag;
-	public boolean foo() {
-		return extracted();
-	}
-	protected boolean extracted() {
-		/*[*/do {
-			return true;
-		} while (flag);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test705.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test705.java
deleted file mode 100644
index 65f912d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test705.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package return_out;
-
-public class A_test705 {
-	public boolean foo() {
-		return extracted();
-	}
-
-	protected boolean extracted() {
-		/*[*/try {
-			foo();
-		} catch(Exception e) {
-		} finally {
-			return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test706.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test706.java
deleted file mode 100644
index fc41c2a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test706.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package return_out;
-
-public class A_test706 {
-	public boolean foo() {
-		return extracted();
-	}
-
-	protected boolean extracted() {
-		/*[*/try {
-			foo();
-			return true;
-		} catch(Exception e) {
-			return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test707.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test707.java
deleted file mode 100644
index 5e0a282..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test707.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package return_out;
-
-public class A_test707 {
-	boolean flag;
-	public boolean foo() {
-		return extracted();
-	}
-	protected boolean extracted() {
-		/*[*/target: {
-			do {
-				if (flag)
-					break target;
-				return false;
-			} while (flag);
-		}
-		return true;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test708.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test708.java
deleted file mode 100644
index 7537b00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test708.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package return_out;
-
-public class A_test708 {
-	boolean flag;
-	public boolean foo() {
-		return extracted();
-	}
-	protected boolean extracted() {
-		/*[*/do {
-			if (flag)
-				foo();
-			return true;
-		} while(flag);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test709.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test709.java
deleted file mode 100644
index 2bcc6c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test709.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package return_out;
-
-public class A_test709 {
-	public boolean foo() {
-		int i= 0;
-		return extracted(i);
-	}
-
-	protected boolean extracted(int i) {
-		/*[*/switch (i) {
-			case 1:
-				return true;
-			default:
-				return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test710.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test710.java
deleted file mode 100644
index b84ceb8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test710.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package return_out;
-
-public class A_test710 {
-	public boolean foo() {
-		int i= 0;
-		return extracted(i);
-	}
-
-	protected boolean extracted(int i) {
-		/*[*/switch (i) {
-			case 1:
-			case 2:
-				return true;
-			default:
-				return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test711.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test711.java
deleted file mode 100644
index cc6dc61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test711.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package return_out;
-
-public class A_test711 {
-	public boolean foo() {
-		int i= 0;
-		return extracted(i);
-	}
-
-	protected boolean extracted(int i) {
-		/*[*/switch (i) {
-			case 1:
-				foo();
-			case 2:
-				return true;
-			default:
-				return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test712.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test712.java
deleted file mode 100644
index 7232b99..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test712.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package return_out;
-
-import java.util.List;
-
-public class A_test712 {
-	public List foo() {
-		return extracted();
-	}
-
-	protected List extracted() {
-		/*[*/return null;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test713.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test713.java
deleted file mode 100644
index ad35cb8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test713.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package return_out;
-
-public class A_test713 {
-	public java.util.List foo() {
-		return extracted();
-	}
-
-	protected java.util.List extracted() {
-		/*[*/return null;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test714.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test714.java
deleted file mode 100644
index 3915c5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test714.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package return_out;
-
-public class A_test714 {
-	public boolean foo() {
-		return extracted();
-	}
-
-	protected boolean extracted() {
-		/*[*/boolean b= false;
-		foo();
-		return (b == true);/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test715.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test715.java
deleted file mode 100644
index ac3631e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test715.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package return_out;
-
-public class A_test715 {
-	public interface I {
-		public boolean run();
-	}
-	public void foo() {
-		extracted();
-	}
-	protected void extracted() {
-		/*[*/bar (this, new I() {
-			public boolean run() {
-				return true;
-			}
-		});/*]*/
-	}
-	public void bar(A_test715 a, I i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test716.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test716.java
deleted file mode 100644
index e274375..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test716.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package return_out;
-
-public class A_test716 {
-	public boolean flag;
-	public boolean foo() {
-		return extracted();
-	}
-	protected boolean extracted() {
-		/*[*/if (flag)
-			return false;
-		else
-			throw new NullPointerException();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test717.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test717.java
deleted file mode 100644
index ac4d5e4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test717.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package return_out;
-
-public class A_test717 {
-	public boolean foo() {
-		int i= 0;
-		return extracted(i);
-	}
-
-	protected boolean extracted(int i) {
-		/*[*/switch(i) {
-			case 10:
-				return false;
-			default:
-				throw new NullPointerException();	
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test718.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test718.java
deleted file mode 100644
index ea2c57b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test718.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package return_out;
-
-public class A_test718 {
-	public boolean foo() {
-		int i= 0;
-		return extracted(i);
-	}
-
-	protected boolean extracted(int i) {
-		/*[*/switch(i) {
-			case 10:
-				throw new NullPointerException();	
-			default:
-				return false;
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test719.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test719.java
deleted file mode 100644
index a9dae13..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test719.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package return_out;
-public class A_test719 {
-	public boolean foo() {
-		return extracted();
-	}
-
-	protected boolean extracted() {
-		/*[*/if (foo())
-			return true;
-		if (foo())
-			return true;
-		else
-			return false;/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test720.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test720.java
deleted file mode 100644
index 5678855..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test720.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package return_out;
-
-public class A_test720 {
-	private boolean flag;
-	public boolean foo() {
-		if (flag) {
-			return extracted();
-		}
-		return true;
-	}
-	protected boolean extracted() {
-		/*[*/try {
-			foo();
-		} catch(Exception e) {
-		}
-		return false;/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test721.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test721.java
deleted file mode 100644
index 37d1e54..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test721.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package return_out;
-
-public class A_test721 {
-	public volatile boolean flag;
-	
-	public void foo() {
-		int i;
-		i = extracted();
-		if (flag)
-			i= 20;
-		i--;
-	}
-
-	protected int extracted() {
-		int i;
-		/*[*/i= 10;/*]*/
-		return i;
-	}
-
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test722.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test722.java
deleted file mode 100644
index e084401..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test722.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package return_out;
-
-public class A_test722 {
-	void f(){
-		for (int i = 0; i < 10; i++) {
-			extracted();
-		}
-	}
-
-	protected void extracted() {
-		/*[*/for (int j = 0; j < 10; j++) {
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test723.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test723.java
deleted file mode 100644
index 61b28ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test723.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package return_out;
-
-public class A_test723 {
-	public void foo() {
-		{
-			int i= 0;
-			i = extracted(i);
-			i++;
-		}
-	}
-
-	protected int extracted(int i) {
-		/*[*/i--;/*]*/
-		return i;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test724.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test724.java
deleted file mode 100644
index cebc248..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test724.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package return_out;
-
-public class A_test724 {
-	protected void foo() {
-		int i= 0;
-		int j= 1;
-		switch (j) {
-			case 1 :
-				i = extracted();
-				break;
-			default :
-				i= -1;
-				break;
-		}
-		System.out.println(i);
-	}
-
-	protected int extracted() {
-		int i;
-		/*[*/
-		i= 1;/*]*/
-		return i;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test725.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test725.java
deleted file mode 100644
index 88fc12e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test725.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package return_out;
-
-public class A_test725 {
-	private boolean flag;
-	protected void foo() {
-		int i= 0;
-		if (flag) {
-			extracted();
-			i= 20;
-		} else {
-			read(i);
-		}
-		read(i);
-	}
-	protected void extracted() {
-		int i;
-		/*[*/i= 10;/*]*/
-	}
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test726.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test726.java
deleted file mode 100644
index 2d5b986..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test726.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package return_out;
-
-public class A_test726 {
-
-	boolean flag;
-
-	protected void foo() {
-		int j= 0;
-		for(int i= 0; i < 10; i++) {
-			if (flag) {
-				j = extracted();
-			} else {
-				read(j);
-			}
-		}
-	}
-
-	protected int extracted() {
-		int j;
-		/*[*/j= 10;/*]*/
-		return j;
-	}
-
-	private void read(int i) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test727.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test727.java
deleted file mode 100644
index 7b1f6d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test727.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package return_out;
-
-public class A_test727 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/if (true) return;
-		bar();/*]*/
-	}
-
-	public void bar() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test728.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test728.java
deleted file mode 100644
index 5db468b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test728.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package return_out;
-
-public class A_test728 {
-	public void foo() {
-		Object runnable= null;
-		Object[] disposeList= null;
-		extracted(runnable, disposeList);
-	}
-
-	protected void extracted(Object runnable, Object[] disposeList) {
-		/*[*/for (int i=0; i < disposeList.length; i++) {
-			if (disposeList [i] == null) {
-				disposeList [i] = runnable;
-				return;
-			}
-		}/*]*/
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test1.java
deleted file mode 100644
index c12b372..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package selection;
-
-public class A_test1 {
-	public void foo() {
-		/*[*/foo()/*]*/;
-	}
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test2.java
deleted file mode 100644
index 06787fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package selection;
-
-public class A_test2 {
-	public void foo() {
-		/*[*/foo()/*[*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test3.java
deleted file mode 100644
index b8e0567..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test3.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package selection;
-
-public class A_test3 {
-	public void foo() {
-		/*]*/foo()/*]*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test4.java
deleted file mode 100644
index 5f984e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test4.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package selection;
-
-public class A_test4 {
-	public void foo() {
-		/*]*/foo()/*[*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test400.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test400.java
deleted file mode 100644
index a378122..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test400.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package semicolon_in;
-
-public class A_test400 {
-	public void foo() {
-		/*]*/foo()/*]*/;
-	} 
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test401.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test401.java
deleted file mode 100644
index 636ae43..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test401.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package semicolon_in;
-
-public class A_test401 {
-	public void foo() {
-		/*[*/foo();/*]*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test402.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test402.java
deleted file mode 100644
index d3368f2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test402.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package semicolon_in;
-
-public class A_test402 {
-	public void foo() {
-		/*[*/{
-			foo();
-		}/*]*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test403.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test403.java
deleted file mode 100644
index 495cf26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test403.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package semicolon_in;
-
-public class A_test403 {
-	public void foo() {
-		/*[*/try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		}/*]*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test404.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test404.java
deleted file mode 100644
index e99c15d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test404.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package semicolon_in;
-
-public class A_test404 {
-	public void foo() {
-		/*[*/int x= 0;/*]*/
-		x= 10;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test406.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test406.java
deleted file mode 100644
index 88f12d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test406.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package semicolon_in;
-
-public class A_test406 {
-	public void foo() {
-		if (/*[*/1 == 10/*]*/)
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test407.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test407.java
deleted file mode 100644
index 64a071a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test407.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package semicolon_in;
-
-public class A_test407 {
-	public void foo() {
-		boolean b;
-		b= /*[*/10 == 20/*]*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test409.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test409.java
deleted file mode 100644
index a76ecca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test409.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package semicolon_in;
-
-public class A_test409 {
-	public void foo() {
-		/*[*/synchronized (this) {
-			foo();
-		}/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test410.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test410.java
deleted file mode 100644
index b36e847..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test410.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package semicolon_in;
-
-public class A_test410 {
-	public void foo() {
-		/*[*/switch (10) {
-			case 1:
-				foo();
-		}/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test400.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test400.java
deleted file mode 100644
index 316cc33..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test400.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package semicolon_out;
-
-public class A_test400 {
-	public void foo() {
-		/*]*/extracted();
-	}
-
-	protected void extracted() {
-		foo()/*]*/;
-	} 
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test401.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test401.java
deleted file mode 100644
index 57a3b8d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test401.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package semicolon_out;
-
-public class A_test401 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/foo();/*]*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test402.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test402.java
deleted file mode 100644
index 9172545..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test402.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package semicolon_out;
-
-public class A_test402 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/{
-			foo();
-		}/*]*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test403.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test403.java
deleted file mode 100644
index 1d28f69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test403.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package semicolon_out;
-
-public class A_test403 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		}/*]*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test404.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test404.java
deleted file mode 100644
index a495ae6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test404.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package semicolon_out;
-
-public class A_test404 {
-	public void foo() {
-		int x;
-		extracted();
-		x= 10;
-	}
-
-	protected void extracted() {
-		/*[*/int x= 0;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test406.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test406.java
deleted file mode 100644
index 5897d37..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test406.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package semicolon_out;
-
-public class A_test406 {
-	public void foo() {
-		if (extracted())
-			foo();
-	}
-
-	protected boolean extracted() {
-		return /*[*/1 == 10/*]*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test407.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test407.java
deleted file mode 100644
index 07e2b35..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test407.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package semicolon_out;
-
-public class A_test407 {
-	public void foo() {
-		boolean b;
-		b= extracted();
-	}
-
-	protected boolean extracted() {
-		return /*[*/10 == 20/*]*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test409.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test409.java
deleted file mode 100644
index 7d9b74b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test409.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package semicolon_out;
-
-public class A_test409 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/synchronized (this) {
-			foo();
-		}/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test410.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test410.java
deleted file mode 100644
index f46a656..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test410.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package semicolon_out;
-
-public class A_test410 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/switch (10) {
-			case 1:
-				foo();
-		}/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java
deleted file mode 100644
index 4b3d789..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package testing;
-
-import java.awt.peer.LabelPeer;
-
-public class E {
-	private F f;
-	public void foo() {
-		try {
-			f.fun();
-		} catch (Exception e) {
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/F.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/F.java
deleted file mode 100644
index e26e596..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/F.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package testing;
-
-import java.lang.reflect.InvocationTargetException;
-
-public class F {
-	public void fun() throws InvocationTargetException {
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test450.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test450.java
deleted file mode 100644
index b709019..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test450.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package try_in;
-
-public class A_test450 {
-	public void foo() {
-		try {
-			/*[*/g();/*]*/
-		} catch (java.io.IOException e) {
-		}
-	}
-	public void g() throws java.io.IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test451.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test451.java
deleted file mode 100644
index e776b0b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test451.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package try_in;
-
-public class A_test451 {
-	public void foo() {
-		/*[*/try {
-			g();
-		} catch (java.io.IOException e) {
-		}/*]*/
-	}
-
-	public void g() throws java.io.IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test452.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test452.java
deleted file mode 100644
index d244cd7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test452.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-
-public class A_test452 {
-	public void foo() {
-		try {
-			/*[*/g();/*]*/
-		} catch (IOException e) {
-		}
-	}
-
-	public void g() throws IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test453.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test453.java
deleted file mode 100644
index 0b9fe6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test453.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-
-public class A_test453 {
-
-	public void foo() {
-		/*[*/try {
-			g();
-		} catch (Exception e) {
-		}/*]*/
-	}
-
-	public void g() throws IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test454.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test454.java
deleted file mode 100644
index 1989417..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test454.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-
-public class A_test454 {
-
-	public void foo() {
-		try {
-			/*[*/throw new IOException("Message");/*]*/
-		} catch (Exception e) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test455.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test455.java
deleted file mode 100644
index f0b3898..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test455.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-
-public class A_test455 {
-
-	public void foo() {
-		try {
-			/*[*/throw createException();/*]*/
-		} catch (Exception e) {
-		}
-	}
-
-	public IOException createException() {
-		return new IOException("Message");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test456.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test456.java
deleted file mode 100644
index 418338d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test456.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-
-public class A_test456 {
-
-	public void foo() {
-		Exception e= new IOException("Message");
-		try {
-			/*[*/throw e;/*]*/
-		} catch (Exception x) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test457.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test457.java
deleted file mode 100644
index 19cdfac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test457.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-
-public class A_test457 {
-
-	public void foo() {
-		Exception[] e= new Exception[] { new IOException("Message") };
-		try {
-			/*[*/throw e[0];/*]*/
-		} catch (Exception x) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test458.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test458.java
deleted file mode 100644
index e59f3c2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test458.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package try_in;
-
-public class A_test458 {
-	public void foo() throws Throwable{
-		try{
-			new A_test458();
-		} catch (Throwable t){
-			/*[*/throw t;/*]*/
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test459.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test459.java
deleted file mode 100644
index b75c53a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test459.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package try_in;
-
-public class A_test459 {
-	public abstract class Protectable {
-		public abstract void protect() throws Exception;
-		public void setUp() throws Exception {
-		}
-	}
-	public void foo() {
-		/*[*/Protectable p= new Protectable() {
-			public void protect() throws Exception {
-				setUp();
-			}
-		};/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test460.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test460.java
deleted file mode 100644
index f3ce449..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test460.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-
-public abstract class A_test460 {
-	public void foo() throws InvocationTargetException {
-		/*[*/InputStreamReader in= null;
-		try {
-			bar();
-		} catch (IOException e) {
-			throw new InvocationTargetException(null);
-		} finally {
-			if (in != null) {
-				try {
-					in.close();
-				} catch (IOException e) {
-				}
-			}
-		}/*]*/
-	}
-
-	public abstract void bar() throws IOException;
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test461.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test461.java
deleted file mode 100644
index 42a0cbe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test461.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-
-public class A_test461 {
-	void f() throws IOException{
-		/*[*/try{
-			f();
-		} catch (IOException e){
-			throw new IOException();
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test462.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test462.java
deleted file mode 100644
index 6c61375..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test462.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package try_in;
-
-import java.io.IOException;
-
-public class A_test462 {
-	void f() throws IOException{
-		/*[*/try{
-			f();
-		} catch (IOException e){
-		} finally {
-			throw new IOException();
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test450.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test450.java
deleted file mode 100644
index 3bd431a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test450.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test450 {
-	public void foo() {
-		try {
-			extracted();
-		} catch (java.io.IOException e) {
-		}
-	}
-	protected void extracted() throws IOException {
-		/*[*/g();/*]*/
-	}
-	public void g() throws java.io.IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test451.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test451.java
deleted file mode 100644
index 39dcc7b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test451.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package try_out;
-
-public class A_test451 {
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/try {
-			g();
-		} catch (java.io.IOException e) {
-		}/*]*/
-	}
-
-	public void g() throws java.io.IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test452.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test452.java
deleted file mode 100644
index deb4660..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test452.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test452 {
-	public void foo() {
-		try {
-			extracted();
-		} catch (IOException e) {
-		}
-	}
-
-	protected void extracted() throws IOException {
-		/*[*/g();/*]*/
-	}
-
-	public void g() throws IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test453.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test453.java
deleted file mode 100644
index 67492b1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test453.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test453 {
-
-	public void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/try {
-			g();
-		} catch (Exception e) {
-		}/*]*/
-	}
-
-	public void g() throws IOException {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test454.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test454.java
deleted file mode 100644
index 31f72c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test454.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test454 {
-
-	public void foo() {
-		try {
-			extracted();
-		} catch (Exception e) {
-		}
-	}
-
-	protected void extracted() throws IOException {
-		/*[*/throw new IOException("Message");/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test455.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test455.java
deleted file mode 100644
index 5e9d028..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test455.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test455 {
-
-	public void foo() {
-		try {
-			extracted();
-		} catch (Exception e) {
-		}
-	}
-
-	protected void extracted() throws IOException {
-		/*[*/throw createException();/*]*/
-	}
-
-	public IOException createException() {
-		return new IOException("Message");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test456.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test456.java
deleted file mode 100644
index bc4702e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test456.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test456 {
-
-	public void foo() {
-		Exception e= new IOException("Message");
-		try {
-			extracted(e);
-		} catch (Exception x) {
-		}
-	}
-
-	protected void extracted(Exception e) throws Exception {
-		/*[*/throw e;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test457.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test457.java
deleted file mode 100644
index f1f3b0f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test457.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test457 {
-
-	public void foo() {
-		Exception[] e= new Exception[] { new IOException("Message") };
-		try {
-			extracted(e);
-		} catch (Exception x) {
-		}
-	}
-
-	protected void extracted(Exception[] e) throws Exception {
-		/*[*/throw e[0];/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test458.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test458.java
deleted file mode 100644
index 408275c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test458.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package try_out;
-
-public class A_test458 {
-	public void foo() throws Throwable{
-		try{
-			new A_test458();
-		} catch (Throwable t){
-			extracted(t);
-		}
-	}
-
-	protected void extracted(Throwable t) throws Throwable {
-		/*[*/throw t;/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test459.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test459.java
deleted file mode 100644
index ff79ebf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test459.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package try_out;
-
-public class A_test459 {
-	public abstract class Protectable {
-		public abstract void protect() throws Exception;
-		public void setUp() throws Exception {
-		}
-	}
-	public void foo() {
-		extracted();
-	}
-	protected void extracted() {
-		/*[*/Protectable p= new Protectable() {
-			public void protect() throws Exception {
-				setUp();
-			}
-		};/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test460.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test460.java
deleted file mode 100644
index c5a0e01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test460.java
+++ /dev/null

@@ -1,30 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-
-public abstract class A_test460 {
-	public void foo() throws InvocationTargetException {
-		extracted();
-	}
-
-	protected void extracted() throws InvocationTargetException {
-		/*[*/InputStreamReader in= null;
-		try {
-			bar();
-		} catch (IOException e) {
-			throw new InvocationTargetException(null);
-		} finally {
-			if (in != null) {
-				try {
-					in.close();
-				} catch (IOException e) {
-				}
-			}
-		}/*]*/
-	}
-
-	public abstract void bar() throws IOException;
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test461.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test461.java
deleted file mode 100644
index 05f761c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test461.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test461 {
-	void f() throws IOException{
-		extracted();
-	}
-
-	protected void extracted() throws IOException {
-		/*[*/try{
-			f();
-		} catch (IOException e){
-			throw new IOException();
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test462.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test462.java
deleted file mode 100644
index ba7009c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test462.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package try_out;
-
-import java.io.IOException;
-
-public class A_test462 {
-	void f() throws IOException{
-		extracted();
-	}
-
-	protected void extracted() throws IOException {
-		/*[*/try{
-			f();
-		} catch (IOException e){
-		} finally {
-			throw new IOException();
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test200.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test200.java
deleted file mode 100644
index 8d570be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test200.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package validSelection;
-
-public class A_test200 {
-	public void foo() {
-		/*]*/foo();/*[*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test201.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test201.java
deleted file mode 100644
index 62c304e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test201.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package validSelection;
-
-public class A_test201 {
-	public void foo() {/*[*/
-		foo();
-	/*]*/} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test202.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test202.java
deleted file mode 100644
index d8733ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test202.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test202 {
-	public void foo() {
-		/*]*/foo();
-		foo();/*[*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test203.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test203.java
deleted file mode 100644
index 2edb220..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test203.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test203 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)
-			foo();
-		foo();/*[*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test230.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test230.java
deleted file mode 100644
index 3035340..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test230.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test230 {
-	public void foo() {
-		{/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test231.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test231.java
deleted file mode 100644
index 3d61594..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test231.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test231 {
-	public void foo() {
-		{
-			/*]*/foo()/*[*/;
-		}
-		{
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test232.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test232.java
deleted file mode 100644
index a3b5456..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test232.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test232 {
-	public void foo() {
-		/*]*/{
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test233.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test233.java
deleted file mode 100644
index 75b3868..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test233.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test233 {
-	public void foo() {
-		{
-			foo();
-		}
-		{
-			/*]*/foo()/*[*/;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test234.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test234.java
deleted file mode 100644
index 265b903..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test234.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test234 {
-	public void foo() {
-		{
-			foo();
-		}
-		{/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test235.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test235.java
deleted file mode 100644
index 876b188..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test235.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test235 {
-	public void foo() {
-		{/*[*/
-			foo();
-		/*]*/}
-		{
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test240.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test240.java
deleted file mode 100644
index 00c0091..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test240.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test240 {
-	public void foo() {/*[*/
-		for (int i= 0; i < 10; i++)
-			foo();
-	/*]*/}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test241.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test241.java
deleted file mode 100644
index b3bb0e2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test241.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test241 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)
-			foo();/*[*/
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test244.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test244.java
deleted file mode 100644
index 897ade3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test244.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test244 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			/*]*/foo()/*]*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test245.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test245.java
deleted file mode 100644
index af752d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test245.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test245 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			/*]*/foo();/*[*/
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test246.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test246.java
deleted file mode 100644
index 40a1cd1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test246.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test246 {
-	public void foo() {
-		for (int i= 0; i < 10; i++) {
-			/*]*/foo();/*[*/
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test247.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test247.java
deleted file mode 100644
index 4d5b6aa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test247.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test247 {
-	public void foo() {
-		for (int i= 10; i < 10; i++)/*[*/
-			for (int z= 10; z < 10; z++)
-				foo();
-		/*]*/foo();	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test248.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test248.java
deleted file mode 100644
index 205fb31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test248.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test248 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			foo();
-			
-		/*]*/foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test249.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test249.java
deleted file mode 100644
index 2428f11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test249.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test249 {
-	public void foo() {
-		/*]*/foo();/*[*/
-		
-		for (int i= 0; i < 10; i++)
-			foo();	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test250.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test250.java
deleted file mode 100644
index 18755cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test250.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test250 {
-	public void foo() {
-		while(1 < 10)/*[*/
-			foo();
-	/*]*/}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test251.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test251.java
deleted file mode 100644
index 7a6d6e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test251.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test251 {
-	public void foo() {
-		/*]*/while(1 < 10)
-			foo();/*]*/
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test252.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test252.java
deleted file mode 100644
index 7358876..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test252.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test252 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		while(b())
-			while(b())/*[*/
-				foo();
-		/*]*/foo();		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test253.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test253.java
deleted file mode 100644
index dffc377..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test253.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test253 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		while(b())
-			/*]*/while(b())
-				foo();
-		/*]*/foo();		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test254.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test254.java
deleted file mode 100644
index e22bdc9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test254.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test254 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		while(b())
-			foo();
-			
-		/*]*/foo();/*[*/		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test255.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test255.java
deleted file mode 100644
index d7c8458..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test255.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test255 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		/*]*/foo();/*[*/
-		
-		while(b())
-			foo();	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test260.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test260.java
deleted file mode 100644
index 31a00b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test260.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test260 {
-	public void foo() {
-		/*]*/do
-			foo();
-		while(1 < 10);/*[*/	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test261.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test261.java
deleted file mode 100644
index 1ce96b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test261.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test261 {
-	public void foo() {
-		do /*[*/
-			foo();
-		/*]*/while(1 < 10);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test262.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test262.java
deleted file mode 100644
index 0df5d91..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test262.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test262 {
-	public boolean fBoolean;
-	public void foo() {
-		do 
-			foo();
-		while(fBoolean);
-		
-		/*]*/foo()/*[*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test263.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test263.java
deleted file mode 100644
index 7af8e45..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test263.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test263 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/foo()/*[*/;
-		
-		do 
-			foo();
-		while(fBoolean);		
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test270.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test270.java
deleted file mode 100644
index f9446bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test270.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test270 {
-	public void foo() {
-		/*]*/switch(1) {
-			case 1:
-				foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test271.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test271.java
deleted file mode 100644
index d99c995..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test271.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test271 {
-	public void foo() {
-		switch(1) {
-			case 1:/*[*/
-				foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test272.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test272.java
deleted file mode 100644
index 0648fc5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test272.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test272 {
-	public void foo() {
-		switch(1) {
-			case 1:
-				foo();
-				/*]*/foo()/*[*/;
-				foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test273.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test273.java
deleted file mode 100644
index 191695b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test273.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test273 {
-	public void foo() {
-		switch(1) {
-			case 1:/*[*/
-				foo();
-			/*]*/case 2:
-				foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test274.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test274.java
deleted file mode 100644
index 2f916a8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test274.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test274 {
-	public void foo() {
-		switch(1) {
-			case 1:
-				foo();
-			case 2:
-				foo();
-		}
-		
-		/*]*/foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test275.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test275.java
deleted file mode 100644
index 80511ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test275.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test275 {
-	public void foo() {
-		/*]*/foo();/*[*/
-		
-		switch(1) {
-			case 1:
-				foo();
-			case 2:
-				foo();
-		}		
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test280.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test280.java
deleted file mode 100644
index 33d1996..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test280.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test280 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();
-		else
-			foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test281.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test281.java
deleted file mode 100644
index 7048e9e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test281.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test281 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)
-			/*]*/foo()/*[*/;
-		else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test282.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test282.java
deleted file mode 100644
index 4bd8856..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test282.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test282 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)/*[*/
-			foo();
-		/*]*/else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test283.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test283.java
deleted file mode 100644
index e060d6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test283.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test283 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean) {
-		} else {
-			/*]*/foo();/*[*/
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test284.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test284.java
deleted file mode 100644
index 06eab56..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test284.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test284 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)
-			foo();
-			
-		if (fBoolean) {
-		} else {
-			/*]*/foo();/*[*/
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test285.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test285.java
deleted file mode 100644
index 89b939d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test285.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test285 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)
-			/*[*/foo();/*]*/
-			
-		if (fBoolean) {
-		} else {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test286.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test286.java
deleted file mode 100644
index dc0c3de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test286.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test286 {
-	public boolean fBoolean;
-	public void foo() {
-		/*[*/foo();/*]*/	
-		if (fBoolean)
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test287.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test287.java
deleted file mode 100644
index 45e4f08..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test287.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test287 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)
-			foo();
-		/*[*/foo();/*]*/	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test300.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test300.java
deleted file mode 100644
index e95eda5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test300.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test300 {
-	public void foo() {
-		try {/*[*/
-			foo();
-		/*]*/} catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test301.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test301.java
deleted file mode 100644
index 84b93a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test301.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test301 {
-	public void foo() {
-		try {
-			/*]*/foo()/*[*/;
-		} catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test302.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test302.java
deleted file mode 100644
index 5e0f55f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test302.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test302 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test303.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test303.java
deleted file mode 100644
index 003b7b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test303.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test303 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			/*]*/foo()/*[*/;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test304.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test304.java
deleted file mode 100644
index 23cc5fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test304.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package validSelection;
-
-public class A_test304 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		} catch (Throwable t) {
-			/*]*/foo();/*[*/
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test305.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test305.java
deleted file mode 100644
index aa531b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test305.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package validSelection;
-
-public class A_test305 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			/*]*/foo();/*[*/
-		} catch (Throwable t) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test306.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test306.java
deleted file mode 100644
index 45338ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test306.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package validSelection;
-
-public class A_test306 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		} catch (Error e) {
-			/*]*/foo();/*[*/
-		} catch (Throwable t) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test307.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test307.java
deleted file mode 100644
index 141a152..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test307.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test307 {
-	public void foo() {
-		try {
-			foo();
-		} finally {/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test308.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test308.java
deleted file mode 100644
index 5e598b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test308.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test308 {
-	public void foo() {
-		try {
-			foo();
-		} finally {/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test309.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test309.java
deleted file mode 100644
index f0dc5b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test309.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package validSelection;
-
-public class A_test309 {
-	public void foo() {
-		/*]*/try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		} finally {
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test310.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test310.java
deleted file mode 100644
index 3499da6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test310.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test310 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		}
-		/*]*/foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test311.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test311.java
deleted file mode 100644
index ce222e8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test311.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test311 {
-	public void foo() {
-		/*]*/foo();/*[*/
-		try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test350.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test350.java
deleted file mode 100644
index d358f5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test350.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test350 {
-
-	public void foo() {
-		/*]*/synchronized (this) {
-			foo();
-		}/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test351.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test351.java
deleted file mode 100644
index 521eb6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test351.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test351 {
-
-	public void foo() {
-		foo();/*[*/
-		synchronized (this) {
-			foo();
-		}
-		/*]*/foo();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test352.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test352.java
deleted file mode 100644
index 97540b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test352.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test352 {
-
-	public void foo() {
-		synchronized (this) {/*[*/
-			foo();
-		/*]*/}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test353.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test353.java
deleted file mode 100644
index eee7d64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test353.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test353 {
-
-	public void foo() {
-		synchronized (this) {
-			/*]*/foo();/*[*/
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test360.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test360.java
deleted file mode 100644
index 35d4adb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test360.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection_in;
-
-public class A_test360 {
-	void f(){
-		/*[*/class AA extends A_test360 {
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test361.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test361.java
deleted file mode 100644
index 7a27e8c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test361.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection_in;
-
-public class A_test361 {
-	void f(){
-		/*[*/class AA extends A_test361 {
-		};/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test362.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test362.java
deleted file mode 100644
index 0bdc0aa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test362.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection_in;
-
-public class A_test362 {
-	A_test362(int i){
-	}
-	void n(){
-		final int y= 0;
-		/*[*/new A_test362(y){
-			void f(){
-				int y= 9;
-			}
-		};/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test363.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test363.java
deleted file mode 100644
index 1506cb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test363.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package validSelection_in;
-
-public class A_test363 {
-	public Object foo() {
-		return /*[*/A_test363.class/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test364.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test364.java
deleted file mode 100644
index 5e46159..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test364.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection_in;
-
-// http://dev.eclipse.org/bugs/show_bug.cgi?id=6680
-public class A_test364 {
-	public int i(){ 
-		return 0;
-	}
-	public void m(){
-		/*[*/i();
-		m();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test365.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test365.java
deleted file mode 100644
index 9cbc7c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test365.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection_in;
-
-public class A_test365 {
-	public void bar() throws NullPointerException {
-	}
-	
-	protected void foo() {
-		/*[*/bar();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test360.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test360.java
deleted file mode 100644
index 6e6cf48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test360.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection_out;
-
-public class A_test360 {
-	void f(){
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/class AA extends A_test360 {
-		}/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test361.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test361.java
deleted file mode 100644
index b514b10..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test361.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection_out;
-
-public class A_test361 {
-	void f(){
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/class AA extends A_test361 {
-		};/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test362.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test362.java
deleted file mode 100644
index c598978..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test362.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package validSelection_out;
-
-public class A_test362 {
-	A_test362(int i){
-	}
-	void n(){
-		final int y= 0;
-		extracted(y);
-	}
-	protected void extracted(final int y) {
-		/*[*/new A_test362(y){
-			void f(){
-				int y= 9;
-			}
-		};/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test363.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test363.java
deleted file mode 100644
index 5a4a0cb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test363.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection_out;
-
-public class A_test363 {
-	public Object foo() {
-		return extracted();
-	}
-
-	protected Class extracted() {
-		return /*[*/A_test363.class/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test364.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test364.java
deleted file mode 100644
index 34e72a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test364.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package validSelection_out;
-
-// http://dev.eclipse.org/bugs/show_bug.cgi?id=6680
-public class A_test364 {
-	public int i(){ 
-		return 0;
-	}
-	public void m(){
-		extracted();
-	}
-	protected void extracted() {
-		/*[*/i();
-		m();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test365.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test365.java
deleted file mode 100644
index 3395e39..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test365.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection_out;
-
-public class A_test365 {
-	public void bar() throws NullPointerException {
-	}
-	
-	protected void foo() {
-		extracted();
-	}
-
-	protected void extracted() {
-		/*[*/bar();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2001.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2001.java
deleted file mode 100644
index bb74eed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2001.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package wiki_in;
-
-public class A_test2001 {
-
-	int field= 0;
-
-	void fun() {
-		int i;
-		/*[*/
-		i= 0;
-		System.out.println("i, field == " + i++ +", " + field);
-		/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2002.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2002.java
deleted file mode 100644
index d9b468b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2002.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package wiki_in;
-
-public class A_test2002 {
-
-	int field= 0;
-	void fun() {
-		int i= 0;
-		/*[*/
-		System.out.println("i, field == " + i++ +", " + field);
-		/*]*/
-		System.out.println("i == " + i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2003.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2003.java
deleted file mode 100644
index e56f190..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2003.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package wiki_in;
-
-public class A_test2003 {
-
-	int field= 0;
-
-	void fun() {
-		int i= 0;
-		/*[*/
-		if (field == 1) {
-			i= 1;
-			System.out.println("i, field == " + i + ", " + field);
-		} else {
-			System.out.println("i, field == " + i + ", " + field);
-		}
-		/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2004.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2004.java
deleted file mode 100644
index 4078d56..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2004.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package wiki_in;
-
-public class A_test2004 {
-
-	int field= 0;
-
-	void fun() {
-		int i= 0;
-		while (field < 2) {
-			field++;
-			/*[*/
-			System.out.println("i, field == " + i++ +", " + field);
-			/*]*/
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2005.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2005.java
deleted file mode 100644
index 1fcf97c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2005.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package wiki_in;
-
-import java.io.IOException;
-
-public class A_test2005 {
-
-	static void fun() throws IOException {
-	}
-
-	public static void main(String args[]) {
-		try {
-			/*[*/
-			fun();
-			/*]*/
-		} catch (Exception e) {
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2001.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2001.java
deleted file mode 100644
index f0fe986..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2001.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package wiki_out;
-
-public class A_test2001 {
-
-	int field= 0;
-
-	void fun() {
-		int i;
-		extracted();
-	}
-
-	protected void extracted() {
-		int i;
-		/*[*/
-		i= 0;
-		System.out.println("i, field == " + i++ +", " + field);
-		/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2002.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2002.java
deleted file mode 100644
index b235ac3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2002.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package wiki_out;
-
-public class A_test2002 {
-
-	int field= 0;
-	void fun() {
-		int i= 0;
-		i = extracted(i);
-		System.out.println("i == " + i);
-	}
-	protected int extracted(int i) {
-		/*[*/
-		System.out.println("i, field == " + i++ +", " + field);
-		/*]*/
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2003.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2003.java
deleted file mode 100644
index 54a8756..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2003.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package wiki_out;
-
-public class A_test2003 {
-
-	int field= 0;
-
-	void fun() {
-		int i= 0;
-		extracted(i);
-	}
-
-	protected void extracted(int i) {
-		/*[*/
-		if (field == 1) {
-			i= 1;
-			System.out.println("i, field == " + i + ", " + field);
-		} else {
-			System.out.println("i, field == " + i + ", " + field);
-		}
-		/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2004.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2004.java
deleted file mode 100644
index 05fd90f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2004.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package wiki_out;
-
-public class A_test2004 {
-
-	int field= 0;
-
-	void fun() {
-		int i= 0;
-		while (field < 2) {
-			field++;
-			i = extracted(i);
-		}
-	}
-
-	protected int extracted(int i) {
-		/*[*/
-		System.out.println("i, field == " + i++ +", " + field);
-		/*]*/
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2005.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2005.java
deleted file mode 100644
index de527bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2005.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package wiki_out;
-
-import java.io.IOException;
-
-public class A_test2005 {
-
-	static void fun() throws IOException {
-	}
-
-	public static void main(String args[]) {
-		try {
-			extracted();
-		} catch (Exception e) {
-		}
-	}
-
-	protected static void extracted() throws IOException {
-		/*[*/
-		fun();
-		/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_in.java
deleted file mode 100644
index b49e010..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_out.java
deleted file mode 100644
index 90eaa10..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int temp= 0;
-		int x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_in.java
deleted file mode 100644
index b4d0cbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		while(y==0){
-			int x= 1 + 2;
-		}
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_out.java
deleted file mode 100644
index 8d610a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		int temp= 1 + 2;
-		while(y==0){
-			int x= temp;
-		}
-		return temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_in.java
deleted file mode 100644
index a2ba64a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		do{
-			int x= 1 + 2;
-		} while(y==0);
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_out.java
deleted file mode 100644
index ef4264a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		int temp= 1 + 2;
-		do{
-			int x= temp;
-		} while(y==0);
-		return temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_in.java
deleted file mode 100644
index 2a1b58d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		{
-		 int x= 1 + 2;
-		}
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_out.java
deleted file mode 100644
index f2c09ff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		int temp= 1 + 2;
-		{
-		 int x= temp;
-		}
-		return temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_in.java
deleted file mode 100644
index 06d276f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-
-class A{
-	int m(int y){
-		int e= new ArrayList().iterator().hashCode();
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_out.java
deleted file mode 100644
index 6552bb2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-class A{
-	int m(int y){
-		Iterator temp= new ArrayList().iterator();
-		int e= temp.hashCode();
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_in.java
deleted file mode 100644
index 95e7fdb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-	int m(int y){
-		while(y==0)
-			m(1 + 2);
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_out.java
deleted file mode 100644
index 26bcb60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A{
-	int m(int y){
-		int temp= 1 + 2;
-		while(y==0)
-			m(temp);
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_in.java
deleted file mode 100644
index ad9a09e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		while(y==0)
-			while(y==0)
-				while(y==0) 
-					m(1 + 2);
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_out.java
deleted file mode 100644
index bfe96e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		int temp= 1 + 2;
-		while(y==0)
-			while(y==0)
-				while(y==0) 
-					m(temp);
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_in.java
deleted file mode 100644
index 24587e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		while(y==0){
-			while(y==0)
-				while(y==0)
-					m(1 + 2);
-		}
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_out.java
deleted file mode 100644
index d91c927..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		while(y==0){
-			int temp= 1 + 2;
-			while(y==0)
-				while(y==0)
-					m(temp);
-		}
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_in.java
deleted file mode 100644
index 1031cf4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	void m(){
-		{
-			int i= 1 + 2;
-		}
-		{
-			int i= 1 + 2;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_out.java
deleted file mode 100644
index 1f280d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	void m(){
-		int temp= 1 + 2;
-		{
-			int i= temp;
-		}
-		{
-			int i= temp;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_in.java
deleted file mode 100644
index 9fb2c98..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		m(0);
-		{
-			int x= 1 + 2;
-		}
-		{
-			{
-				int x= 1 + 2;
-			}
-		}
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_out.java
deleted file mode 100644
index a1627c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		m(0);
-		int temp= 1 + 2;
-		{
-			int x= temp;
-		}
-		{
-			{
-				int x= temp;
-			}
-		}
-		return temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_in.java
deleted file mode 100644
index 87976fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		if (f() == 0){
-			int t= f();
-		}
-	}
-	int f(){
-		return 5;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_out.java
deleted file mode 100644
index 301d1ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int temp= f();
-		if (temp == 0){
-			int t= temp;
-		}
-	}
-	int f(){
-		return 5;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_in.java
deleted file mode 100644
index b49e010..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_out.java
deleted file mode 100644
index 90eaa10..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int temp= 0;
-		int x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_in.java
deleted file mode 100644
index 45f1b71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class T {
-	int r(){return 4;}
-	void f(){
-		r();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_out.java
deleted file mode 100644
index 233ae43..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class T {
-	int r(){return 4;}
-	void f(){
-		int temp= r();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_in.java
deleted file mode 100644
index 1a076d1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int f;
-	void m(int i){
-		int x= f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_out.java
deleted file mode 100644
index 8f7a8c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int f;
-	void m(int i){
-		int temp= f;
-		int x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_in.java
deleted file mode 100644
index ab4dc5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class T {
-	int r(){return 4;}
-	void f(){
-		{
-			r();
-		}	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_out.java
deleted file mode 100644
index 102b633..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class T {
-	int r(){return 4;}
-	void f(){
-		{
-			int temp= r();
-		}	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_in.java
deleted file mode 100644
index d0d19e3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	int r(){return 4;}
-	boolean b(){return true;}
-	void f(int fd){
-		do {
-		} while(b());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_out.java
deleted file mode 100644
index c3af208..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int r(){return 4;}
-	boolean b(){return true;}
-	void f(int fd){
-		boolean temp= b();
-		do {
-		} while(temp);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_in.java
deleted file mode 100644
index b49e010..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_out.java
deleted file mode 100644
index 90eaa10..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int temp= 0;
-		int x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_in.java
deleted file mode 100644
index 2052c0a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	boolean f(){
-		return (1 + 1 == 1 + 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_out.java
deleted file mode 100644
index 1ea95d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	boolean f(){
-		int temp= 1 + 1;
-		return (temp == temp);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_in.java
deleted file mode 100644
index 7b57dda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A {
-	void f(){
-		try{
-			int j=0 +0;
-		} finally {
-			int j=0 +0;
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_out.java
deleted file mode 100644
index 194f19e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	void f(){
-		int temp= 0 +0;
-		try{
-			int j=temp;
-		} finally {
-			int j=temp;
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_in.java
deleted file mode 100644
index 3d56e98..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 0+0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_out.java
deleted file mode 100644
index fb11151..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int temp= 0+0;
-		int x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_in.java
deleted file mode 100644
index 27ccd79..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	boolean m(){
-		return a().length != 3;
-	}
-	int[] a(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_out.java
deleted file mode 100644
index 850bf40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	boolean m(){
-		boolean temp= a().length != 3;
-		return temp;
-	}
-	int[] a(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_in.java
deleted file mode 100644
index a579350..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void f(){
-		String f= "k";
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_out.java
deleted file mode 100644
index 907f09e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	void f(){
-		String temp= "k";
-		String f= temp;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_in.java
deleted file mode 100644
index b49e010..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_out.java
deleted file mode 100644
index e047293..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		final int temp= 0;
-		int x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_in.java
deleted file mode 100644
index 1f7cbd1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	static final int FF= 2;
-	void f(){
-		int t= A.FF;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_out.java
deleted file mode 100644
index fd329fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	static final int FF= 2;
-	void f(){
-		int temp= A.FF;
-		int t= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_in.java
deleted file mode 100644
index e7dd7d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		int i;
-		int y= i =1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_out.java
deleted file mode 100644
index 5980b1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	void f(){
-		int i;
-		int temp= i =1;
-		int y= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_in.java
deleted file mode 100644
index cb4def5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(int i){
-		int y= (i= 1) + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_out.java
deleted file mode 100644
index 4dd8ae4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(int i){
-		int temp= (i= 1);
-		int y= temp + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_in.java
deleted file mode 100644
index 5de9404..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void m(){
-		Object u= new Object(){};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_out.java
deleted file mode 100644
index 07de471..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	void m(){
-		Object temp= new Object(){};
-		Object u= temp;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_in.java
deleted file mode 100644
index 697251b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void m(){
-		Object a= new java.util.ArrayList(){};
-	}
-} 

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_out.java
deleted file mode 100644
index db61fe2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-
-class A {
-	void m(){
-		java.util.ArrayList temp= new java.util.ArrayList(){};
-		Object a= temp;
-	}
-} 

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_in.java
deleted file mode 100644
index 78cb2db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-import java.util.List;
-
-class A {
-	void f(){
-		C b= new C();
-		Object x= b.lists();
-	}
-} 
-class C{
-	public List[] lists(){
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_out.java
deleted file mode 100644
index 54ecb2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-import java.util.List;
-
-class A {
-	void f(){
-		C b= new C();
-		List[] temp= b.lists();
-		Object x= temp;
-	}
-} 
-class C{
-	public List[] lists(){
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_in.java
deleted file mode 100644
index 7be7a80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-
-class Test {
-
-  public int[] foo() {
-    return null;
-  }  
-  
-  public void bar(Test test) {
-    int[] i = test.foo(); // refactor this
-  }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_out.java
deleted file mode 100644
index 51c3017..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_out.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-
-class Test {
-
-  public int[] foo() {
-    return null;
-  }  
-  
-  public void bar(Test test) {
-    int[] temp= test.foo();
-	int[] i = temp; // refactor this
-  }
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_in.java
deleted file mode 100644
index 48441fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	void f(int i) {
-		if (i == 0) {
-			int temp= 0;
-		}
-		if (i == 1) {
-			int x= 0 + 0;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_out.java
deleted file mode 100644
index 70b064a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A {
-	void f(int i) {
-		if (i == 0) {
-			int temp= 0;
-		}
-		if (i == 1) {
-			int temp= 0 + 0;
-			int x= temp;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_in.java
deleted file mode 100644
index b6325ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	private static void foo() {
-		int temp= 4;
-		System.out.println(temp);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_out.java
deleted file mode 100644
index 1ec04cb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private static void foo() {
-		int temp= 4;
-		int temp1= temp;
-		System.out.println(temp1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_in.java
deleted file mode 100644
index 6dc1bad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	public Object foo(String text) {
-		if (((Object)null).toString() == null) {
-			return (Object)null;
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_out.java
deleted file mode 100644
index 664a9ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	public Object foo(String text) {
-		Object temp= (Object)null;
-		if ((temp).toString() == null) {
-			return temp;
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_in.java
deleted file mode 100644
index b49e010..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_out.java
deleted file mode 100644
index e047293..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		final int temp= 0;
-		int x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_in.java
deleted file mode 100644
index 875e180..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_out.java
deleted file mode 100644
index 5067667..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		A temp= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_in.java
deleted file mode 100644
index 411b0ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	int f(){
-		new String("fred").length();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_out.java
deleted file mode 100644
index 1e91d70..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	int f(){
-		int temp= new String("fred").length();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_in.java
deleted file mode 100644
index 1754f84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int getLength(){return 0;}
-	int f(){
-		int i= new A().getLength();
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_out.java
deleted file mode 100644
index f22f055..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	int getLength(){return 0;}
-	int f(){
-		int temp= new A().getLength();
-		int i= temp;
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_in.java
deleted file mode 100644
index dace8a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	boolean isFred(){return false;}
-	int f(){
-		boolean i= new A().isFred();
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_out.java
deleted file mode 100644
index aea56c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	boolean isFred(){return false;}
-	int f(){
-		boolean temp= new A().isFred();
-		boolean i= temp;
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_in.java
deleted file mode 100644
index 76b3b7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	boolean isFred(){return false;}
-	int f(){
-		boolean i= isFred();
-		isFred();
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_out.java
deleted file mode 100644
index 46707d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	boolean isFred(){return false;}
-	int f(){
-		boolean temp= isFred();
-		boolean i= temp;
-		isFred();
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_in.java
deleted file mode 100644
index 4ea20cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	int f(){
-		int t= f();
-		f();
-		return 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_out.java
deleted file mode 100644
index 037d1e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	int f(){
-		int temp= f();
-		int t= temp;
-		f();
-		return 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_in.java
deleted file mode 100644
index 479d52b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	int f(){
-		f();
-		int u= f();
-		return 0;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_out.java
deleted file mode 100644
index 27e827d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	int f(){
-		int temp= f();
-		int u= temp;
-		return 0;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_in.java
deleted file mode 100644
index 45f1b71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class T {
-	int r(){return 4;}
-	void f(){
-		r();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_out.java
deleted file mode 100644
index b3d22d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class T {
-	int r(){return 4;}
-	void f(){
-		int temp= r();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_in.java
deleted file mode 100644
index 352bdaa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class T {
-	public String toString() {
-		return super.toString() + new Integer(1).toString();	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_out.java
deleted file mode 100644
index 41ec83c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class T {
-	public String toString() {
-		String temp= super.toString();
-		return temp + new Integer(1).toString();	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_in.java
deleted file mode 100644
index 2ca0166..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	void f(boolean flag){
-		for (int i= 0; i < 10; i++) {
-			f(i==1);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_out.java
deleted file mode 100644
index cd01cd6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	void f(boolean flag){
-		for (int i= 0; i < 10; i++) {
-			boolean temp= i==1;
-			f(temp);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_in.java
deleted file mode 100644
index b6585d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int x= 1 + 2;
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_out.java
deleted file mode 100644
index d2b9d84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int temp= 1 + 2;
-		int x= temp;
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_in.java
deleted file mode 100644
index 0154887..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	void f(boolean flag){
-		for (int i= 0; i < 10; i++) {
-			f(i==1);
-		}
-		for (int i= 0; i < 10; i++) {
-			f(i==1);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_out.java
deleted file mode 100644
index be22200..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	void f(boolean flag){
-		for (int i= 0; i < 10; i++) {
-			boolean temp= i==1;
-			f(temp);
-		}
-		for (int i= 0; i < 10; i++) {
-			f(i==1);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_in.java
deleted file mode 100644
index cb1dd9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	void f(boolean flag){
-		if (flag){
-			f(3+5==8); 
-		} else 
-			f(3+5!=8); 
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_out.java
deleted file mode 100644
index cb15af2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	void f(boolean flag){
-		int temp= 3+5;
-		if (flag){
-			f(temp==8); 
-		} else 
-			f(temp!=8); 
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_in.java
deleted file mode 100644
index 34d9bba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_in.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package p;
-
-import java.math.BigDecimal;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.Vector;
-
-class A {
-	private SortedMap fillSortedMap(Vector values, boolean byValue) {
-		TreeMap map= new TreeMap();
-		for (int i= 0; i < values.size(); i += 2) {
-			if (byValue) {
-				map.put(
-					values.get(i + 1),
-					new Integer(((BigDecimal) values.get(i)).intValue()));
-			} else {
-				map.put(
-					new Integer(((BigDecimal) values.get(i)).intValue()),
-					values.get(i + 1));
-			}
-		}
-		return map;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_out.java
deleted file mode 100644
index e74c63f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_out.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-
-import java.math.BigDecimal;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.Vector;
-
-class A {
-	private SortedMap fillSortedMap(Vector values, boolean byValue) {
-		TreeMap map= new TreeMap();
-		for (int i= 0; i < values.size(); i += 2) {
-			Object valueOnIndexI= values.get(i);
-			if (byValue) {
-				map.put(
-					values.get(i + 1),
-					new Integer(((BigDecimal) valueOnIndexI).intValue()));
-			} else {
-				map.put(
-					new Integer(((BigDecimal) valueOnIndexI).intValue()),
-					values.get(i + 1));
-			}
-		}
-		return map;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_in.java
deleted file mode 100644
index ec47354..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-// 6, 17 -> 6, 22
-package p;
-
-class A {
-	void foob() {
-		int e= (2 + 2) * 3 * 1;
-		int c= 2 + 2 * 4 + (28 + 2 + 2) + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_out.java
deleted file mode 100644
index 8e406ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 6, 17 -> 6, 22
-package p;
-
-class A {
-	void foob() {
-		int temp= 2 + 2;
-		int e= (temp) * 3 * 1;
-		int c= 2 + 2 * 4 + (28 + temp) + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_in.java
deleted file mode 100644
index 3d72343..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 6, 37 -> 6, 43
-package p;
-
-class A {
-	void foob() {
-		int e= (2 + 2) * (27 + 2 * (2+2* 4+1*2));
-		
-		int c= 3 * (2 + 1) + 2 + 2 * 4 + 28;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_out.java
deleted file mode 100644
index 80f0b30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 6, 37 -> 6, 43
-package p;
-
-class A {
-	void foob() {
-		int temp= 2+2* 4;
-		int e= (2 + 2) * (27 + 2 * (temp+1*2));
-		
-		int c= 3 * (2 + 1) + temp + 28;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_in.java
deleted file mode 100644
index 105114f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-// 6, 19 -> 6, 24
-package p;
-
-class A {
-	void foob() {
-		int f= 5 *3*  1 *(1 + 1);		
-		int e= (2 + 2) * 3 * 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_out.java
deleted file mode 100644
index 08e0e3c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 6, 19 -> 6, 24
-package p;
-
-class A {
-	void foob() {
-		int temp= 3*  1;
-		int f= 5 *temp *(1 + 1);		
-		int e= (2 + 2) * temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_in.java
deleted file mode 100644
index 87db857..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 6, 24 -> 6, 29
-package p;
-
-class A {
-	void foob() {
-		int a= 2 * 3 + 3 + 1;
-
-		int b= (3 + 1) + 1*1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_out.java
deleted file mode 100644
index 14afcdd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 6, 24 -> 6, 29
-package p;
-
-class A {
-	void foob() {
-		int temp= 3 + 1;
-		int a= 2 * 3 + temp;
-
-		int b= (temp) + 1*1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_in.java
deleted file mode 100644
index de863ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 30 -> 8, 54
-package p;
-
-
-class A {
-	private void test() {
-        String fdFontName= null;
-        String tmpFileName = "/tmp"+fdFontName+".cff"+".txt";
-    }	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_out.java
deleted file mode 100644
index d7b7aba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 8, 30 -> 8, 54
-package p;
-
-
-class A {
-	private void test() {
-        String fdFontName= null;
-        String newVariable= "/tmp"+fdFontName+".cff";
-		String tmpFileName = newVariable+".txt";
-    }	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_in.java
deleted file mode 100644
index e5bccf3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//7, 14 -> 7, 30
-package p;
-
-class A {
-	private void foo() {
-		Object str= null; 
-		if(! str.equals(null));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_out.java
deleted file mode 100644
index ecc1a1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//7, 14 -> 7, 30
-package p;
-
-class A {
-	private void foo() {
-		Object str= null; 
-		boolean temp= str.equals(null);
-		if(! temp);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_in.java
deleted file mode 100644
index 92d3e26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//7, 17 -> 7, 18
-package p;
-
-class A {
-	private void foo() {
-		int s= 0;
-		int z= +s;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_out.java
deleted file mode 100644
index 530e6b9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//7, 17 -> 7, 18
-package p;
-
-class A {
-	private void foo() {
-		int s= 0;
-		int temp= s;
-		int z= +temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_in.java
deleted file mode 100644
index b6585d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int x= 1 + 2;
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_out.java
deleted file mode 100644
index 32e6cb1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int temp= 1 + 2;
-		int x= temp;
-		return temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_in.java
deleted file mode 100644
index c83e913..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//7, 17 -> 7, 18
-package p;
-
-class A {
-	private void foo() {
-		int s= 0;
-		int z= -s;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_out.java
deleted file mode 100644
index 8b9382c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//7, 17 -> 7, 18
-package p;
-
-class A {
-	private void foo() {
-		int s= 0;
-		int temp= s;
-		int z= -temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_in.java
deleted file mode 100644
index 4d7b9b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//7, 17 -> 7, 18
-package p;
-
-class A {
-	private void foo() {
-		int s= 0;
-		int z= ~s;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_out.java
deleted file mode 100644
index abe61ae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//7, 17 -> 7, 18
-package p;
-
-class A {
-	private void foo() {
-		int s= 0;
-		int temp= s;
-		int z= ~temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_in.java
deleted file mode 100644
index edce7b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;//10, 17 - 10, 28
-
-
-class A  {
-	void f() {
-		String x;
-		boolean test= false, test2= false, test3= false;
-		if (test) {
-		} else if (test2) {
-			x = "ExtractMe";
-		} else if (test3) {
-			x = "ExtractMe";
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_out.java
deleted file mode 100644
index 489feb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;//10, 17 - 10, 28
-
-
-class A  {
-	void f() {
-		String x;
-		boolean test= false, test2= false, test3= false;
-		String temp= "ExtractMe";
-		if (test) {
-		} else if (test2) {
-			x = temp;
-		} else if (test3) {
-			x = temp;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_in.java
deleted file mode 100644
index 893bf8d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;//9, 20 - 9, 23
-
-
-class A  {
-	void f() {
-		String x;
-		if (true)
-			try{
-				x= "i";
-			} catch (Exception e){
-				x= "i";
-			}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_out.java
deleted file mode 100644
index f73e9d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_out.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;//9, 20 - 9, 23
-
-
-class A  {
-	void f() {
-		String x;
-		String temp= "i";
-		if (true)
-			try{
-				x= temp;
-			} catch (Exception e){
-				x= temp;
-			}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_in.java
deleted file mode 100644
index 7ba78c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;//10, 17 - 10, 28
-
-
-class A  {
-	void f() {
-		String x;
-		boolean test= false, test2= false, test3= false;
-		if (test) {
-		} else if (test2)
-			x = "ExtractMe";
-		else if (test3)
-			x = "ExtractMe";
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_out.java
deleted file mode 100644
index b3272f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_out.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;//10, 17 - 10, 28
-
-
-class A  {
-	void f() {
-		String x;
-		boolean test= false, test2= false, test3= false;
-		String temp= "ExtractMe";
-		if (test) {
-		} else if (test2)
-			x = temp;
-		else if (test3)
-			x = temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_in.java
deleted file mode 100644
index fa45f12..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;//6, 19 - 6, 22
-
-
-class A  {
-	void f(String bar) {
-		String x= bar;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_out.java
deleted file mode 100644
index 5035ca3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;//6, 19 - 6, 22
-
-
-class A  {
-	void f(String bar) {
-		String temp= bar;
-		String x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_in.java
deleted file mode 100644
index 7b51a58..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p; //7, 32 - 7, 33
-
-class A {
-	void f(String bar) {
-		try {
-		} catch (Exception e) {
-			Exception another= e;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_out.java
deleted file mode 100644
index f47735f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p; //7, 32 - 7, 33
-
-class A {
-	void f(String bar) {
-		try {
-		} catch (Exception e) {
-			Exception temp= e;
-			Exception another= temp;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_in.java
deleted file mode 100644
index 202b4a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p; //6, 16 - 6, 21
-
-class A {
-	void f() {
-		Integer[] is= null;
-		int k= is[0].intValue();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_out.java
deleted file mode 100644
index 8b9ceec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p; //6, 16 - 6, 21
-
-class A {
-	void f() {
-		Integer[] is= null;
-		Integer temp= is[0];
-		int k= temp.intValue();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_in.java
deleted file mode 100644
index a541626..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p; //6, 14 - 6, 21
-
-class A {
-	void f() {
-		class D{}
-		D d= new D();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_out.java
deleted file mode 100644
index c270754..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p; //6, 14 - 6, 21
-
-class A {
-	void f() {
-		class D{}
-		D temp= new D();
-		D d= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_in.java
deleted file mode 100644
index 7730f66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p; //5, 24 - 5, 26
-
-class A {
-	void f() {
-		String string= "";
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_out.java
deleted file mode 100644
index b3af49e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p; //5, 24 - 5, 26
-
-class A {
-	void f() {
-		String temp= "";
-		String string= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_in.java
deleted file mode 100644
index b6585d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int x= 1 + 2;
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_out.java
deleted file mode 100644
index 4d6f43d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		final int temp= 1 + 2;
-		int x= temp;
-		return temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_in.java
deleted file mode 100644
index 6e68bfe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	void f() {
-		StringBuffer buf= new StringBuffer();
-		String[] strings= new String[] {"A", "B", "C", "D"};
-		for (int i= 0; i < strings.length; i++) {
-			buf.append(strings[i]);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_out.java
deleted file mode 100644
index 2de227f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void f() {
-		StringBuffer buf= new StringBuffer();
-		String[] strings= new String[] {"A", "B", "C", "D"};
-		final int temp= strings.length;
-		for (int i= 0; i < temp; i++) {
-			buf.append(strings[i]);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_in.java
deleted file mode 100644
index 6e68bfe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	void f() {
-		StringBuffer buf= new StringBuffer();
-		String[] strings= new String[] {"A", "B", "C", "D"};
-		for (int i= 0; i < strings.length; i++) {
-			buf.append(strings[i]);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_out.java
deleted file mode 100644
index 8437eb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void f() {
-		StringBuffer buf= new StringBuffer();
-		String[] strings= new String[] {"A", "B", "C", "D"};
-		for (int i= 0; i < strings.length; i++) {
-			String temp= strings[i];
-			buf.append(temp);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_in.java
deleted file mode 100644
index 6e68bfe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	void f() {
-		StringBuffer buf= new StringBuffer();
-		String[] strings= new String[] {"A", "B", "C", "D"};
-		for (int i= 0; i < strings.length; i++) {
-			buf.append(strings[i]);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_out.java
deleted file mode 100644
index ed0b767..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void f() {
-		StringBuffer buf= new StringBuffer();
-		String[] strings= new String[] {"A", "B", "C", "D"};
-		for (int i= 0; i < strings.length; i++) {
-			int temp= i;
-			buf.append(strings[temp]);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_in.java
deleted file mode 100644
index 865abff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			for (int k= 0, p= 17; p < i; k++) {
-				System.out.println(i++ + " " + k);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_out.java
deleted file mode 100644
index b239659..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			int temp= i;
-			for (int k= 0, p= 17; p < temp; k++) {
-				System.out.println(i++ + " " + k);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_in.java
deleted file mode 100644
index 865abff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			for (int k= 0, p= 17; p < i; k++) {
-				System.out.println(i++ + " " + k);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_out.java
deleted file mode 100644
index 5ab30c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			for (int k= 0, p= 17; p < i; k++) {
-				String temp= i++ + " " + k;
-				System.out.println(temp);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_in.java
deleted file mode 100644
index 865abff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			for (int k= 0, p= 17; p < i; k++) {
-				System.out.println(i++ + " " + k);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_out.java
deleted file mode 100644
index 1c6ec5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			for (int k= 0, p= 17; p < i; k++) {
-				int temp= i++;
-				System.out.println(temp + " " + k);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_in.java
deleted file mode 100644
index 865abff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			for (int k= 0, p= 17; p < i; k++) {
-				System.out.println(i++ + " " + k);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_out.java
deleted file mode 100644
index 7eb5a62..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			for (int k= 0, p= 17; p < i; k++) {
-				int temp= k;
-				System.out.println(i++ + " " + temp);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_in.java
deleted file mode 100644
index d0b47f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	int f(int i) {
-		return i;
-	}
-
-	int f1(int is) {
-		for (f(9), f(8);;) {
-			f(9);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_out.java
deleted file mode 100644
index d5825bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	int f(int i) {
-		return i;
-	}
-
-	int f1(int is) {
-		for (f(9), f(8);;) {
-			int temp= f(9);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_in.java
deleted file mode 100644
index 86ea429..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void f() {
-		Object obj= getO() != null
-				? getO()
-				: new Object();
-	}
-	static Object getO() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_out.java
deleted file mode 100644
index 98e3f7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	void f() {
-		Object o2= getO();
-		Object obj= o2 != null
-				? o2
-				: new Object();
-	}
-	static Object getO() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_in.java
deleted file mode 100644
index bb0c818..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	String fName;
-	/**
-	 * Override to run the test and assert its state.
-	 * @exception Throwable if any exception is thrown
-	 */
-	protected void runTest() throws Throwable {
-		System.out.println("Method \""+fName+"\" not found");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_out.java
deleted file mode 100644
index d5e4c96..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	String fName;
-	/**
-	 * Override to run the test and assert its state.
-	 * @exception Throwable if any exception is thrown
-	 */
-	protected void runTest() throws Throwable {
-		String strong= fName+"\" not found";
-		System.out.println("Method \""+strong);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_in.java
deleted file mode 100644
index b6585d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int x= 1 + 2;
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_out.java
deleted file mode 100644
index 4eb51944..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		final int temp= 1 + 2;
-		int x= temp;
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_in.java
deleted file mode 100644
index 4a68c49..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class A {
-	static {
-		System.out.println("Hello "+" World");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_out.java
deleted file mode 100644
index 0089c73..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	static {
-		String name= " World";
-		System.out.println("Hello "+name);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_in.java
deleted file mode 100644
index 6e0a881..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	public static final int CONST= 17;
-	Test(int num) {}
-	void run() {
-		new Test(CONST);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_out.java
deleted file mode 100644
index 7431a6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	public static final int CONST= 17;
-	Test(int num) {}
-	void run() {
-		int k= CONST;
-		new Test(k);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_in.java
deleted file mode 100644
index 98467e2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//5, 1 -> 6, 1
-package p;
-class A {
-	void m() {
-		new Integer(1); //Extract Local Variable
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_out.java
deleted file mode 100644
index 9f3d80c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//5, 1 -> 6, 1
-package p;
-class A {
-	void m() {
-		Integer one= new Integer(1); //Extract Local Variable
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_in.java
deleted file mode 100644
index 4ae9a41..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	int m(){
-		for (int i= 0; i==0;){
-			int x= 1 + 2;
-		}
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_out.java
deleted file mode 100644
index ce86a2e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int m(){
-		int temp= 1 + 2;
-		for (int i= 0; i==0;){
-			int x= temp;
-		}
-		return temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_in.java
deleted file mode 100644
index 4ae9a41..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	int m(){
-		for (int i= 0; i==0;){
-			int x= 1 + 2;
-		}
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_out.java
deleted file mode 100644
index 7557624..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int m(){
-		for (int i= 0; i==0;){
-			int temp= 1 + 2;
-			int x= temp;
-		}
-		return 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_in.java
deleted file mode 100644
index 161a798..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 100;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_out.java
deleted file mode 100644
index 7a7ef9e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int temp= 100;
-		int x= temp;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail0.java
deleted file mode 100644
index 35aed61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail0.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(){
-		int temp;
-		int i= 1;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail1.java
deleted file mode 100644
index ec66930..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail1.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		m(y);
-		m(y);
-		return y;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail10.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail10.java
deleted file mode 100644
index de4ed23..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail10.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		Object[] i= new Object[]{this};
-	}
-}}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail11.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail11.java
deleted file mode 100644
index 306ebbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail11.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		A i= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail12.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail12.java
deleted file mode 100644
index 63cf080..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail12.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(int i){
-		int y= i == 3 ? 2: 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail13.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail13.java
deleted file mode 100644
index e7dd7d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail13.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		int i;
-		int y= i =1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail14.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail14.java
deleted file mode 100644
index cb4def5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail14.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(int i){
-		int y= (i= 1) + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail15.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail15.java
deleted file mode 100644
index a579350..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail15.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void f(){
-		String f= "k";
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail16.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail16.java
deleted file mode 100644
index 45f1b71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail16.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class T {
-	int r(){return 4;}
-	void f(){
-		r();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail17.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail17.java
deleted file mode 100644
index ab4dc5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail17.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class T {
-	int r(){return 4;}
-	void f(){
-		{
-			r();
-		}	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail18.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail18.java
deleted file mode 100644
index 7ccf3cb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail18.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(){
-		for (int k= 0, i= k; k< 10; k++){
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail19.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail19.java
deleted file mode 100644
index f70aa67..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail19.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-	int temp;
-	void m(){
-		int i= 10;
-		temp= 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail2.java
deleted file mode 100644
index 682ef4b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail2.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		int y= m(i);
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail20.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail20.java
deleted file mode 100644
index c4bc61a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail20.java
+++ /dev/null

@@ -1,5 +0,0 @@
-class A {
-	void f(){
-		throw new NullPointerException();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail21.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail21.java
deleted file mode 100644
index 4175a07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail21.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-public class A {
-
-	protected void primExecute() {
-		this.toString();
-	}
-
-	if (image != null) {
-		Object loc = null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail22.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail22.java
deleted file mode 100644
index 8493af5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail22.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A {
-	void f(){
-		f();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail23.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail23.java
deleted file mode 100644
index 2907d4b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail23.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-    void f(){
-        int a= 0;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail24.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail24.java
deleted file mode 100644
index a648eac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail24.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-    void f(){
-        int a= 0;
-        a= 0;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail25.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail25.java
deleted file mode 100644
index b49e010..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail25.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail26.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail26.java
deleted file mode 100644
index 70bde9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail26.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		class Local{}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail27.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail27.java
deleted file mode 100644
index 310ac30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail27.java
+++ /dev/null

@@ -1,13 +0,0 @@
-// 7, 13 -> 7, 24
-package p;
-
-class A {
-	public boolean fState= false;
-	public void foo() {
-		if (this.fState) {
-			this.fState= false;
-		} else {
-			this.fState= this.fState;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail28.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail28.java
deleted file mode 100644
index 4925fb2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail28.java
+++ /dev/null

@@ -1,20 +0,0 @@
-// 7, 17 -> 7, 28
-package p;
-
-class A {
-	public int fState= 0;
-	public void foo() {
-		fState= this.fState;
-		fState= fState;
-		this.fState= this.fState;
-		this.fState= fState;
-		this.fState++;
-		this.fState--;
-		fState++;
-		fState--;
-		if (fState++ == 0)	return;
-		if (fState-- == 0)	return;
-		if (this.fState++ == 0)	return;
-		if (this.fState-- == 0)	return;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail29.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail29.java
deleted file mode 100644
index 5374eab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail29.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A{
-	void f(){
-		for (int i = 0; i < 1; i++) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail3.java
deleted file mode 100644
index 457fb89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail3.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	int m(int y){
-		int y= m(y);
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail30.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail30.java
deleted file mode 100644
index 5374eab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail30.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A{
-	void f(){
-		for (int i = 0; i < 1; i++) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail31.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail31.java
deleted file mode 100644
index 735beb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail31.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A{
-	void f(){
-		for (int i= 0, k= 17; k < 1; i++) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail32.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail32.java
deleted file mode 100644
index 865abff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail32.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		for (int i= 0; i < 5; i++) {
-			for (int k= 0, p= 17; p < i; k++) {
-				System.out.println(i++ + " " + k);
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail33.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail33.java
deleted file mode 100644
index d21fd18..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail33.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	void f(int is) {
-		int i= 0;
-		for (;; i= 0) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail34.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail34.java
deleted file mode 100644
index 2870607..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail34.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	int f(int i) {
-		return i;
-	}
-
-	int f1(int is) {
-		for (f(9), f(8);;) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail35.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail35.java
deleted file mode 100644
index bb51ecf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail35.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	public static final int CONST= 17;
-	void run() {
-		System.out.println(Test.CONST);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail36.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail36.java
deleted file mode 100644
index 851d890..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail36.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	int field= 17;
-	void run() {
-		System.out.println(this.field);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail37.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail37.java
deleted file mode 100644
index d5d734a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail37.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-	void run() {
-		System.out.println(Other.Inner.CONST_INNER);
-	}
-}
-
-class Other {
-	static class Inner {
-		public static final int CONST_INNER= 18;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail4.java
deleted file mode 100644
index e24b7a1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail4.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//void expression
-package p;
-class A{
-	void m(){
-		m();
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail5.java
deleted file mode 100644
index f9c530d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail5.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	int y= 1+2;
-	int u= y;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail6.java
deleted file mode 100644
index 21773cc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail6.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	A(){
-		this(1 + 1);
-	}
-	A(int y){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail7.java
deleted file mode 100644
index fda6605..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail7.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A extends B{
-	A(){
-		super(1 + 1);
-	}
-}
-class B{
-	B(int y){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail8.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail8.java
deleted file mode 100644
index 1f7cbd1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail8.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	static final int FF= 2;
-	void f(){
-		int t= A.FF;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail9.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail9.java
deleted file mode 100644
index 1e55f44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail9.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		Object i= null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext0.java
deleted file mode 100644
index 0e4f1bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext0.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-
-	void f2(){
-	
-	}
-}
-  

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext1.java
deleted file mode 100644
index 0e4f1bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext1.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-
-	void f2(){
-	
-	}
-}
-  

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext2.java
deleted file mode 100644
index 0e4f1bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext2.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-
-	void f2(){
-	
-	}
-}
-  

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext3.java
deleted file mode 100644
index 220f149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext3.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious0.java
deleted file mode 100644
index 220f149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious0.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious1.java
deleted file mode 100644
index 220f149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious1.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious2.java
deleted file mode 100644
index 220f149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious2.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious3.java
deleted file mode 100644
index 220f149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious3.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious4.java
deleted file mode 100644
index 220f149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious4.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious5.java
deleted file mode 100644
index a7b2e34..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious5.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-
-	void f2(){
-	
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious6.java
deleted file mode 100644
index 0e4f1bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious6.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package p;
-
-
-class A {
-	class T{
-	
-	}
-	
-	void f(){
-	
-	}
-	
-	{
-		
-		
-	}
-	
-	int fg;
-
-	static {
-	
-	}
-	
-	/**
-	 * 
-	 */	
-	void f1(){
-	
-	}
-
-	void f2(){
-	
-	}
-}
-  

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/in/C.java
deleted file mode 100644
index 47de648..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/in/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 5, 30 -> 5, 36  replaceAll == true, removeDeclaration == false
-package p;
-
-class C {
-	private static final int FOOBAR= 0;
-	
-	private static void jb() {
-		System.out.println("Ceci, ce n'est pas une pipe: " + FOOBAR + " ;");
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/out/C.java
deleted file mode 100644
index e8466a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/out/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 5, 30 -> 5, 36  replaceAll == true, removeDeclaration == false
-package p;
-
-class C {
-	private static final int FOOBAR= 0;
-	
-	private static void jb() {
-		System.out.println("Ceci, ce n'est pas une pipe: " + 0 + " ;");
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/in/C.java
deleted file mode 100644
index 928c335..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/in/C.java
+++ /dev/null

@@ -1,22 +0,0 @@
-// 3, 33 -> 3, 40  removeDeclaration == false, replaceAll == true
-class C {
-	public static final boolean I_EXIST= true;
-	
-	static {
-		boolean beans= I_EXIST;
-	}
-}
-
-class D {
-	int object_oriented_programming() {
-		return false || (!false && C.I_EXIST && (false != true));
-	}
-}
-
-class CPlusPlus extends C {
-	public static final int JAVA= I_EXIST ? 0xCAFEBABE : OxO;
-	
-	void beans() {
-		System.err.println(C          .           I_EXIST);	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/out/C.java
deleted file mode 100644
index 0eb48a8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/out/C.java
+++ /dev/null

@@ -1,22 +0,0 @@
-// 3, 33 -> 3, 40  removeDeclaration == false, replaceAll == true
-class C {
-	public static final boolean I_EXIST= true;
-	
-	static {
-		boolean beans= true;
-	}
-}
-
-class D {
-	int object_oriented_programming() {
-		return false || (!false && true && (false != true));
-	}
-}
-
-class CPlusPlus extends C {
-	public static final int JAVA= true ? 0xCAFEBABE : OxO;
-	
-	void beans() {
-		System.err.println(true);	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/A.java
deleted file mode 100644
index ddbf9f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p1;
-
-public class A {
-	public static final String EARTH= "Elysium";
-	
-	public static final String ELYSIUM= EARTH;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/B.java
deleted file mode 100644
index 487d1dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 9, 28 -> 9, 37  replaceAll == false
-package p2;
-
-import p1.A;
-
-class B {
-
-	public static void main(String[] args) {
-		System.out.println(A.ELYSIUM);	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/A.java
deleted file mode 100644
index ddbf9f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p1;
-
-public class A {
-	public static final String EARTH= "Elysium";
-	
-	public static final String ELYSIUM= EARTH;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/B.java
deleted file mode 100644
index e79665f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 9, 28 -> 9, 37  replaceAll == false
-package p2;
-
-import p1.A;
-
-class B {
-
-	public static void main(String[] args) {
-		System.out.println(A.EARTH);	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/A.java
deleted file mode 100644
index 0e499f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 25 -> 8, 25  replaceAll == false 
-package p1;
-
-import p2.B;
-
-public class A {
-	void f() {
-		int j= 4 * B.ZEMENT + 1;	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/B.java
deleted file mode 100644
index 3e2d1cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;
-
-import p3.C;
-
-public class B {
-	public static final int ZEMENT= 4*C.BEGRIFF + p3.C.BEGRIFF;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/C.java
deleted file mode 100644
index a2f3a71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/C.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p3;
-
-public class C {
-	public static final int BEGRIFF= "Der Begriff";	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/A.java
deleted file mode 100644
index 1ada16e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 8, 25 -> 8, 25  replaceAll == false 
-package p1;
-
-import p2.B;
-import p3.C;
-
-public class A {
-	void f() {
-		int j= 4 * (4*C.BEGRIFF + p3.C.BEGRIFF) + 1;	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/B.java
deleted file mode 100644
index 3e2d1cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;
-
-import p3.C;
-
-public class B {
-	public static final int ZEMENT= 4*C.BEGRIFF + p3.C.BEGRIFF;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/C.java
deleted file mode 100644
index a2f3a71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/C.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p3;
-
-public class C {
-	public static final int BEGRIFF= "Der Begriff";	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/Declarer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/Declarer.java
deleted file mode 100644
index 6e0cca0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/Declarer.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p1;
-
-public class Declarer {
-	public static final String CONSTANT= foo;
-	
-	public static String foo= "foo_for_now";
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/InlineSite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/InlineSite.java
deleted file mode 100644
index 0081d14..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/InlineSite.java
+++ /dev/null

@@ -1,9 +0,0 @@
-// Here, an import is added for a type needed only after a qualification is added.
-// 7, 37 -> 7, 43  replaceAll == true, removeDeclaration == false
-package p2;
-
-class InlineSite {
-	static {
-		System.out.println(p1.Declarer.CONSTANT);	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/Declarer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/Declarer.java
deleted file mode 100644
index 6e0cca0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/Declarer.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p1;
-
-public class Declarer {
-	public static final String CONSTANT= foo;
-	
-	public static String foo= "foo_for_now";
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/InlineSite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/InlineSite.java
deleted file mode 100644
index 6ffb232..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/InlineSite.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// Here, an import is added for a type needed only after a qualification is added.
-// 7, 37 -> 7, 43  replaceAll == true, removeDeclaration == false
-package p2;
-
-import p1.Declarer;
-
-class InlineSite {
-	static {
-		System.out.println(Declarer.foo);	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/A.java
deleted file mode 100644
index 8b20772..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p1;
-
-public class A {
-	public class B {
-		public static final Object CONSTANT= ALFRED;	
-	}
-	
-	public static final Object ALFRED= null;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/InlineSite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/InlineSite.java
deleted file mode 100644
index 04b860a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/InlineSite.java
+++ /dev/null

@@ -1,9 +0,0 @@
-// Here, an import is added for a type needed only after a qualification is added.
-// 8, 19 -> 8, 29  removeAll == false
-package p2;
-
-import p1.A.B;
-
-class InlineSite {
-	Object thing= B.CONSTANT;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/A.java
deleted file mode 100644
index 8b20772..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p1;
-
-public class A {
-	public class B {
-		public static final Object CONSTANT= ALFRED;	
-	}
-	
-	public static final Object ALFRED= null;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/InlineSite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/InlineSite.java
deleted file mode 100644
index 1b8964c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/InlineSite.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// Here, an import is added for a type needed only after a qualification is added.
-// 8, 19 -> 8, 29  removeAll == false
-package p2;
-
-import p1.A;
-import p1.A.B;
-
-class InlineSite {
-	Object thing= A.ALFRED;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/in/GrueziWohl.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/in/GrueziWohl.java
deleted file mode 100644
index 11d4e1e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/in/GrueziWohl.java
+++ /dev/null

@@ -1,17 +0,0 @@
-// 7, 35 -> 7, 35  replaceAll == true, removeDeclaration == false;
-package cantonzuerich;
-
-public class GrueziWohl {
-	private static String gruezi= "Gruezi";
-	private static boolean jh= true;
-	private static final boolean WOHL= jh && "Gruezi".equals(gruezi);
-	
-	public String holenGruss() {
-		String gruezi= "Gruezi";
-		return gruezi + (WOHL ? " Wohl" : "") + "!";
-	}
-	
-	private boolean wohl() {
-		return WOHL;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/out/GrueziWohl.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/out/GrueziWohl.java
deleted file mode 100644
index 564c7c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/out/GrueziWohl.java
+++ /dev/null

@@ -1,17 +0,0 @@
-// 7, 35 -> 7, 35  replaceAll == true, removeDeclaration == false;
-package cantonzuerich;
-
-public class GrueziWohl {
-	private static String gruezi= "Gruezi";
-	private static boolean jh= true;
-	private static final boolean WOHL= jh && "Gruezi".equals(gruezi);
-	
-	public String holenGruss() {
-		String gruezi= "Gruezi";
-		return gruezi + ((jh && "Gruezi".equals(GrueziWohl.gruezi)) ? " Wohl" : "") + "!";
-	}
-	
-	private boolean wohl() {
-		return jh && "Gruezi".equals(gruezi);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/in/Froehlichkeit.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/in/Froehlichkeit.java
deleted file mode 100644
index 5cf853d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/in/Froehlichkeit.java
+++ /dev/null

@@ -1,21 +0,0 @@
-// 14, 16 -> 14, 32  replaceAll == true, removeDeclaration == false
-package schweiz.zuerich.zuerich;
-
-public abstract class Froehlichkeit {
-	static class MeineFroehlichkeit extends Froehlichkeit {
-		MeineFroehlichkeit(Object o) {}
-	}
-	private static Object something= new Object();
-	private static final Froehlichkeit dieFroehlichkeit= new MeineFroehlichkeit(something);
-
-	public Froehlichkeit holenFroehlichkeit() {
-		class MeineFroehlichkeit {
-		}
-		return dieFroehlichkeit;
-	}
-
-	public Froehlichkeit deineFroehlichkeit() {
-		Object something= "";
-		return dieFroehlichkeit;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/out/Froehlichkeit.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/out/Froehlichkeit.java
deleted file mode 100644
index 8002a21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/out/Froehlichkeit.java
+++ /dev/null

@@ -1,21 +0,0 @@
-// 14, 16 -> 14, 32  replaceAll == true, removeDeclaration == false
-package schweiz.zuerich.zuerich;
-
-public abstract class Froehlichkeit {
-	static class MeineFroehlichkeit extends Froehlichkeit {
-		MeineFroehlichkeit(Object o) {}
-	}
-	private static Object something= new Object();
-	private static final Froehlichkeit dieFroehlichkeit= new MeineFroehlichkeit(something);
-
-	public Froehlichkeit holenFroehlichkeit() {
-		class MeineFroehlichkeit {
-		}
-		return new Froehlichkeit.MeineFroehlichkeit(something);
-	}
-
-	public Froehlichkeit deineFroehlichkeit() {
-		Object something= "";
-		return new MeineFroehlichkeit(Froehlichkeit.something);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/in/Klass.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/in/Klass.java
deleted file mode 100644
index 44afdd6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/in/Klass.java
+++ /dev/null

@@ -1,14 +0,0 @@
-// 10, 22 -> 10, 30  replaceAll == false
-
-package p;
-
-class Klass {
-	static final Klass KONSTANT=           new   Klass()  ;
-	
-	
-	static void f() {
-		Klass klass= KONSTANT;	
-	}
-	
-	Klass klass=KONSTANT;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/out/Klass.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/out/Klass.java
deleted file mode 100644
index 26f644e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/out/Klass.java
+++ /dev/null

@@ -1,14 +0,0 @@
-// 10, 22 -> 10, 30  replaceAll == false
-
-package p;
-
-class Klass {
-	static final Klass KONSTANT=           new   Klass()  ;
-	
-	
-	static void f() {
-		Klass klass= new   Klass();	
-	}
-	
-	Klass klass=KONSTANT;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/in/LeVinSuperieure.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/in/LeVinSuperieure.java
deleted file mode 100644
index df91fba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/in/LeVinSuperieure.java
+++ /dev/null

@@ -1,11 +0,0 @@
-// 5, 32 -> 5, 43  replaceAll == true, removeDeclaration == true
-package p;
-
-class LeVinSuperieure {
-	public static final String LE_CONSTANT= "Pharmacology";
-	
-	public LeVinSuperieure(final String appelation) {
-		String leNom= appelation == null ? LE_CONSTANT : appelation;
-		System.out.println("Nous avons cree un superieure vin, appelle " + leNom);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/out/LeVinSuperieure.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/out/LeVinSuperieure.java
deleted file mode 100644
index d354d60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/out/LeVinSuperieure.java
+++ /dev/null

@@ -1,9 +0,0 @@
-// 5, 32 -> 5, 43  replaceAll == true, removeDeclaration == true
-package p;
-
-class LeVinSuperieure {
-	public LeVinSuperieure(final String appelation) {
-		String leNom= appelation == null ? "Pharmacology" : appelation;
-		System.out.println("Nous avons cree un superieure vin, appelle " + leNom);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/in/Klus.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/in/Klus.java
deleted file mode 100644
index ced6dc7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/in/Klus.java
+++ /dev/null

@@ -1,8 +0,0 @@
-// 5, 36 -> 5, 36  replaceAll == true, removeDeclaration == false
-package p;
-
-class Klus {
-	private static final int KLUSPLATZ= 34;
-	
-	private int kreuzplatz= (kreuzplatz= -1 +KLUSPLATZ+ (-1));
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/out/Klus.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/out/Klus.java
deleted file mode 100644
index 56daf64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/out/Klus.java
+++ /dev/null

@@ -1,8 +0,0 @@
-// 5, 36 -> 5, 36  replaceAll == true, removeDeclaration == false
-package p;
-
-class Klus {
-	private static final int KLUSPLATZ= 34;
-	
-	private int kreuzplatz= (kreuzplatz= -1 +34+ (-1));
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/in/PartOfDeclNameSelected.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/in/PartOfDeclNameSelected.java
deleted file mode 100644
index 43188dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/in/PartOfDeclNameSelected.java
+++ /dev/null

@@ -1,9 +0,0 @@
-// 5, 32 -> 5, 34  replaceAllReferences == true,  removeDeclaration == true
-package p;
-
-class PartOfDeclNameSelected {
-	public static final long foooo= 1;
-	static {
-		int i= foooo;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/out/PartOfDeclNameSelected.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/out/PartOfDeclNameSelected.java
deleted file mode 100644
index 9e6c2de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/out/PartOfDeclNameSelected.java
+++ /dev/null

@@ -1,8 +0,0 @@
-// 5, 32 -> 5, 34  replaceAllReferences == true,  removeDeclaration == true
-package p;
-
-class PartOfDeclNameSelected {
-	static {
-		int i= 1;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/in/CursorPositionedInReference.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/in/CursorPositionedInReference.java
deleted file mode 100644
index 5441bb2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/in/CursorPositionedInReference.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 57 -> 8, 57  replaceAll == false
-package p;
-
-class CursorPositionedInReference {
-	static final String VISUALAGE_FOR_COBOL= "simply irresistible";
-	
-	public static CursorPositionedInReference eat() {
-		System.out.println("Refactoring is " + VISUALAGE_FOR_COBOL);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/out/CursorPositionedInReference.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/out/CursorPositionedInReference.java
deleted file mode 100644
index 079cba5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/out/CursorPositionedInReference.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 57 -> 8, 57  replaceAll == false
-package p;
-
-class CursorPositionedInReference {
-	static final String VISUALAGE_FOR_COBOL= "simply irresistible";
-	
-	public static CursorPositionedInReference eat() {
-		System.out.println("Refactoring is " + "simply irresistible");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/in/PartOfReferenceSelected.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/in/PartOfReferenceSelected.java
deleted file mode 100644
index 3777c20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/in/PartOfReferenceSelected.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 52 -> 8, 62  replaceAll == false
-package p;
-
-class PartOfReferenceSelected {
-	static final String VISUALAGE_FOR_COBOL= "simply irresistible";
-	
-	public static CursorPositionedInReference eat() {
-		System.out.println("Refactoring is " + VISUALAGE_FOR_COBOL);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/out/PartOfReferenceSelected.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/out/PartOfReferenceSelected.java
deleted file mode 100644
index 5d2c165..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/out/PartOfReferenceSelected.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 52 -> 8, 62  replaceAll == false
-package p;
-
-class PartOfReferenceSelected {
-	static final String VISUALAGE_FOR_COBOL= "simply irresistible";
-	
-	public static CursorPositionedInReference eat() {
-		System.out.println("Refactoring is " + "simply irresistible");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/C.java
deleted file mode 100644
index 8808f05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-// 5, 29 -> 5, 37  replaceAll == true, removeDeclaration == false
-package p1;
-
-public class C {
-	public static final int CONSTANT= 12345;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/D.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/D.java
deleted file mode 100644
index e65ae91..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/D.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p2;
-
-import p1.C;
-
-class D {
-	void f() {
-		int j= C.CONSTANT;	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/C.java
deleted file mode 100644
index 8808f05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-// 5, 29 -> 5, 37  replaceAll == true, removeDeclaration == false
-package p1;
-
-public class C {
-	public static final int CONSTANT= 12345;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java
deleted file mode 100644
index c656489..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p2;
-
-import p1.C;
-
-class D {
-	void f() {
-		int j= 12345;	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/C.java
deleted file mode 100644
index 806e858..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/C.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p1;
-
-public class C {
-	public static final int CONSTANT= 12345;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/D.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/D.java
deleted file mode 100644
index 9ea4920..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/D.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 18 -> 8, 26  replaceAll == true, removeDeclaration == true
-package p2;
-
-import p1.C;
-
-class D {
-	void f() {
-		int j= C.CONSTANT;	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/E.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/E.java
deleted file mode 100644
index 6d6b96a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/E.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p3;
-
-import p1.C;
-
-public class E {
-	static int e= 1 + C.CONSTANT;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/C.java
deleted file mode 100644
index 1df4f81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/C.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p1;
-
-public class C {	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java
deleted file mode 100644
index 535b1d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 18 -> 8, 26  replaceAll == true, removeDeclaration == true
-package p2;
-
-import p1.C;
-
-class D {
-	void f() {
-		int j= 12345;	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java
deleted file mode 100644
index a22231a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p3;
-
-import p1.C;
-
-public class E {
-	static int e= 1 + 12345;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail0/in/NeueZuercherZeitung.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail0/in/NeueZuercherZeitung.java
deleted file mode 100644
index 40b9ea9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail0/in/NeueZuercherZeitung.java
+++ /dev/null

@@ -1,7 +0,0 @@
-// 5, 27 -> 5, 28, replaceAll= true removeDeclaration == false
-package foo;
-
-class NeueZuercherZeitung {
-	public static Object foob;
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail1/in/Fun.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail1/in/Fun.java
deleted file mode 100644
index 071ae4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail1/in/Fun.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// 8, 35 -> 8, 35  replaceAll == false
-package fun;
-
-import java.util.*;
-
-class Fun {
-	int m() {
-		return GregorianCalendar.BC;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/.cvsignore
deleted file mode 100644
index eddeac1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-.metadata
-bin
-*.class
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.classpath b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.classpath
deleted file mode 100644
index 1b1d910..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.classpath
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path=""/>
-    <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.cvsignore
deleted file mode 100644
index 21a3013..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-*.class
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.project b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.project
deleted file mode 100644
index 86a5ef6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>TestCases</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/A.java
deleted file mode 100644
index ab9b2b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-public class A {
-	public void foo() {
-		bar();
-	}
-	int bar() {
-		return 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/B.java
deleted file mode 100644
index e09402c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-public class B {
-	public void foo() {
-		System.out.println("Eclipse");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/C.java
deleted file mode 100644
index 987c439..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-class C {
-    int m(){
-        return 6 + 6;
-    }
-    void f(C a){
-       m();
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/E.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/E.java
deleted file mode 100644
index 4087d98..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/E.java
+++ /dev/null

@@ -1,6 +0,0 @@
-public class E {
-	public void main() {
-		B b= null;
-		b.foo();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/InlineBug.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/InlineBug.java
deleted file mode 100644
index 64e656d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/InlineBug.java
+++ /dev/null

@@ -1,26 +0,0 @@
-import java.io.Writer;
-
-public class InlineBug
-{
-	public void caller(Writer out) throws Exception
-	{
-		out.write("start caller");
-		inlineMe(out);
-		out.write("end caller");
-	}
-
-	public void inlineMe(Writer out) throws Exception
-	{
-		out.write("start render");
-		subroutine(true, out);
-		out.write("end render");
-	}
-
-	void subroutine(boolean isSelected, Writer out) throws Exception
-	{
-		if (isSelected)
-		{
-			out.write("selected");
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/Test.java
deleted file mode 100644
index 1595b3d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/Test.java
+++ /dev/null

@@ -1,20 +0,0 @@
-public class Test {
-
-  private int bb(int u, int v, int w) {
-	return (u & v) | (~u & w);
-  }
-
-  private int aa(int x, int n) {
-	return (x << n) | (x >>> (32 - n));
-  }
-
-  protected void processBlock() {
-	int a = 0;
-	int b = 1;
-	int c = 2;
-	int d = 3;
-    
-	a = aa((a + bb( b, c, d)), 0) + b;
-  }    
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestArray.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestArray.java
deleted file mode 100644
index 9868287..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestArray.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package argument_in;
-
-public class TestArray {
-
-	public int bar(int a[]) {
-		return a[0];
-	}
-	
-	public void main() {
-		int i= /*[*/bar(new int[] {1})/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestFieldReference.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestFieldReference.java
deleted file mode 100644
index f160fa5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestFieldReference.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package argument_in;
-
-public class TestFieldReference {
-	private String field;
-	
-	public void main() {
-		/*[*/bar(field);/*]*/
-	}
-
-	public void bar(Object o) {
-		o.toString();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceRead.java
deleted file mode 100644
index 35d5af1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceRead.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package argument_in;
-
-public class TestLiteralReferenceRead {
-	public void main() {
-		/*[*/foo(10);/*]*/
-	}
-	
-	public void foo(int x) {
-		int i= x;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceWrite.java
deleted file mode 100644
index 382d227..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceWrite.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package argument_in;
-
-public class TestLiteralReferenceWrite {
-	public void main() {
-		/*[*/foo(10);/*]*/
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop.java
deleted file mode 100644
index ad3c0e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_in;
-
-public class TestLocalReferenceLoop {
-	public void main() {
-		int i= 10;
-		for (int z= 0; z < i; z++) {
-			/*[*/foo(i);/*]*/
-		}
-	}
-	
-	public void foo(int x) {
-		x= x + 10;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferencePrefix.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferencePrefix.java
deleted file mode 100644
index 0549478..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferencePrefix.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package argument_in;
-
-public class TestLocalReferencePrefix {
-	public void main() {
-		int a = 0;
-		int b = 1;
-		int c = 2;
-		int d = 3;
-    
-		a = aa((a + /*[*/bb( b, c, d)/*]*/), 0) + b;
-	}
-	
-	private int bb(int u, int v, int w) {
-	  return (u & v) | (~u & w);
-	}
-
-	private int aa(int x, int n) {
-	  return (x << n) | (x >>> (32 - n));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead.java
deleted file mode 100644
index 9604b5d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package argument_in;
-
-public class TestLocalReferenceRead {
-	public void main() {
-		int foo = 0;
-		/*[*/inlineMe(foo);/*]*/
-		System.out.println(foo);
-	}
-	
-	public void inlineMe(int bar) {
-		bar++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead2.java
deleted file mode 100644
index 19e0c94..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead2.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package argument_in;
-
-public class TestLocalReferenceRead2 {
-	public void main() {
-		int i= 10;
-		/*[*/foo(i);/*]*/
-		System.out.println(i);
-	}
-	
-	public void foo(int x) {
-		x= x + 10;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceUnused.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceUnused.java
deleted file mode 100644
index 3b02a8c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceUnused.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package argument_in;
-
-public class TestLocalReferenceUnused {
-	public void main() {
-		int i= 10;
-		/*[*/foo(i);/*]*/
-		int x= 7;
-	}
-	
-	public void foo(int x) {
-		x= x + 10;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceWrite.java
deleted file mode 100644
index 68333fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceWrite.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_in;
-
-public class TestLocalReferenceWrite {
-	public void main() {
-		int i= 10;
-		/*[*/foo(i);/*]*/
-		i= 10;
-		System.out.println(i);
-	}
-	
-	public void foo(int x) {
-		x= x + 10;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestOneRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestOneRead.java
deleted file mode 100644
index 513ec4e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestOneRead.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package argument_in;
-
-public class TestOneRead {
-	public void main() {
-		/*[*/foo(value());/*]*/
-	}
-	
-	public void foo(int x) {
-		int i= x;
-	}
-	
-	public int value() {
-		return 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused1.java
deleted file mode 100644
index cb88f0f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused1.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_in;
-
-public class TestParameterNameUnused1 {
-	public void main() {
-		{
-			int x= 20;
-		}
-		/*[*/foo(10);/*]*/
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused2.java
deleted file mode 100644
index ffc22fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused2.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package argument_in;
-
-public class TestParameterNameUnused2 {
-	public void main() {
-		for (int x= 10; x < 20; x++)
-			main();
-		/*[*/foo(10);/*]*/
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused3.java
deleted file mode 100644
index ef50702..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused3.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_in;
-
-public class TestParameterNameUnused3 {
-	public void main() {
-		class T {
-			int x;
-		}
-		/*[*/foo(10);/*]*/
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed1.java
deleted file mode 100644
index 89053d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed1.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package argument_in;
-
-public class TestParameterNameUsed1 {
-	public void main() {
-		int x= 20;
-		/*[*/foo(10);/*]*/
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed2.java
deleted file mode 100644
index 45a5ed9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed2.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package argument_in;
-
-public class TestParameterNameUsed2 {
-	public void main() {
-		/*[*/foo(10);/*]*/
-		int x= 20;
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed3.java
deleted file mode 100644
index d991e52..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed3.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_in;
-
-public class TestParameterNameUsed3 {
-	public void main() {
-		/*[*/foo(10);/*]*/
-		{
-			int x= 20;
-		}
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed4.java
deleted file mode 100644
index d7304c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed4.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package argument_in;
-
-public class TestParameterNameUsed4 {
-	public void main() {
-		class x {}
-		/*[*/foo(10);/*]*/
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestTwoReads.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestTwoReads.java
deleted file mode 100644
index af2e04e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestTwoReads.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package argument_in;
-
-public class TestTwoReads {
-	public void main() {
-		/*[*/foo(value());/*]*/
-	}
-	
-	public void foo(int x) {
-		int i= x;
-		int y= x;
-	}
-	
-	public int value() {
-		return 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestWrite.java
deleted file mode 100644
index 18b74fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestWrite.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package argument_in;
-
-public class TestWrite {
-	public void main() {
-		/*[*/foo(value());/*]*/
-	}
-	
-	public void foo(int x) {
-		x= 10;
-	}
-	
-	public int value() {
-		return 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestArray.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestArray.java
deleted file mode 100644
index 21d2e25..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestArray.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package argument_out;
-
-public class TestArray {
-
-	public int bar(int a[]) {
-		return a[0];
-	}
-	
-	public void main() {
-		int i= (new int[] {1})[0];
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestFieldReference.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestFieldReference.java
deleted file mode 100644
index 58cdfe6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestFieldReference.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package argument_out;
-
-public class TestFieldReference {
-	private String field;
-	
-	public void main() {
-		field.toString();
-	}
-
-	public void bar(Object o) {
-		o.toString();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceRead.java
deleted file mode 100644
index 6e1c292..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceRead.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package argument_out;
-
-public class TestLiteralReferenceRead {
-	public void main() {
-		int i= 10;
-		bar(10);
-	}
-	
-	public void foo(int x) {
-		int i= x;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceWrite.java
deleted file mode 100644
index a9ab2b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceWrite.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package argument_out;
-
-public class TestLiteralReferenceWrite {
-	public void main() {
-		int x = 10;
-		x= 20;
-		bar(x);
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop.java
deleted file mode 100644
index d40a766..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package argument_out;
-
-public class TestLocalReferenceLoop {
-	public void main() {
-		int i= 10;
-		for (int z= 0; z < i; z++) {
-			int x = i;
-			x= x + 10;
-			bar(x);
-		}
-	}
-	
-	public void foo(int x) {
-		x= x + 10;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferencePrefix.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferencePrefix.java
deleted file mode 100644
index 6e1c0de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferencePrefix.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package argument_out;
-
-public class TestLocalReferencePrefix {
-	public void main() {
-		int a = 0;
-		int b = 1;
-		int c = 2;
-		int d = 3;
-    
-		a = aa((a + ((b & c) | (~b & d))), 0) + b;
-	}
-	
-	private int bb(int u, int v, int w) {
-	  return (u & v) | (~u & w);
-	}
-
-	private int aa(int x, int n) {
-	  return (x << n) | (x >>> (32 - n));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead.java
deleted file mode 100644
index 7730ce0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package argument_out;
-
-public class TestLocalReferenceRead {
-	public void main() {
-		int foo = 0;
-		int bar = foo;
-		bar++;
-		System.out.println(foo);
-	}
-	
-	public void inlineMe(int bar) {
-		bar++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead2.java
deleted file mode 100644
index 6cf271a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead2.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package argument_out;
-
-public class TestLocalReferenceRead2 {
-	public void main() {
-		int i= 10;
-		int x = i;
-		x= x + 10;
-		bar(x);
-		System.out.println(i);
-	}
-	
-	public void foo(int x) {
-		x= x + 10;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceUnused.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceUnused.java
deleted file mode 100644
index 49a3742..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceUnused.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_out;
-
-public class TestLocalReferenceUnused {
-	public void main() {
-		int i= 10;
-		i= i + 10;
-		bar(i);
-		int x= 7;
-	}
-	
-	public void foo(int x) {
-		x= x + 10;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceWrite.java
deleted file mode 100644
index 94c351b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceWrite.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package argument_out;
-
-public class TestLocalReferenceWrite {
-	public void main() {
-		int i= 10;
-		i= i + 10;
-		bar(i);
-		i= 10;
-		System.out.println(i);
-	}
-	
-	public void foo(int x) {
-		x= x + 10;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestOneRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestOneRead.java
deleted file mode 100644
index 53b0005..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestOneRead.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package argument_out;
-
-public class TestOneRead {
-	public void main() {
-		int i= value();
-	}
-	
-	public void foo(int x) {
-		int i= x;
-	}
-	
-	public int value() {
-		return 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused1.java
deleted file mode 100644
index fab2ca9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused1.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package argument_out;
-
-public class TestParameterNameUnused1 {
-	public void main() {
-		{
-			int x= 20;
-		}
-		int x = 10;
-		x= 20;
-		bar(x);
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused2.java
deleted file mode 100644
index fe28428..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused2.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package argument_out;
-
-public class TestParameterNameUnused2 {
-	public void main() {
-		for (int x= 10; x < 20; x++)
-			main();
-		int x = 10;
-		x= 20;
-		bar(x);
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused3.java
deleted file mode 100644
index 4300904..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused3.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package argument_out;
-
-public class TestParameterNameUnused3 {
-	public void main() {
-		class T {
-			int x;
-		}
-		int x = 10;
-		x= 20;
-		bar(x);
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed1.java
deleted file mode 100644
index a548c66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed1.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_out;
-
-public class TestParameterNameUsed1 {
-	public void main() {
-		int x= 20;
-		int x1 = 10;
-		x1= 20;
-		bar(x1);
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed2.java
deleted file mode 100644
index eb39686..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed2.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_out;
-
-public class TestParameterNameUsed2 {
-	public void main() {
-		int x1 = 10;
-		x1= 20;
-		bar(x1);
-		int x= 20;
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed3.java
deleted file mode 100644
index 52ea327..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed3.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package argument_out;
-
-public class TestParameterNameUsed3 {
-	public void main() {
-		int x1 = 10;
-		x1= 20;
-		bar(x1);
-		{
-			int x= 20;
-		}
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed4.java
deleted file mode 100644
index 839cbe0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed4.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_out;
-
-public class TestParameterNameUsed4 {
-	public void main() {
-		class x {}
-		int x1 = 10;
-		x1= 20;
-		bar(x1);
-	}
-	
-	public void foo(int x) {
-		x= 20;
-		bar(x);
-	}
-	
-	public void bar(int z) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestTwoReads.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestTwoReads.java
deleted file mode 100644
index d7b6199..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestTwoReads.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package argument_out;
-
-public class TestTwoReads {
-	public void main() {
-		int x = value();
-		int i= x;
-		int y= x;
-	}
-	
-	public void foo(int x) {
-		int i= x;
-		int y= x;
-	}
-	
-	public int value() {
-		return 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestWrite.java
deleted file mode 100644
index 23ec377..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestWrite.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package argument_out;
-
-public class TestWrite {
-	public void main() {
-		int x = value();
-		x= 10;
-	}
-	
-	public void foo(int x) {
-		x= 10;
-	}
-	
-	public int value() {
-		return 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatement.java
deleted file mode 100644
index fdb6313..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatement.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package call_in;
-
-public class TestExpressionStatement {
-	public void main() {
-		/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		System.out.println("Eclipse");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatementWithReturn.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatementWithReturn.java
deleted file mode 100644
index 8ede88c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatementWithReturn.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package call_in;
-
-public class TestExpressionStatementWithReturn {
-	public void main() {
-		/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		System.out.println("Eclipse");
-		return;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestParenthesis.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestParenthesis.java
deleted file mode 100644
index 06c9e22..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestParenthesis.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package call_in;
-
-import java.util.List;
-
-public class TestParenthesis {
-	Object list;
-	
-	public void main() {
-		Object element= /*]*/getList()/*]*/.get(0);
-	}
-	
-	public List getList() {
-		return (List)list;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction1.java
deleted file mode 100644
index ecc346c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction1.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package call_in;
-
-class TestStatementWithFunction1 {
-    public void main(){
-       /*]*/foo();/*[*/
-    }
-    
-    public int foo(){
-        return 6;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction2.java
deleted file mode 100644
index 2d80def..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction2.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package call_in;
-
-class TestStatementWithFunction2 {
-    public void main(){
-       /*]*/foo();/*[*/
-    }
-    
-    public int foo(){
-        return bar();
-    }
-    public int bar() {
-    	System.out.println("Bar called");
-    	return 10;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatement.java
deleted file mode 100644
index 8f08de8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatement.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package call_out;
-
-public class TestExpressionStatement {
-	public void main() {
-		System.out.println("Eclipse");
-	}
-	
-	public void foo() {
-		System.out.println("Eclipse");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatementWithReturn.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatementWithReturn.java
deleted file mode 100644
index 3517750..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatementWithReturn.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package call_out;
-
-public class TestExpressionStatementWithReturn {
-	public void main() {
-		System.out.println("Eclipse");
-	}
-	
-	public void foo() {
-		System.out.println("Eclipse");
-		return;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestParenthesis.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestParenthesis.java
deleted file mode 100644
index d22c2e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestParenthesis.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package call_out;
-
-import java.util.List;
-
-public class TestParenthesis {
-	Object list;
-	
-	public void main() {
-		Object element= /*]*/((List)list).get(0);
-	}
-	
-	public List getList() {
-		return (List)list;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction1.java
deleted file mode 100644
index 360c031..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package call_out;
-
-class TestStatementWithFunction1 {
-    public void main(){
-    }
-    
-    public int foo(){
-        return 6;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction2.java
deleted file mode 100644
index 6dbe89a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction2.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package call_out;
-
-class TestStatementWithFunction2 {
-    public void main(){
-       bar();
-    }
-    
-    public int foo(){
-        return bar();
-    }
-    public int bar() {
-    	System.out.println("Bar called");
-    	return 10;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloaded.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloaded.java
deleted file mode 100644
index 0f13bed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloaded.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package cast_in;
-
-class Woo {
-}
-
-class Zoo extends Woo {
-}
-
-class Base {
-	public void foo(Woo w) {
-	}
-}
-
-class Derived extends Base {
-	public void foo(Zoo z) {
-	}
-}
-
-public class TestHierarchyOverloaded {
-	public Woo goo() {
-		return new Zoo();
-	}
-	public void main(Derived d) {
-		d.foo(/*]*/goo()/*[*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrimitives.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrimitives.java
deleted file mode 100644
index 3a3c29e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrimitives.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package cast_in;
-
-class Base {
-	public void foo(int i) {
-	}
-}
-
-class Derived extends Base {
-	public void foo(char c) {
-	}
-}
-
-public class TestHierarchyOverloadedPrimitives {
-	public int goo() {
-		return 'a';
-	}
-	public void main(Derived d) {
-		d.foo(/*]*/goo()/*[*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrivate.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrivate.java
deleted file mode 100644
index 629937d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrivate.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package cast_in;
-
-class Base {
-	public void foo(int i) {
-	}
-}
-
-class Derived extends Base {
-	private void foo(char c) {
-	}
-}
-
-public class TestHierarchyOverloadedPrivate {
-	public int goo() {
-		return 'a';
-	}
-	public void main(Derived d) {
-		d.foo(/*]*/goo()/*[*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNoCast.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNoCast.java
deleted file mode 100644
index 6d9a73c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNoCast.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package cast_in;
-
-public class TestNoCast {
-	String fName;
-	String getName() {
-		return fName;
-	}
-	void foo(TestNoCast o) {
-		System.out.println(/*[*/o.getName()/*]*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotCastableOverloaded.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotCastableOverloaded.java
deleted file mode 100644
index be08cfe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotCastableOverloaded.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package cast_in;
-
-class Woo {
-}
-
-public class TestNotCastableOverloaded {
-	public void foo(int i) {
-	}
-	public void foo(Woo w) {
-	}
-	public int goo() {
-		return 'a';
-	}
-	public void main() {
-		foo(/*]*/goo()/*[*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotOverloaded.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotOverloaded.java
deleted file mode 100644
index a5c913c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotOverloaded.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package cast_in;
-
-public class TestNotOverloaded {
-	public void foo(int i) {
-	}
-	public int goo() {
-		return 'a';
-	}
-	public void main() {
-		foo(/*]*/goo()/*[*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloaded.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloaded.java
deleted file mode 100644
index 4e90543..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloaded.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package cast_in;
-
-class Base {
-}
-
-class Derived extends Base {
-}
-
-public class TestOverloaded {
-	public void foo(Derived d) {
-	}
-	public void foo(Base b) {
-	}
-	public Base goo() {
-		return new Derived();
-	}
-	public void main() {
-		foo(/*]*/goo()/*[*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloadedPrimitives.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloadedPrimitives.java
deleted file mode 100644
index fa3d42f2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloadedPrimitives.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package cast_in;
-
-public class TestOverloadedPrimitives {
-	public void foo(int i) {
-	}
-	public void foo(char c) {
-	}
-	public int goo() {
-		return 'a';
-	}
-	public void main() {
-		foo(/*]*/goo()/*[*/);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestReceiverCast.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestReceiverCast.java
deleted file mode 100644
index e84c9be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestReceiverCast.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package cast_in;
-
-public class TestReceiverCast {
-	private void foo(Object obj){
-		String s= /*]*/goo/*[*/((String)obj);
-	}
-
-	private static String goo(String string){
-		return string.intern();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloaded.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloaded.java
deleted file mode 100644
index c82fcd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloaded.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package cast_out;
-
-class Woo {
-}
-
-class Zoo extends Woo {
-}
-
-class Base {
-	public void foo(Woo w) {
-	}
-}
-
-class Derived extends Base {
-	public void foo(Zoo z) {
-	}
-}
-
-public class TestHierarchyOverloaded {
-	public Woo goo() {
-		return new Zoo();
-	}
-	public void main(Derived d) {
-		d.foo((Woo) new Zoo());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrimitives.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrimitives.java
deleted file mode 100644
index c141d63..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrimitives.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package cast_out;
-
-class Base {
-	public void foo(int i) {
-	}
-}
-
-class Derived extends Base {
-	public void foo(char c) {
-	}
-}
-
-public class TestHierarchyOverloadedPrimitives {
-	public int goo() {
-		return 'a';
-	}
-	public void main(Derived d) {
-		d.foo((int) 'a');
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrivate.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrivate.java
deleted file mode 100644
index ef9b438..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrivate.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package cast_out;
-
-class Base {
-	public void foo(int i) {
-	}
-}
-
-class Derived extends Base {
-	private void foo(char c) {
-	}
-}
-
-public class TestHierarchyOverloadedPrivate {
-	public int goo() {
-		return 'a';
-	}
-	public void main(Derived d) {
-		d.foo((int) 'a');
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNoCast.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNoCast.java
deleted file mode 100644
index c3eceb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNoCast.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package cast_out;
-
-public class TestNoCast {
-	String fName;
-	String getName() {
-		return fName;
-	}
-	void foo(TestNoCast o) {
-		System.out.println(o.fName);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotCastableOverloaded.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotCastableOverloaded.java
deleted file mode 100644
index 2fef669..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotCastableOverloaded.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package cast_out;
-
-class Woo {
-}
-
-public class TestNotCastableOverloaded {
-	public void foo(int i) {
-	}
-	public void foo(Woo w) {
-	}
-	public int goo() {
-		return 'a';
-	}
-	public void main() {
-		foo('a');
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotOverloaded.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotOverloaded.java
deleted file mode 100644
index 782788e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotOverloaded.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package cast_out;
-
-public class TestNotOverloaded {
-	public void foo(int i) {
-	}
-	public int goo() {
-		return 'a';
-	}
-	public void main() {
-		foo('a');
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloaded.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloaded.java
deleted file mode 100644
index f6dbb9e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloaded.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package cast_out;
-
-class Base {
-}
-
-class Derived extends Base {
-}
-
-public class TestOverloaded {
-	public void foo(Derived d) {
-	}
-	public void foo(Base b) {
-	}
-	public Base goo() {
-		return new Derived();
-	}
-	public void main() {
-		foo((Base) new Derived());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloadedPrimitives.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloadedPrimitives.java
deleted file mode 100644
index b89eb20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloadedPrimitives.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package cast_out;
-
-public class TestOverloadedPrimitives {
-	public void foo(int i) {
-	}
-	public void foo(char c) {
-	}
-	public int goo() {
-		return 'a';
-	}
-	public void main() {
-		foo((int) 'a');
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestReceiverCast.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestReceiverCast.java
deleted file mode 100644
index 0fd78ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestReceiverCast.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package cast_out;
-
-public class TestReceiverCast {
-	private void foo(Object obj){
-		String s= ((String)obj).intern();
-	}
-
-	private static String goo(String string){
-		return string.intern();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentOne.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentOne.java
deleted file mode 100644
index 047a3da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentOne.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package controlStatement_in;
-
-public class TestForAssignmentOne {
-	public void main() {
-		int x;
-		for (int i= 0; i < 10; i++)
-			x= /*]*/foo()/*[*/;
-	}
-	
-	public int foo() {
-		return 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentTwo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentTwo.java
deleted file mode 100644
index 6b18aee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentTwo.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package controlStatement_in;
-
-public class TestForAssignmentTwo {
-	public void main() {
-		int x;
-		for (int i= 0; i < 10; i++)
-			x= /*]*/foo()/*[*/;
-	}
-	
-	public int foo() {
-		int x;
-		return 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForEmpty.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForEmpty.java
deleted file mode 100644
index e8054e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForEmpty.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package controlStatement_in;
-
-public class TestForEmpty {
-	public void main() {
-		for (int i= 0; i < 10; i++)
-			/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForOne.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForOne.java
deleted file mode 100644
index 424a145..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForOne.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package controlStatement_in;
-
-public class TestForOne {
-	public void main() {
-		for (int i= 0; i < 10; i++)
-			/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		bar();
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForTwo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForTwo.java
deleted file mode 100644
index 6969738..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForTwo.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package controlStatement_in;
-
-public class TestForTwo {
-	public void main() {
-		for (int i= 0; i < 10; i++)
-			/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		bar();
-		bar();
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfElseTwo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfElseTwo.java
deleted file mode 100644
index 0401472..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfElseTwo.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package controlStatement_in;
-
-public class TestIfElseTwo {
-	public void main() {
-		if (true)
-			main();
-		else
-			/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		bar();
-		bar();
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfThenTwo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfThenTwo.java
deleted file mode 100644
index 4853ef0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfThenTwo.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package controlStatement_in;
-
-public class TestIfThenTwo {
-	public void main() {
-		if (true)
-			/*]*/foo();/*[*/
-		else
-			main();
-	}
-	
-	public void foo() {
-		bar();
-		bar();
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentOne.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentOne.java
deleted file mode 100644
index 205f5fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentOne.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package controlStatement_out;
-
-public class TestForAssignmentOne {
-	public void main() {
-		int x;
-		for (int i= 0; i < 10; i++)
-			x= 20;
-	}
-	
-	public int foo() {
-		return 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentTwo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentTwo.java
deleted file mode 100644
index c223ed0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentTwo.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package controlStatement_out;
-
-public class TestForAssignmentTwo {
-	public void main() {
-		int x;
-		for (int i= 0; i < 10; i++) {
-			int x1;
-			x= 20;
-		}
-	}
-	
-	public int foo() {
-		int x;
-		return 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForEmpty.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForEmpty.java
deleted file mode 100644
index 974a709..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForEmpty.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package controlStatement_out;
-
-public class TestForEmpty {
-	public void main() {
-		for (int i= 0; i < 10; i++);
-	}
-	
-	public void foo() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForOne.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForOne.java
deleted file mode 100644
index 76df6d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForOne.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package controlStatement_out;
-
-public class TestForOne {
-	public void main() {
-		for (int i= 0; i < 10; i++)
-			bar();
-	}
-	
-	public void foo() {
-		bar();
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForTwo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForTwo.java
deleted file mode 100644
index e00d9a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForTwo.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package controlStatement_out;
-
-public class TestForTwo {
-	public void main() {
-		for (int i= 0; i < 10; i++) {
-			bar();
-			bar();
-		}
-	}
-	
-	public void foo() {
-		bar();
-		bar();
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfElseTwo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfElseTwo.java
deleted file mode 100644
index c55f339..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfElseTwo.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package controlStatement_out;
-
-public class TestIfElseTwo {
-	public void main() {
-		if (true)
-			main();
-		else {
-			bar();
-			bar();
-		}
-	}
-	
-	public void foo() {
-		bar();
-		bar();
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfThenTwo.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfThenTwo.java
deleted file mode 100644
index 998c73c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfThenTwo.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package controlStatement_out;
-
-public class TestIfThenTwo {
-	public void main() {
-		if (true) {
-			bar();
-			bar();
-		} else
-			main();
-	}
-	
-	public void foo() {
-		bar();
-		bar();
-	}
-	public void bar() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestAssignment.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestAssignment.java
deleted file mode 100644
index 90b101e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestAssignment.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_in;
-
-public class TestAssignment {
-	public void main() {
-		int i= 0;
-		i= /*]*/foo()/*[*/;
-	}
-	public int foo() {
-		int x= 20;
-		return x++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestConditionalExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestConditionalExpression.java
deleted file mode 100644
index 74a984a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestConditionalExpression.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package expression_in;
-
-public class TestConditionalExpression {
-	int i(Object s, int k) {
-		return k == 3 ? s.hashCode() : 3;
-	}
-	void f(int p) {
-		int u = /*[*/i(this, p)/*]*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestReturnStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestReturnStatement.java
deleted file mode 100644
index f128bb3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestReturnStatement.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package expression_in;
-
-public class TestReturnStatement {
-	public int main() {
-		return /*]*/foo()/*[*/;
-	}
-	
-	public int foo() {
-		if (true) {
-			return 10;
-		}
-		return 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleBody.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleBody.java
deleted file mode 100644
index be20e2e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleBody.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_in;
-
-public class TestSimpleBody {
-	public void main() {
-		int i= 10 * /*]*/foo()/*[*/;
-	}
-	
-	public int foo() {
-		return 1 + 2;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpression.java
deleted file mode 100644
index e6a6c92..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpression.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_in;
-
-public class TestSimpleExpression {
-	public void main() {
-		int i= /*]*/foo()/*[*/;
-	}
-	
-	public int foo() {
-		return 1 + 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpressionWithStatements.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpressionWithStatements.java
deleted file mode 100644
index 3b4ca4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpressionWithStatements.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package expression_in;
-
-public class TestSimpleExpressionWithStatements {
-	public void main() {
-		int i= /*]*/foo()/*[*/;
-	}
-	
-	public int foo() {
-		int x= 20;
-		return x + 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestAssignment.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestAssignment.java
deleted file mode 100644
index 32b42c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestAssignment.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package expression_out;
-
-public class TestAssignment {
-	public void main() {
-		int i= 0;
-		int x= 20;
-		i= x++;
-	}
-	public int foo() {
-		int x= 20;
-		return x++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestConditionalExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestConditionalExpression.java
deleted file mode 100644
index 701f409..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestConditionalExpression.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package expression_out;
-
-public class TestConditionalExpression {
-	int i(Object s, int k) {
-		return k == 3 ? s.hashCode() : 3;
-	}
-	void f(int p) {
-		int u = (p == 3 ? this.hashCode() : 3);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestReturnStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestReturnStatement.java
deleted file mode 100644
index 4246899..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestReturnStatement.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package expression_out;
-
-public class TestReturnStatement {
-	public int main() {
-		if (true) {
-			return 10;
-		}
-		return 20;
-	}
-	
-	public int foo() {
-		if (true) {
-			return 10;
-		}
-		return 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleBody.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleBody.java
deleted file mode 100644
index 9845306..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleBody.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_out;
-
-public class TestSimpleBody {
-	public void main() {
-		int i= 10 * (1 + 2);
-	}
-	
-	public int foo() {
-		return 1 + 2;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpression.java
deleted file mode 100644
index 5338d26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpression.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package expression_out;
-
-public class TestSimpleExpression {
-	public void main() {
-		int i= 1 + 1;
-	}
-	
-	public int foo() {
-		return 1 + 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpressionWithStatements.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpressionWithStatements.java
deleted file mode 100644
index ac31c8f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpressionWithStatements.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package expression_out;
-
-public class TestSimpleExpressionWithStatements {
-	public void main() {
-		int x= 20;
-		int i= x + 1;
-	}
-	
-	public int foo() {
-		int x= 20;
-		return x + 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/Provider.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/Provider.java
deleted file mode 100644
index 582a083..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/Provider.java
+++ /dev/null

@@ -1,42 +0,0 @@
-package import_in;
-
-import import_use.List;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Map;
-
-public class Provider {
-	public File useAsReturn() {
-		return null;
-	}
-	public void useInArgument(File file) {
-		file= null;
-	}
-	public void useInDecl() {
-		List list= null;
-	}
-	public int useInDecl2(){
-	  return new ArrayList().size();
-	}	
-	public Object useInDecl3(){
-	  return new java.util.HashMap();
-	}	
-	public void useInClassLiteral() {
-		Class clazz= File.class;
-	}
-	public void useArray() {
-		List[] lists= null;
-	}
-	public void useInLocalClass() {
-		class Local extends File implements Comparable {
-			public Local(String s) {
-				super(s);
-			}
-			public void foo(Map map) {
-			}
-			public int compareTo(Object o) {
-				return 0;
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseArray.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseArray.java
deleted file mode 100644
index 370848a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseArray.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package import_in;
-
-public class TestUseArray {
-	public void main() {
-		Provider p= null;
-		/*]*/p.useArray();/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInArgument.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInArgument.java
deleted file mode 100644
index 95afaef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInArgument.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package import_in;
-
-public class TestUseInArgument {
-	public void main() {
-		Provider p= null;
-		/*]*/p.useInArgument(p.useAsReturn());/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInClassLiteral.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInClassLiteral.java
deleted file mode 100644
index 2ae4e90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInClassLiteral.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package import_in;
-
-public class TestUseInClassLiteral {
-	public void main() {
-		Provider p= null;
-		/*]*/p.useInClassLiteral();/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl.java
deleted file mode 100644
index a301cbb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package import_in;
-
-public class TestUseInDecl {
-	public void main() {
-		Provider p= null;
-		/*]*/p.useInDecl();/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl2.java
deleted file mode 100644
index a43d24f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl2.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package import_in;
-
-public class TestUseInDecl2 {
-	public void main() {
-		Provider p= null;
-		/*]*/p.useInDecl2();/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl3.java
deleted file mode 100644
index efb6168..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl3.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package import_in;
-
-public class TestUseInDecl3 {
-	public void main() {
-		Provider p= null;
-		/*]*/p.useInDecl3();/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDeclClash.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDeclClash.java
deleted file mode 100644
index 5dd4a4d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDeclClash.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package import_in;
-
-import java.util.List;
-
-public class TestUseInDeclClash {
-	List fList;
-	public void main() {
-		Provider p= null;
-		/*]*/p.useInDecl();/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInLocalClass.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInLocalClass.java
deleted file mode 100644
index a66a7f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInLocalClass.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package import_in;
-
-public class TestUseInLocalClass {
-	public void main() {
-		Provider p= null;
-		/*]*/p.useInLocalClass();/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/Provider.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/Provider.java
deleted file mode 100644
index 172f979..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/Provider.java
+++ /dev/null

@@ -1,42 +0,0 @@
-package import_out;
-
-import import_use.List;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Map;
-
-public class Provider {
-	public File useAsReturn() {
-		return null;
-	}
-	public void useInArgument(File file) {
-		file= null;
-	}
-	public void useInDecl() {
-		List list= null;
-	}
-	public int useInDecl2(){
-	  return new ArrayList().size();
-	}	
-	public Object useInDecl3(){
-	  return new java.util.HashMap();
-	}	
-	public void useInClassLiteral() {
-		Class clazz= File.class;
-	}
-	public void useArray() {
-		List[] lists= null;
-	}
-	public void useInLocalClass() {
-		class Local extends File implements Comparable {
-			public Local(String s) {
-				super(s);
-			}
-			public void foo(Map map) {
-			}
-			public int compareTo(Object o) {
-				return 0;
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseArray.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseArray.java
deleted file mode 100644
index 9ee15c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseArray.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package import_out;
-
-import import_use.List;
-
-public class TestUseArray {
-	public void main() {
-		Provider p= null;
-		List[] lists= null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInArgument.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInArgument.java
deleted file mode 100644
index cbed052..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInArgument.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package import_out;
-
-import java.io.File;
-
-public class TestUseInArgument {
-	public void main() {
-		Provider p= null;
-		File file = p.useAsReturn();
-		file= null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInClassLiteral.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInClassLiteral.java
deleted file mode 100644
index 7b76c23..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInClassLiteral.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package import_out;
-
-import java.io.File;
-
-public class TestUseInClassLiteral {
-	public void main() {
-		Provider p= null;
-		Class clazz= File.class;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl.java
deleted file mode 100644
index 22039cc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package import_out;
-
-import import_use.List;
-
-public class TestUseInDecl {
-	public void main() {
-		Provider p= null;
-		List list= null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl2.java
deleted file mode 100644
index f6b67d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl2.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package import_out;
-
-import java.util.ArrayList;
-
-public class TestUseInDecl2 {
-	public void main() {
-		Provider p= null;
-		new ArrayList().size();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl3.java
deleted file mode 100644
index 241bd0f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl3.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package import_out;
-
-public class TestUseInDecl3 {
-	public void main() {
-		Provider p= null;
-		new java.util.HashMap();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDeclClash.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDeclClash.java
deleted file mode 100644
index e8a1986..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDeclClash.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package import_out;
-
-import java.util.List;
-
-public class TestUseInDeclClash {
-	List fList;
-	public void main() {
-		Provider p= null;
-		import_use.List list= null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInLocalClass.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInLocalClass.java
deleted file mode 100644
index aadceec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInLocalClass.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package import_out;
-
-import java.io.File;
-import java.util.Map;
-
-public class TestUseInLocalClass {
-	public void main() {
-		Provider p= null;
-		class Local extends File implements Comparable {
-			public Local(String s) {
-				super(s);
-			}
-			public void foo(Map map) {
-			}
-			public int compareTo(Object o) {
-				return 0;
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_use/List.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_use/List.java
deleted file mode 100644
index b41be5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_use/List.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package import_use;
-
-public class List {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError1.java
deleted file mode 100644
index ac7bd5a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError1.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalid;
-
-public class TestCompileError1 {
-	public void main() {
-		/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		T t= null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError2.java
deleted file mode 100644
index be0c861..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError2.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalid;
-
-public class TestCompileError2 {
-	public void main() {
-		/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		main()
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError3.java
deleted file mode 100644
index b13e249..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError3.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalid;
-
-public class TestCompileError3 {
-	public void main() {
-		/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		{
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestComplexBody.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestComplexBody.java
deleted file mode 100644
index ddf310b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestComplexBody.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package invalid;
-
-public class TestComplexBody {
-	public void main() {
-		int i= 10 + /*]*/foo()/*[*/;
-	}
-	
-	public int foo() {
-		int i= 20;
-		return i + 2;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedStatement.java
deleted file mode 100644
index 2bb989d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedStatement.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package invalid;
-
-public class TestInterruptedStatement {
-	public void main() {
-		/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		if (true) {
-			System.out.println("Eclipse");
-			return;
-		}	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer1.java
deleted file mode 100644
index 3c0bcae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer1.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalid;
-
-public class TestInvalidFieldInitializer1 {
-	
-	private int field= /*]*/foo()/*[*/;	
-	
-	public int foo() {
-		int a= 0;
-		return 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer2.java
deleted file mode 100644
index 6574596..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer2.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalid;
-
-public class TestInvalidFieldInitializer2 {
-	
-	private int field= /*]*/foo(null)/*[*/;	
-	
-	public Object foo(Object obj) {
-		return obj = new Object();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer3.java
deleted file mode 100644
index 995fc42..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer3.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalid;
-
-public class TestInvalidFieldInitializer3 {
-	
-	private Object field= /*]*/foo()/*[*/;	
-	
-	public Object foo() {
-		return field;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestLocalInitializer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestLocalInitializer.java
deleted file mode 100644
index d5a94ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestLocalInitializer.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package invalid;
-
-public class TestLocalInitializer {
-	
-	public void foo() {
-		int i= /*]*/bar()/*[*/;
-	}
-
-	public int bar() {
-		if (true)
-			return 1;
-		else
-			return 2;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultiLocal.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultiLocal.java
deleted file mode 100644
index f7c88b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultiLocal.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package invalid;
-
-public class TestMultiLocal {
-	
-	public void foo() {
-		int i= /*]*/bar()/*[*/, x;
-	}
-
-	public int bar() {
-		if (true)
-			return 1;
-		else
-			return 2;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestRecursion.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestRecursion.java
deleted file mode 100644
index 015f407..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestRecursion.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalid;
-
-public class TestRecursion {
-	public void main() {
-		/*]*/foo();/*[*/
-	}
-	
-	public void foo() {
-		foo();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestBlocks.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestBlocks.java
deleted file mode 100644
index 211b244..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestBlocks.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package nameconflict_in;
-
-public class TestBlocks {
-	public void main() {
-		if (true) {
-			/*[*/foo();/*]*/
-		}
-		if (true) {
-			int x= 1;
-		}
-	}
-	
-	private void foo() {
-		int x= 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestFieldInType.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestFieldInType.java
deleted file mode 100644
index 73b0844..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestFieldInType.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package nameconflict_in;
-
-public class TestFieldInType {
-	public void main() {
-		/*[*/foo();/*]*/
-		class T {
-			int x;
-		}
-	}
-	
-	public void foo() {
-		int x= 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestLocalInType.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestLocalInType.java
deleted file mode 100644
index b9d9c91..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestLocalInType.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package nameconflict_in;
-
-public class TestLocalInType {
-	public void main() {
-		/*[*/foo();/*]*/
-		class T {
-			void bar() {
-				int x;
-			}
-		}
-	}
-	
-	public void foo() {
-		int x= 10;
-		int bar= 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameLocal.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameLocal.java
deleted file mode 100644
index 7aa8140..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameLocal.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package nameconflict_in;
-
-public class TestSameLocal {
-	public void main() {
-		int i= 10;
-		/*[*/foo();/*]*/
-	}
-	
-	public void foo() {
-		int i= 20;
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameType.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameType.java
deleted file mode 100644
index 7c302a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameType.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package nameconflict_in;
-
-public class TestSameType {
-	public void main() {
-		class T {
-			public T() {}
-		}
-		/*[*/foo();/*]*/
-	}
-	
-	public void foo() {
-		class T {
-			T t;
-			public T() {}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeAfter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeAfter.java
deleted file mode 100644
index 257d4c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeAfter.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package nameconflict_in;
-
-public class TestSameTypeAfter {
-	public void main() {
-		/*[*/foo();/*]*/
-		class T {
-			public T() {}
-		}
-	}
-	
-	public void foo() {
-		class T {
-			T t;
-			public T() {}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeInSibling.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeInSibling.java
deleted file mode 100644
index 2e4e5c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeInSibling.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package nameconflict_in;
-
-public class TestSameTypeInSibling {
-	public void main() {
-		class T {
-			public T() {}
-		}
-		int x= 10;
-		/*[*/foo();/*]*/
-	}
-	
-	public void foo() {
-		class T {
-			T t;
-			public T() {}
-		}
-		class X {
-			T t;
-			void foo() {
-				int x;
-				T t;
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSwitchStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSwitchStatement.java
deleted file mode 100644
index 99d0a5f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSwitchStatement.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package nameconflict_in;
-
-public class TestSwitchStatement {
-	public void main() {
-		int i= 10;
-		switch(i) {
-			case 0:
-				break;
-			case 10:
-				/*[*/foo();/*]*/
-				break;
-		}
-	}
-	
-	public void foo() {
-		int i= 20;
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestTwoCalls.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestTwoCalls.java
deleted file mode 100644
index 85942ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestTwoCalls.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package nameconflict_in;
-
-public class TestTwoCalls {
-	public void main() {
-		int x= 0;
-		/*]*/foo();/*[*/
-		/*]*/foo();/*[*/
-	}
-	
-	private void foo() {
-		int x= 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestBlocks.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestBlocks.java
deleted file mode 100644
index 46c0d4d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestBlocks.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package nameconflict_out;
-
-public class TestBlocks {
-	public void main() {
-		if (true) {
-			int x= 1;
-		}
-		if (true) {
-			int x= 1;
-		}
-	}
-	
-	private void foo() {
-		int x= 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestFieldInType.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestFieldInType.java
deleted file mode 100644
index 488df1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestFieldInType.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package nameconflict_out;
-
-public class TestFieldInType {
-	public void main() {
-		int x= 10;
-		class T {
-			int x;
-		}
-	}
-	
-	public void foo() {
-		int x= 10;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestLocalInType.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestLocalInType.java
deleted file mode 100644
index 70a0c26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestLocalInType.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package nameconflict_out;
-
-public class TestLocalInType {
-	public void main() {
-		int x= 10;
-		int bar= 20;
-		class T {
-			void bar() {
-				int x;
-			}
-		}
-	}
-	
-	public void foo() {
-		int x= 10;
-		int bar= 20;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameLocal.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameLocal.java
deleted file mode 100644
index 3b029ea..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameLocal.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package nameconflict_out;
-
-public class TestSameLocal {
-	public void main() {
-		int i= 10;
-		int i1= 20;
-		i1++;
-	}
-	
-	public void foo() {
-		int i= 20;
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameType.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameType.java
deleted file mode 100644
index 6b7b552..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameType.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package nameconflict_out;
-
-public class TestSameType {
-	public void main() {
-		class T {
-			public T() {}
-		}
-		class T1 {
-			T1 t;
-			public T1() {}
-		}
-	}
-	
-	public void foo() {
-		class T {
-			T t;
-			public T() {}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeAfter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeAfter.java
deleted file mode 100644
index a17c102..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeAfter.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package nameconflict_out;
-
-public class TestSameTypeAfter {
-	public void main() {
-		class T1 {
-			T1 t;
-			public T1() {}
-		}
-		class T {
-			public T() {}
-		}
-	}
-	
-	public void foo() {
-		class T {
-			T t;
-			public T() {}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeInSibling.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeInSibling.java
deleted file mode 100644
index ce2dcb5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeInSibling.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package nameconflict_out;
-
-public class TestSameTypeInSibling {
-	public void main() {
-		class T {
-			public T() {}
-		}
-		int x= 10;
-		class T1 {
-			T1 t;
-			public T1() {}
-		}
-		class X {
-			T1 t;
-			void foo() {
-				int x;
-				T1 t;
-			}
-		}
-	}
-	
-	public void foo() {
-		class T {
-			T t;
-			public T() {}
-		}
-		class X {
-			T t;
-			void foo() {
-				int x;
-				T t;
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSwitchStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSwitchStatement.java
deleted file mode 100644
index 5c9d870..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSwitchStatement.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package nameconflict_out;
-
-public class TestSwitchStatement {
-	public void main() {
-		int i= 10;
-		switch(i) {
-			case 0:
-				break;
-			case 10:
-				int i1= 20;
-				i1++;
-				break;
-		}
-	}
-	
-	public void foo() {
-		int i= 20;
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionOneImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionOneImplicitReceiver.java
deleted file mode 100644
index 0097b0d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionOneImplicitReceiver.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package receiver_in;
-
-public class TestExpressionOneImplicitReceiver {
-	private class ImplicitReceiver {
-		public void foo() {
-			bar();
-		}
-		public void bar() {
-		}
-	}
-
-	public void main() {
-		/*]*/getObject().foo();/*[*/
-	}
-	
-	private ImplicitReceiver getObject() {
-		return new ImplicitReceiver();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionTwoImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionTwoImplicitReceiver.java
deleted file mode 100644
index 82362c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionTwoImplicitReceiver.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package receiver_in;
-
-public class TestExpressionTwoImplicitReceiver {
-	private class ImplicitReceiver {
-		public void foo() {
-			bar();
-			bar();
-		}
-		public void bar() {
-		}
-	}
-
-	public void main() {
-		/*]*/getObject().foo();/*[*/
-	}
-	
-	private ImplicitReceiver getObject() {
-		return new ImplicitReceiver();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionZeroImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionZeroImplicitReceiver.java
deleted file mode 100644
index 92fbe6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionZeroImplicitReceiver.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package receiver_in;
-
-public class TestExpressionZeroImplicitReceiver {
-	private class ImplicitReceiver {
-		public void foo() {
-			System.out.println("Eclipse");
-		}
-	}
-
-	public void main() {
-		/*]*/getObject().foo();/*[*/
-	}
-	
-	private ImplicitReceiver getObject() {
-		return new ImplicitReceiver();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestFieldReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestFieldReceiver.java
deleted file mode 100644
index df51aa6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestFieldReceiver.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package receiver_in;
-
-public class TestFieldReceiver {
-    public Object object;
-    public Object getObject() {
-        return object;
-    }
-}
-class Client2 {
-    void test() {
-    	TestFieldReceiver r= new TestFieldReceiver();
-        Object o= /*[*/r.getObject()/*]*/;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameImplicitReceiver.java
deleted file mode 100644
index 8c9a71e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameImplicitReceiver.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package receiver_in;
-
-public class TestNameImplicitReceiver {
-	private class ImplicitReceiver {
-		public void foo() {
-			bar();
-		}
-		public void bar() {
-		}
-	}
-	
-	public void main() {
-		ImplicitReceiver a= new ImplicitReceiver();
-		
-		/*]*/a.foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameThisReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameThisReceiver.java
deleted file mode 100644
index c84f1c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameThisReceiver.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package receiver_in;
-
-public class TestNameThisReceiver {
-	class ThisReceiver {
-		public void foo() {
-			this.bar();
-		}
-		public void bar() {
-		}
-	}
-
-	public void main() {
-		ThisReceiver a= new ThisReceiver();
-		
-		/*]*/a.foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNoImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNoImplicitReceiver.java
deleted file mode 100644
index ee31fa1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNoImplicitReceiver.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package receiver_in;
-
-public class TestNoImplicitReceiver {
-	class NoImplicitReceiver {
-		public void foo() {
-			System.out.println("Eclipse");
-		}
-	}
-
-	public void main() {
-		NoImplicitReceiver a= new NoImplicitReceiver();
-		
-		/*]*/a.foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestReceiverWithStatic.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestReceiverWithStatic.java
deleted file mode 100644
index 9630755..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestReceiverWithStatic.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package receiver_in;
-
-public class TestReceiverWithStatic {
-	private static class ThisReceiver {
-		public void foo() {
-			bar();
-			baz();
-		}
-		public void bar() {
-		}
-		public static void baz() {
-		}
-	}
-
-	public void main() {
-		ThisReceiver a= new ThisReceiver();
-		
-		/*]*/a.foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestStaticReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestStaticReceiver.java
deleted file mode 100644
index 6726f53..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestStaticReceiver.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package receiver_in;
-
-public class TestStaticReceiver {
-	private static class StaticReceiver {
-		public static void foo() {
-			bar();
-		}
-		public static void bar() {
-		}
-	}
-
-	public void main() {
-		/*]*/StaticReceiver.foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisExpression.java
deleted file mode 100644
index f2f9135..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisExpression.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package receiver_in;
-
-public class TestThisExpression {
-	void m(C c){
-		c.m(this);
-		class X {
-			void foo() {
-				foo();
-			}
-		}
-	}
-}
-
-class C {
-	void m(TestThisExpression t){
-	}
-}
-
-class Client{
-	void f(){
-		TestThisExpression t= null;
-		C c= null;
-		/*]*/t.m(c);/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionOneImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionOneImplicitReceiver.java
deleted file mode 100644
index 283dd1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionOneImplicitReceiver.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package receiver_out;
-
-public class TestExpressionOneImplicitReceiver {
-	private class ImplicitReceiver {
-		public void foo() {
-			bar();
-		}
-		public void bar() {
-		}
-	}
-
-	public void main() {
-		getObject().bar();
-	}
-	
-	private ImplicitReceiver getObject() {
-		return new ImplicitReceiver();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionTwoImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionTwoImplicitReceiver.java
deleted file mode 100644
index 0097c4a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionTwoImplicitReceiver.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package receiver_out;
-
-public class TestExpressionTwoImplicitReceiver {
-	private class ImplicitReceiver {
-		public void foo() {
-			bar();
-			bar();
-		}
-		public void bar() {
-		}
-	}
-
-	public void main() {
-		ImplicitReceiver r = getObject();
-		r.bar();
-		r.bar();
-	}
-	
-	private ImplicitReceiver getObject() {
-		return new ImplicitReceiver();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionZeroImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionZeroImplicitReceiver.java
deleted file mode 100644
index 5bcd749..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionZeroImplicitReceiver.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package receiver_out;
-
-public class TestExpressionZeroImplicitReceiver {
-	private class ImplicitReceiver {
-		public void foo() {
-			System.out.println("Eclipse");
-		}
-	}
-
-	public void main() {
-		ImplicitReceiver r = getObject();
-		System.out.println("Eclipse");
-	}
-	
-	private ImplicitReceiver getObject() {
-		return new ImplicitReceiver();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestFieldReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestFieldReceiver.java
deleted file mode 100644
index c42e4d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestFieldReceiver.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package receiver_out;
-
-public class TestFieldReceiver {
-    public Object object;
-    public Object getObject() {
-        return object;
-    }
-}
-class Client2 {
-    void test() {
-    	TestFieldReceiver r= new TestFieldReceiver();
-        Object o= r.object;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameImplicitReceiver.java
deleted file mode 100644
index 8b733bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameImplicitReceiver.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package receiver_out;
-
-public class TestNameImplicitReceiver {
-	private class ImplicitReceiver {
-		public void foo() {
-			bar();
-		}
-		public void bar() {
-		}
-	}
-	
-	public void main() {
-		ImplicitReceiver a= new ImplicitReceiver();
-		
-		a.bar();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameThisReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameThisReceiver.java
deleted file mode 100644
index 443c12f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameThisReceiver.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package receiver_out;
-
-public class TestNameThisReceiver {
-	class ThisReceiver {
-		public void foo() {
-			this.bar();
-		}
-		public void bar() {
-		}
-	}
-
-	public void main() {
-		ThisReceiver a= new ThisReceiver();
-		
-		a.bar();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNoImplicitReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNoImplicitReceiver.java
deleted file mode 100644
index c364fac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNoImplicitReceiver.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package receiver_out;
-
-public class TestNoImplicitReceiver {
-	class NoImplicitReceiver {
-		public void foo() {
-			System.out.println("Eclipse");
-		}
-	}
-
-	public void main() {
-		NoImplicitReceiver a= new NoImplicitReceiver();
-		
-		System.out.println("Eclipse");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestReceiverWithStatic.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestReceiverWithStatic.java
deleted file mode 100644
index c01012e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestReceiverWithStatic.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package receiver_out;
-
-public class TestReceiverWithStatic {
-	private static class ThisReceiver {
-		public void foo() {
-			bar();
-			baz();
-		}
-		public void bar() {
-		}
-		public static void baz() {
-		}
-	}
-
-	public void main() {
-		ThisReceiver a= new ThisReceiver();
-		
-		a.bar();
-		ThisReceiver.baz();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestStaticReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestStaticReceiver.java
deleted file mode 100644
index a4cb0a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestStaticReceiver.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package receiver_out;
-
-public class TestStaticReceiver {
-	private static class StaticReceiver {
-		public static void foo() {
-			bar();
-		}
-		public static void bar() {
-		}
-	}
-
-	public void main() {
-		StaticReceiver.bar();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisExpression.java
deleted file mode 100644
index 2010422..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisExpression.java
+++ /dev/null

@@ -1,30 +0,0 @@
-package receiver_out;
-
-public class TestThisExpression {
-	void m(C c){
-		c.m(this);
-		class X {
-			void foo() {
-				foo();
-			}
-		}
-	}
-}
-
-class C {
-	void m(TestThisExpression t){
-	}
-}
-
-class Client{
-	void f(){
-		TestThisExpression t= null;
-		C c= null;
-		c.m(t);
-		class X {
-			void foo() {
-				foo();
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic1.java
deleted file mode 100644
index 4800d6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic1.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package simple_in;
-
-public class TestBasic1 {
-	public void main() {
-		/*[*/bar();/*]*/
-	}
-	
-	public void bar() {
-		baz();
-	}
-	public void baz() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic2.java
deleted file mode 100644
index 50f6707..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic2.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package simple_in;
-
-public class TestBasic2 {
-	public void main() {
-		/*[*/bar();/*]*/
-	}
-	
-	public void bar() {
-		for (int i= 0; i < 10; i++) {
-			baz();
-		}
-		baz();
-	}
-	public void baz() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor1.java
deleted file mode 100644
index 1601996..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor1.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package simple_in;
-
-public class TestConstructor1 {
-	
-	private Object object;
-
-	public TestConstructor1(Object o) {
-		object= o;
-	}
-
-	public TestConstructor1(Object o, int i) {
-		/*]*/this(o)/*[*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestEmptyBody.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestEmptyBody.java
deleted file mode 100644
index 99f126e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestEmptyBody.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package simple_in;
-
-public class TestEmptyBody {
-	public void main() {
-		/*[*/foo();/*]*/
-	}
-	
-	public void foo() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer1.java
deleted file mode 100644
index a605650..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package simple_in;
-
-public class TestFieldInitializer1 {
-	
-	private int field= /*]*/foo()/*[*/;	
-	
-	public int foo() {
-		return 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer2.java
deleted file mode 100644
index 261ca49..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer2.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package simple_in;
-
-public class TestFieldInitializer2 {
-	
-	public void foo() {
-		class Woo {
-			private int field= /*]*/goo()/*[*/;
-			
-			public int goo() {
-				return 1;
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestInitializer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestInitializer.java
deleted file mode 100644
index 6c5036e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestInitializer.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package simple_in;
-
-public class TestInitializer {
-	static {
-		/*[*/foo();/*]*/
-	}
-	
-	public static void foo() {
-		System.out.println("Eclipse");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestLabeledStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestLabeledStatement.java
deleted file mode 100644
index d552b88..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestLabeledStatement.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package simple_in;
-
-public class TestLabeledStatement {
-
-	public static void main() {
-		/*[*/foo();/*]*/
-	}
-
-	public static void foo() {
-		the_label:
-		while(true) {
-			break the_label;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestPrimitiveArray.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestPrimitiveArray.java
deleted file mode 100644
index bf80b77..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestPrimitiveArray.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package simple_in;
-
-public class TestPrimitiveArray {
-	public void main() {
-		/*[*/foo(null);/*]*/
-	}
-	
-	public void foo(int[][] x) {
-		x= new int[10][];
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSuper.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSuper.java
deleted file mode 100644
index ba2aa5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSuper.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package simple_in;
-
-public class TestSuper {
-  private static class A {
-    void foo() {
-    	bar();    
-    }
-    void bar() {
-    }
-  }
-  private static class B extends A {
-    void foo() {
-      /*[*/super.foo();/*]*/
-    }
-  }
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTypeArray.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTypeArray.java
deleted file mode 100644
index afcae81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTypeArray.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package simple_in;
-
-public class TestTypeArray {
-	public void main() {
-		/*[*/foo(null);/*]*/
-	}
-	
-	public void foo(TestTypeArray[][] x) {
-		x= new TestTypeArray[10][];
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic1.java
deleted file mode 100644
index d0f0704..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic1.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package simple_out;
-
-public class TestBasic1 {
-	public void main() {
-		baz();
-	}
-	
-	public void bar() {
-		baz();
-	}
-	public void baz() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic2.java
deleted file mode 100644
index cc0e7cc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic2.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package simple_out;
-
-public class TestBasic2 {
-	public void main() {
-		for (int i= 0; i < 10; i++) {
-			baz();
-		}
-		baz();
-	}
-	
-	public void bar() {
-		for (int i= 0; i < 10; i++) {
-			baz();
-		}
-		baz();
-	}
-	public void baz() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor1.java
deleted file mode 100644
index dda9f7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor1.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package simple_out;
-
-public class TestConstructor1 {
-	
-	private Object object;
-
-	public TestConstructor1(Object o) {
-		object= o;
-	}
-
-	public TestConstructor1(Object o, int i) {
-		object= o;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestEmptyBody.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestEmptyBody.java
deleted file mode 100644
index 3347ca6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestEmptyBody.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package simple_out;
-
-public class TestEmptyBody {
-	public void main() {
-	}
-	
-	public void foo() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer1.java
deleted file mode 100644
index 34b1297..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package simple_out;
-
-public class TestFieldInitializer1 {
-	
-	private int field= 1;	
-	
-	public int foo() {
-		return 1;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer2.java
deleted file mode 100644
index 77405c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer2.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package simple_out;
-
-public class TestFieldInitializer2 {
-	
-	public void foo() {
-		class Woo {
-			private int field= 1;
-			
-			public int goo() {
-				return 1;
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestInitializer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestInitializer.java
deleted file mode 100644
index 28ac06c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestInitializer.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package simple_out;
-
-public class TestInitializer {
-	static {
-		System.out.println("Eclipse");
-	}
-	
-	public static void foo() {
-		System.out.println("Eclipse");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestLabeledStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestLabeledStatement.java
deleted file mode 100644
index 6c2c07e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestLabeledStatement.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package simple_out;
-
-public class TestLabeledStatement {
-
-	public static void main() {
-		the_label:
-		while(true) {
-			break the_label;
-		}
-	}
-
-	public static void foo() {
-		the_label:
-		while(true) {
-			break the_label;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestPrimitiveArray.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestPrimitiveArray.java
deleted file mode 100644
index c552365..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestPrimitiveArray.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package simple_out;
-
-public class TestPrimitiveArray {
-	public void main() {
-		int[][] x = null;
-		x= new int[10][];
-	}
-	
-	public void foo(int[][] x) {
-		x= new int[10][];
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSuper.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSuper.java
deleted file mode 100644
index 9825315..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSuper.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package simple_out;
-
-public class TestSuper {
-  private static class A {
-    void foo() {
-    	bar();    
-    }
-    void bar() {
-    }
-  }
-  private static class B extends A {
-    void foo() {
-      bar();
-    }
-  }
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTypeArray.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTypeArray.java
deleted file mode 100644
index a3d238b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTypeArray.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package simple_out;
-
-public class TestTypeArray {
-	public void main() {
-		TestTypeArray[][] x = null;
-		x= new TestTypeArray[10][];
-	}
-	
-	public void foo(TestTypeArray[][] x) {
-		x= new TestTypeArray[10][];
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_in.java
deleted file mode 100644
index 0519ecb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_in.java
+++ /dev/null

@@ -1 +0,0 @@
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_out.java
deleted file mode 100644
index 0519ecb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_out.java
+++ /dev/null

@@ -1 +0,0 @@
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_in.java
deleted file mode 100644
index b49e010..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int i){
-		int x= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_out.java
deleted file mode 100644
index 4a98455..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	void m(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_in.java
deleted file mode 100644
index 016340b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	public void testRLV() {
-			boolean test= true;
-			boolean t= (test);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_out.java
deleted file mode 100644
index d13c7f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	public void testRLV() {
-			boolean t= (true);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_in.java
deleted file mode 100644
index 3ee356c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	boolean d;
-	public void test() {
-			boolean test= d;
-			boolean t= (test);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_out.java
deleted file mode 100644
index 72e9efb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	boolean d;
-	public void test() {
-			boolean t= (d);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_in.java
deleted file mode 100644
index e16e429..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	boolean d;
-	public void test() {
-			A test= this;
-			A s1= test;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_out.java
deleted file mode 100644
index a9e0f11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	boolean d;
-	public void test() {
-			A s1= this;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_in.java
deleted file mode 100644
index 455b2f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	public void test() {
-			int i= 0;
-			int j= i=2;
-			int k= j + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_out.java
deleted file mode 100644
index 054416b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	public void test() {
-			int i= 0;
-			int k= (i=2) + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_in.java
deleted file mode 100644
index b390bb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int i(){
-		int i= 0, j= 1;
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_out.java
deleted file mode 100644
index ef2438b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int i(){
-		int j= 1;
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_in.java
deleted file mode 100644
index b390bb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int i(){
-		int i= 0, j= 1;
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_out.java
deleted file mode 100644
index 1e78cd4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int i(){
-		int i= 0;
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_in.java
deleted file mode 100644
index 1e48a39..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class Test {
-	void m(){
-		Object object = new Integer(2);
-		Integer integer = (Integer) object;
-		int i = integer.intValue();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_out.java
deleted file mode 100644
index 21e3afb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class Test {
-	void m(){
-		Object object = new Integer(2);
-		int i = ((Integer) object).intValue();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_in.java
deleted file mode 100644
index fd1a767..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test {
-  
-  public static final Test FOO = new Test() {
-    public void foo() {
-      int var = 1;
-      int var2 = var;
-    }
-  };
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_out.java
deleted file mode 100644
index fa0b55d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class Test {
-  
-  public static final Test FOO = new Test() {
-    public void foo() {
-      int var2 = 1;
-    }
-  };
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_in.java
deleted file mode 100644
index dd9cf55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class Test {
-    public void foo() {
-      int var = 1;
-      int var2 = var;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_out.java
deleted file mode 100644
index d29449a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class Test {
-    public void foo() {
-      int var2 = 1;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_in.java
deleted file mode 100644
index dd9cf55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class Test {
-    public void foo() {
-      int var = 1;
-      int var2 = var;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_out.java
deleted file mode 100644
index d29449a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class Test {
-    public void foo() {
-      int var2 = 1;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_in.java
deleted file mode 100644
index db82b66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int x= 0;
-		return x;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_out.java
deleted file mode 100644
index c52dbda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_in.java
deleted file mode 100644
index 7caf0a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	void f(boolean init){
-		boolean d= init;
-		if (! d);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_out.java
deleted file mode 100644
index 4ea16eb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void f(boolean init){
-		if (! init);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_in.java
deleted file mode 100644
index 9e61a99..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	private static void foo(String[] parameters, int j) {
-		int temp1 = parameters.length + j;
-		int temp = temp1;
-		System.out.println(temp);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_out.java
deleted file mode 100644
index 6ac096b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	private static void foo(String[] parameters, int j) {
-		int temp = parameters.length + j;
-		System.out.println(temp);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_in.java
deleted file mode 100644
index dac7ca5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	private static void foo(int i, int j) {
-		int temp = 1+2;
-		System.out.println(temp);
-		foo(temp*7, temp);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_out.java
deleted file mode 100644
index 6fec890..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	private static void foo(int i, int j) {
-		System.out.println(1+2);
-		foo((1+2)*7, 1+2);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_in.java
deleted file mode 100644
index 9401d5f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		String xxxx= "xx";
-		String y= ( xxxx );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_out.java
deleted file mode 100644
index 20e8527..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		String y= ( "xx" );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_in.java
deleted file mode 100644
index 684d939..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	void foo() {
-		final int value= 42;
-		// some valuable important comment which will be erased
-		System.out.println(value);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_out.java
deleted file mode 100644
index 4daf585..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	void foo() {
-		// some valuable important comment which will be erased
-		System.out.println(42);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_in.java
deleted file mode 100644
index 6c3cfc5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	void foo() {
-		final int value= 42;//temp comment
-		// some valuable important comment which will be erased
-		System.out.println(value);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_out.java
deleted file mode 100644
index 4daf585..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A {
-	void foo() {
-		// some valuable important comment which will be erased
-		System.out.println(42);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_in.java
deleted file mode 100644
index db82b66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int x= 0;
-		return x;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_out.java
deleted file mode 100644
index c52dbda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_in.java
deleted file mode 100644
index 275e73e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int x= 0 + 1;
-		return x * x;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_out.java
deleted file mode 100644
index 42c7eea..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		return (0 + 1) * (0 + 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_in.java
deleted file mode 100644
index bd6778b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		int x= i + 1;
-		return x * x + m(m(i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_out.java
deleted file mode 100644
index 8c50ce3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	int m(int i){
-		return (i + 1) * (i + 1) + m(m(i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_in.java
deleted file mode 100644
index 620cb66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class A{

-	int m(int i){

-		int x= i + 1;

-		return x * x + m(m(x));

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_out.java
deleted file mode 100644
index 1bd438c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	int m(int i){

-		return (i + 1) * (i + 1) + m(m(i + 1));

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_in.java
deleted file mode 100644
index 99478d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	int i(){
-		for (;false;){
-			//
-		}
-		//d
-		i();
-		int i= 0;
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_out.java
deleted file mode 100644
index cd8a848..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	int i(){
-		for (;false;){
-			//
-		}
-		//d
-		i();
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_in.java
deleted file mode 100644
index 99478d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	int i(){
-		for (;false;){
-			//
-		}
-		//d
-		i();
-		int i= 0;
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_out.java
deleted file mode 100644
index cd8a848..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	int i(){
-		for (;false;){
-			//
-		}
-		//d
-		i();
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_in.java
deleted file mode 100644
index 2fa8abc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int i(){
-		int[] a= new int[6];
-		int i= a[9];
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_out.java
deleted file mode 100644
index 5766e80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int i(){
-		int[] a= new int[6];
-		return a[9];
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_in.java
deleted file mode 100644
index 2fa8abc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int i(){
-		int[] a= new int[6];
-		int i= a[9];
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_out.java
deleted file mode 100644
index 5766e80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int i(){
-		int[] a= new int[6];
-		return a[9];
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail0.java
deleted file mode 100644
index 24454b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail0.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//compile errors
-package p;
-class A{
-	void m(){
-		/*[*/final int i= 0;/*]*/
-		List l;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail1.java
deleted file mode 100644
index 3d19010..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail1.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//syntax errors
-errorCulprit
-package p;
-class A{
-	void m(){
-		/*[*/final int i= 0;/*]*/
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail10.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail10.java
deleted file mode 100644
index be2d519..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail10.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int temp= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail11.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail11.java
deleted file mode 100644
index ff45266..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail11.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-class F {
-	public void foo() { 
-		File file= null; 
-		 
-		try { 
-			file.toURL(); 
-		} catch (MalformedURLException e) { 
-		} 
-	} 
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail12.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail12.java
deleted file mode 100644
index 946e712..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail12.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//compile errors
-package p;
-class A{
-	int f;
-	protected void primExecute(int t) {
-		this.toString();
-	}
-
-	if (image != null) {
-		Object loc = null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail13.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail13.java
deleted file mode 100644
index e1b7340..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail13.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void f() {
-		for (int i= 0; i < 4;);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail14.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail14.java
deleted file mode 100644
index 2735618..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail14.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
- void f(A a){
-   A[] arr= {a};
-   arr[0]= null;
- }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail2.java
deleted file mode 100644
index 02e5c19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail2.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//incorrect selection
-package p;
-class A{
-	int m(){
-		/*[*/int i;
-		if (true)
-			i= 0;	/*]*/
-		return 9;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail3.java
deleted file mode 100644
index d151bdf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail3.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//not initialized
-package p;
-class A{
-	int m(){
-		/*[*/int i;/*]*/
-		if (true)
-			i= 0;
-		return 9;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail4.java
deleted file mode 100644
index 5b456cc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail4.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//assigned to more than once
-package p;
-class A{
-	int m(){
-		/*[*/int i= 0;/*]*/
-		if (true)
-			i= 0;
-		return 9;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail5.java
deleted file mode 100644
index bd6b682..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail5.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//assigned to more than once
-package p;
-class A{
-	int m(){
-		/*[*/int i= 0;/*]*/
-		return i++;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail6.java
deleted file mode 100644
index 4e71012..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail6.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//assigned to more than once
-package p;
-class A{
-	int m(int y){
-		/*[*/int i= 0;/*]*/
-		return y + (i--);
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail7.java
deleted file mode 100644
index 2c55d50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail7.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	void m(/*[*/int i/*]*/){
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail8.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail8.java
deleted file mode 100644
index d6e2d82..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail8.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	void m(){
-		try{
-		} catch (/*[*/Exception e/*]*/){
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail9.java b/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail9.java
deleted file mode 100644
index be2d519..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail9.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int temp= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/TestClass.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/TestClass.java
deleted file mode 100644
index 05138b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/TestClass.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-public class TestClass {
-	public TestClass() {
-	}
-	
-	public TestClass(int i) {
-	}
-	
-	public static void main(String[] args) {
-		TestClass t= /*[*/new TestClass()/*]*/;
-		TestClass t1= new TestClass(10);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/TestClass_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/TestClass_out.java
deleted file mode 100644
index acab6a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/TestClass_out.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-public class TestClass {
-	private TestClass() {
-	}
-	
-	public TestClass(int i) {
-	}
-	
-	public static void main(String[] args) {
-		TestClass t= createTestClass();
-		TestClass t1= new TestClass(10);
-	}
-
-	public static TestClass createTestClass() {
-		return new TestClass();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/UseTestClass.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/UseTestClass.java
deleted file mode 100644
index 6dbb0e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/UseTestClass.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class UseTestClass {
-	void foo() {
-		TestClass tt= new TestClass();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/UseTestClass_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/UseTestClass_out.java
deleted file mode 100644
index f202330..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/45942/UseTestClass_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class UseTestClass {
-	void foo() {
-		TestClass tt= TestClass.createTestClass();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189/TestClass.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189/TestClass.java
deleted file mode 100644
index e61192f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189/TestClass.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-public class TestClass {
-	public TestClass() {
-	}
-}
-
-class UseTestClass {
-	public void foo() {
-		/*[*/new TestClass()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189/TestClass_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189/TestClass_out.java
deleted file mode 100644
index 44bc373..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189/TestClass_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-public class TestClass {
-	public static TestClass createTestClass() {
-		return new TestClass();
-	}
-
-	private TestClass() {
-	}
-}
-
-class UseTestClass {
-	public void foo() {
-		/*[*/TestClass.createTestClass();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189B/TestClass.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189B/TestClass.java
deleted file mode 100644
index 15866ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189B/TestClass.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-public class TestClass {
-	public TestClass() {
-	}
-}
-
-public class UseTestClass {
-	public void foo() {
-		/*[*/new TestClass()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189B/TestClass_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189B/TestClass_out.java
deleted file mode 100644
index 4bb09fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46189B/TestClass_out.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-public class TestClass {
-	public TestClass createTestClass() {
-		return new TestClass();
-	}
-	private TestClass() {
-	}
-}
-
-public class UseTestClass {
-	public void foo() {
-		createTestClass();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46373/ImplicitCtor.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46373/ImplicitCtor.java
deleted file mode 100644
index ec8eee0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46373/ImplicitCtor.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class ImplicitCtor {
-	public void foo() {
-		new ImplicitCtor();
-	}
-	public void bar() {
-		new /*[*/ImplicitCtor/*]*/();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46373/ImplicitCtor_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46373/ImplicitCtor_out.java
deleted file mode 100644
index 8454d8a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46373/ImplicitCtor_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-public class ImplicitCtor {
-	public static ImplicitCtor createImplicitCtor() {
-		return new ImplicitCtor();
-	}
-	public void foo() {
-		createImplicitCtor();
-	}
-	public void bar() {
-		createImplicitCtor();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46374/QualifiedName.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46374/QualifiedName.java
deleted file mode 100644
index bab779b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46374/QualifiedName.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class QualifiedName {
-	void foo() {
-		new p./*[*/QualifiedName/*]*/();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46374/QualifiedName_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46374/QualifiedName_out.java
deleted file mode 100644
index 9262e07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46374/QualifiedName_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-public class QualifiedName {
-	public static QualifiedName createQualifiedName() {
-		return new QualifiedName();
-	}
-
-	void foo() {
-		createQualifiedName();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p1/TT.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p1/TT.java
deleted file mode 100644
index 71d771a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p1/TT.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p1;
-
-public class TT {
-	public void bletch() {
-		new /*[*/TT/*]*/();
-	}
-	public void bar() {
-		new TT();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p1/TT_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p1/TT_out.java
deleted file mode 100644
index bdef0d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p1/TT_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p1;
-
-public class TT {
-	public static TT createTT() {
-		return new TT();
-	}
-	public void bletch() {
-		createTT();
-	}
-	public void bar() {
-		createTT();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p2/TT.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p2/TT.java
deleted file mode 100644
index ebcdeb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p2/TT.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;
-
-public class TT {
-	public void bletch() {
-		new TT();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p2/TT_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p2/TT_out.java
deleted file mode 100644
index ebcdeb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/46608/p2/TT_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;
-
-public class TT {
-	public void bletch() {
-		new TT();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/A.java
deleted file mode 100644
index c91f756..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/A.java
+++ /dev/null

@@ -1,36 +0,0 @@
-package p;
-
-public class A {
-    {
-        field= 10;
-    }
-    
-    public /*[*/A/*]*/() {
-        
-    }
-    
-    private int field;
-    
-    static class XX extends A {
-        public void foo() {
-            bar();
-        }
-        public void bar() {
-        }
-    }
-    public void foo(int y) {
-        Runnable runnable= new Runnable() {
-            private int field;
-            public void run() {
-                {
-                    A a= null;
-                }
-            }
-        };
-    }
-    
-    public String foo(String ss) {
-        A a= new A();
-        return ss;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/A_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/A_out.java
deleted file mode 100644
index 7413704..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/A_out.java
+++ /dev/null

@@ -1,36 +0,0 @@
-package p;
-
-public class A {
-    {
-        field= 10;
-    }
-    
-    protected /*[*/A/*]*/() {
-        
-    }
-    
-    private int field;
-    
-    static class XX extends A {
-        public void foo() {
-            bar();
-        }
-        public void bar() {
-        }
-    }
-    public void foo(int y) {
-        Runnable runnable= new Runnable() {
-            private int field;
-            public void run() {
-                {
-                    A a= null;
-                }
-            }
-        };
-    }
-    
-    public String foo(String ss) {
-        A a= B.createA();
-        return ss;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/B.java
deleted file mode 100644
index 7e441be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/B.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package p;
-
-public class B {
-	private static interface I {
-		public void foo();
-	}
-	private static class CC implements I {
-
-		public void foo() {
-		}
-	}
-	
-	public void foo() {
-		I i= new I() {
-			public void foo() {
-			}
-			public void bar() {
-				foo();
-			}
-		};
-		
-		CC c= new CC() {};
-		B b;
-	}
-	
-	public void bar() {
-		class X {
-			public void baz() {
-				
-			}
-		}
-		
-		class Y extends X {
-			public void baz() {
-				
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/B_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/B_out.java
deleted file mode 100644
index 96ce327..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/48504/p1/B_out.java
+++ /dev/null

@@ -1,43 +0,0 @@
-package p;
-
-public class B {
-	private static interface I {
-		public void foo();
-	}
-	private static class CC implements I {
-
-		public void foo() {
-		}
-	}
-	
-	public static A createA() {
-		return new A();
-	}
-
-	public void foo() {
-		I i= new I() {
-			public void foo() {
-			}
-			public void bar() {
-				foo();
-			}
-		};
-		
-		CC c= new CC() {};
-		B b;
-	}
-	
-	public void bar() {
-		class X {
-			public void baz() {
-				
-			}
-		}
-		
-		class Y extends X {
-			public void baz() {
-				
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/58293/ImplicitSuperCtorCall.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/58293/ImplicitSuperCtorCall.java
deleted file mode 100644
index eb06b7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/58293/ImplicitSuperCtorCall.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-public class ImplicitSuperCtorCall {
-	public /*[*/ImplicitSuperCtorCall/*]*/() {
-	}
-	public static void main(String[] args) {
-		System.out.println("Hello world");
-		ImplicitSuperCtorCall iscc= new ImplicitSuperCtorCall();
-	}
-}
-
-class B extends ImplicitSuperCtorCall {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/58293/ImplicitSuperCtorCall_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/58293/ImplicitSuperCtorCall_out.java
deleted file mode 100644
index a5d5365..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/58293/ImplicitSuperCtorCall_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-public class ImplicitSuperCtorCall {
-	protected /*[*/ImplicitSuperCtorCall/*]*/() {
-	}
-	public static void main(String[] args) {
-		System.out.println("Hello world");
-		ImplicitSuperCtorCall iscc= createImplicitSuperCtorCall();
-	}
-	public static ImplicitSuperCtorCall createImplicitSuperCtorCall() {
-		return new ImplicitSuperCtorCall();
-	}
-}
-
-class B extends ImplicitSuperCtorCall {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59280/ExplicitSuperCtorCall.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59280/ExplicitSuperCtorCall.java
deleted file mode 100644
index f0e6232..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59280/ExplicitSuperCtorCall.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-public class ExplicitSuperCtorCall {
-	public /*[*/ExplicitSuperCtorCall/*]*/() {
-	}
-}
-
-class B extends ExplicitSuperCtorCall {
-	public B() {
-		super();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59280/ExplicitSuperCtorCall_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59280/ExplicitSuperCtorCall_out.java
deleted file mode 100644
index ebcedd2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59280/ExplicitSuperCtorCall_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-public class ExplicitSuperCtorCall {
-	public static ExplicitSuperCtorCall createExplicitSuperCtorCall() {
-		return new ExplicitSuperCtorCall();
-	}
-
-	protected /*[*/ExplicitSuperCtorCall/*]*/() {
-	}
-}
-
-class B extends ExplicitSuperCtorCall {
-	public B() {
-		super();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj1/pA/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj1/pA/A.java
deleted file mode 100644
index 8311f0a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj1/pA/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package pA;
-
-public class A {
-	public /*[*/A/*]*/() {
-	}
-	public static void main(String[] args) {
-		A a= new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj1/pA/A_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj1/pA/A_out.java
deleted file mode 100644
index 3e99fe6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj1/pA/A_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package pA;
-
-public class A {
-	private /*[*/A/*]*/() {
-	}
-	public static void main(String[] args) {
-		A a= createA();
-	}
-	public static A createA() {
-		return new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj2/pB/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj2/pB/B.java
deleted file mode 100644
index d395e2f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj2/pB/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package pB;
-
-import pA.A;
-
-public class B {
-	public static void main(String[] args) {
-		A a= new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj2/pB/B_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj2/pB/B_out.java
deleted file mode 100644
index 58369a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59283/proj2/pB/B_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package pB;
-
-import pA.A;
-
-public class B {
-	public static void main(String[] args) {
-		A a= A.createA();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59284/ArgTypeImport.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59284/ArgTypeImport.java
deleted file mode 100644
index 911648b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59284/ArgTypeImport.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-import java.util.Vector;
-
-public class ArgTypeImport {
-	public /*[*/ArgTypeImport/*]*/(Vector v) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59284/ArgTypeImport_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59284/ArgTypeImport_out.java
deleted file mode 100644
index 74f6cbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/Bugzilla/59284/ArgTypeImport_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-import java.util.Vector;
-
-public class ArgTypeImport {
-	public static ArgTypeImport createArgTypeImport(Vector v) {
-		return new ArgTypeImport(v);
-	}
-
-	private /*[*/ArgTypeImport/*]*/(Vector v) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/negative/A_testFail0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/negative/A_testFail0_in.java
deleted file mode 100644
index ac1a824..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/negative/A_testFail0_in.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-public class A_testFail0_in {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/negative/NestedClass_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/negative/NestedClass_in.java
deleted file mode 100644
index 5487ead..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/negative/NestedClass_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-public class NestedClass_in {
-	public class InnerClass {
-		public InnerClass() { }
-	}
-
-	public void foo() {
-		InnerClass	ic= /*[*/new InnerClass()/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/CtorThrows.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/CtorThrows.java
deleted file mode 100644
index 90dafd2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/CtorThrows.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-public class CtorThrows_in {
-	private int	fValue;
-
-	private CtorThrows_in(int x) throws IllegalArgumentException {
-		if (x < 0) throw IllegalArgumentException("Bad value: " + x);
-		fValue= x;
-	}
-
-	public static void main(String[] args) {
-		CtorThrows_in cti= createCtorThrows_in(3);
-	}
-
-	public static CtorThrows_in createCtorThrows_in(int x) throws IllegalArgumentException {
-		return new CtorThrows_in(x);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/CtorThrows_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/CtorThrows_in.java
deleted file mode 100644
index e0bf96d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/CtorThrows_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-public class CtorThrows_in {
-	private int	fValue;
-
-	public CtorThrows_in(int x) throws IllegalArgumentException {
-		if (x < 0) throw IllegalArgumentException("Bad value: " + x);
-		fValue= x;
-	}
-
-	public static void main(String[] args) {
-		CtorThrows_in cti= /*[*/new CtorThrows_in(3)/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs.java
deleted file mode 100644
index d8dc48f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs.java
+++ /dev/null

@@ -1,32 +0,0 @@
-package p;
-
-import java.lang.StringBuffer;
-
-public class DifferentArgs_in {
-	public void foo(String[] args)
-	{
-		StringBuffer	buf = createStringBuffer(16);
-
-		buf.append("Args:");
-		for(int i=0; i < args.length; i++)
-			buf.append(" '")
-			   .append(args[i])
-			   .append("'");
-		System.out.println(buf.toString());
-	}
-	public void bar(String[] args)
-	{
-		StringBuffer	buf = createStringBuffer(24);
-
-		buf.append("Args:");
-		for(int i=0; i < args.length; i++)
-			buf.append(" '")
-			   .append(args[i])
-			   .append("'");
-		System.out.println(buf.toString());
-	}
-
-	public static StringBuffer createStringBuffer(int arg0) {
-		return new StringBuffer(arg0);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs1.java
deleted file mode 100644
index 51d8fd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs1.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package p;
-
-public class DifferentArgs1_in {
-	private int fN;
-	public static DifferentArgs1_in createDifferentArgs1_in(int N) {
-		return new DifferentArgs1_in(N);
-	}
-	public DifferentArgs1_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		DifferentArgs1_in	da= createDifferentArgs1_in(16);
-
-		System.out.println("Value = " + da.get());
-	}
-	public void bar(String[] args) {
-		DifferentArgs1_in	da= createDifferentArgs1_in(24);
-
-		System.out.println("Value = " + da.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs1_in.java
deleted file mode 100644
index fcc15e3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs1_in.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class DifferentArgs1_in {
-	private int fN;
-	public DifferentArgs1_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		DifferentArgs1_in	da= /*[*/new DifferentArgs1_in(16)/*]*/;
-
-		System.out.println("Value = " + da.get());
-	}
-	public void bar(String[] args) {
-		DifferentArgs1_in	da= new DifferentArgs1_in(24);
-
-		System.out.println("Value = " + da.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs2.java
deleted file mode 100644
index 273848a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs2.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-
-public class DifferentArgs2_in {
-	private int fN;
-	public static DifferentArgs2_in createDifferentArgs2_in(int N) {
-		return new DifferentArgs2_in(N);
-	}
-	public DifferentArgs2_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		DifferentArgs2_in	da= createDifferentArgs2_in(16);
-
-		System.out.println("Value = " + da.get());
-	}
-	public void bar(String[] args) {
-		int					size= 24;
-		DifferentArgs2_in	da= createDifferentArgs2_in(size);
-
-		System.out.println("Value = " + da.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs2_in.java
deleted file mode 100644
index 7354fde..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs2_in.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p;
-
-public class DifferentArgs2_in {
-	private int fN;
-	public DifferentArgs2_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		DifferentArgs2_in	da= /*[*/new DifferentArgs2_in(16)/*]*/;
-
-		System.out.println("Value = " + da.get());
-	}
-	public void bar(String[] args) {
-		int					size= 24;
-		DifferentArgs2_in	da= new DifferentArgs2_in(size);
-
-		System.out.println("Value = " + da.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs3.java
deleted file mode 100644
index 603800c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs3.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-
-public class DifferentArgs3_in {
-	private int fN;
-	public static DifferentArgs3_in createDifferentArgs3_in(int N) {
-		return new DifferentArgs3_in(N);
-	}
-	public DifferentArgs3_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		int				size;
-		DifferentArgs3_in	da= createDifferentArgs3_in(size=16);
-
-		System.out.println("Value = " + da.get());
-	}
-	public void bar(String[] args) {
-		DifferentArgs3_in	da= createDifferentArgs3_in(24);
-
-		System.out.println("Value = " + da.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs3_in.java
deleted file mode 100644
index a9def2d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs3_in.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p;
-
-public class DifferentArgs3_in {
-	private int fN;
-	public DifferentArgs3_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		int				size;
-		DifferentArgs3_in	da= /*[*/new DifferentArgs3_in(size=16)/*]*/;
-
-		System.out.println("Value = " + da.get());
-	}
-	public void bar(String[] args) {
-		DifferentArgs3_in	da= new DifferentArgs3_in(24);
-
-		System.out.println("Value = " + da.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs_in.java
deleted file mode 100644
index a19db0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentArgs_in.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package p;
-
-import java.lang.StringBuffer;
-
-public class DifferentArgs_in {
-	public void foo(String[] args)
-	{
-		StringBuffer	buf = /*[*/new StringBuffer(16)/*]*/;
-
-		buf.append("Args:");
-		for(int i=0; i < args.length; i++)
-			buf.append(" '")
-			   .append(args[i])
-			   .append("'");
-		System.out.println(buf.toString());
-	}
-	public void bar(String[] args)
-	{
-		StringBuffer	buf = new StringBuffer(24);
-
-		buf.append("Args:");
-		for(int i=0; i < args.length; i++)
-			buf.append(" '")
-			   .append(args[i])
-			   .append("'");
-		System.out.println(buf.toString());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentSigs.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentSigs.java
deleted file mode 100644
index 4bf5468..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentSigs.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package p;
-
-public class DifferentSigs_in {
-	private int fN;
-	public static DifferentSigs_in createDifferentSigs_in(int N) {
-		return new DifferentSigs_in(N);
-	}
-	public DifferentSigs_in() {
-		this(10);
-	}
-	public DifferentSigs_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		DifferentSigs_in	ds= createDifferentSigs_in(16);
-
-		System.out.println("Value = " + ds.get());
-	}
-	public void bar(String[] args) {
-		DifferentSigs_in	ds= new DifferentSigs_in();
-
-		System.out.println("Value = " + ds.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentSigs_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentSigs_in.java
deleted file mode 100644
index 87e35a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DifferentSigs_in.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package p;
-
-public class DifferentSigs_in {
-	private int fN;
-	public DifferentSigs_in() {
-		this(10);
-	}
-	public DifferentSigs_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		DifferentSigs_in	ds= /*[*/new DifferentSigs_in(16)/*]*/;
-
-		System.out.println("Value = " + ds.get());
-	}
-	public void bar(String[] args) {
-		DifferentSigs_in	ds= new DifferentSigs_in();
-
-		System.out.println("Value = " + ds.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs1.java
deleted file mode 100644
index bf4f4ff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs1.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-
-public class DontMoveArgs1_in {
-	private int		fN;
-
-	public /*[*/DontMoveArgs1_in/*]*/(int N) {
-		fN= N;
-	}
-	public int getN() {
-		return fN;
-	}
-	public static void main(String[] args) {
-		DontMoveArgs1_in	dma= createDontMoveArgs1_in(15);
-
-		System.out.println("Value = " + Integer.toHexString(dma.getN()));
-	}
-	public static DontMoveArgs1_in createDontMoveArgs1_in(int N) {
-		return new DontMoveArgs1_in(N);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs1_in.java
deleted file mode 100644
index 767af3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs1_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-public class DontMoveArgs1_in {
-	private int		fN;
-
-	public /*[*/DontMoveArgs1_in/*]*/(int N) {
-		fN= N;
-	}
-	public int getN() {
-		return fN;
-	}
-	public static void main(String[] args) {
-		DontMoveArgs1_in	dma= new DontMoveArgs1_in(15);
-
-		System.out.println("Value = " + Integer.toHexString(dma.getN()));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs2.java
deleted file mode 100644
index e6bbf1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs2.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-
-public class DontMoveArgs2_in {
-	private int		fX, fY;
-
-	public /*[*/DontMoveArgs2_in/*]*/(int x, int y) {
-		fX= x;
-		fY= y;
-	}
-	public int getX() {
-		return fX;
-	}
-	public int getY() {
-		return fY;
-	}
-	public static void main(String[] args) {
-		int					y= 20;
-		DontMoveArgs2_in	dma= createDontMoveArgs2_in(15, y);
-
-		System.out.println("Value = " + Integer.toHexString(dma.getX() + dma.getY()));
-	}
-	public static DontMoveArgs2_in createDontMoveArgs2_in(int x, int y) {
-		return new DontMoveArgs2_in(x, y);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs2_in.java
deleted file mode 100644
index 17b2ffb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/DontMoveArgs2_in.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p;
-
-public class DontMoveArgs2_in {
-	private int		fX, fY;
-
-	public /*[*/DontMoveArgs2_in/*]*/(int x, int y) {
-		fX= x;
-		fY= y;
-	}
-	public int getX() {
-		return fX;
-	}
-	public int getY() {
-		return fY;
-	}
-	public static void main(String[] args) {
-		int					y= 20;
-		DontMoveArgs2_in	dma= new DontMoveArgs2_in(15, y);
-
-		System.out.println("Value = " + Integer.toHexString(dma.getX() + dma.getY()));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/InstanceContext_FFF.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/InstanceContext_FFF.java
deleted file mode 100644
index 3f6a2d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/InstanceContext_FFF.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-
-public class InstanceContext_in {
-	private int fN;
-	public static InstanceContext_in createInstanceContext_in(int N) {
-		return new InstanceContext_in(N);
-	}
-	public InstanceContext_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		InstanceContext_in	ic= createInstanceContext_in(16);
-
-		System.out.println("Value = " + ic.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/InstanceContext_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/InstanceContext_in.java
deleted file mode 100644
index 52088fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/InstanceContext_in.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-public class InstanceContext_in {
-	private int fN;
-	public InstanceContext_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		InstanceContext_in	ic= /*[*/new InstanceContext_in(16)/*]*/;
-
-		System.out.println("Value = " + ic.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1A_FFF_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1A_FFF_out.java
deleted file mode 100644
index 5130195..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1A_FFF_out.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package p;
-
-public class MultiUnit1A_in {
-	private int fN;
-	public static MultiUnit1A_in createMultiUnit1A_in(int N) {
-		return new MultiUnit1A_in(N);
-	}
-	private MultiUnit1A_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo1(String[] args) {
-		MultiUnit1A_in	mu= createMultiUnit1A_in(16);
-
-		System.out.println("Value = " + mu.get());
-	}
-	public void foo2(String[] args) {
-		MultiUnit1A_in	mu= createMultiUnit1A_in(24);
-
-		System.out.println("Value = " + mu.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1A_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1A_in.java
deleted file mode 100644
index 02a51c2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1A_in.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class MultiUnit1A_in {
-	private int fN;
-	public MultiUnit1A_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo1(String[] args) {
-		MultiUnit1A_in	mu= /*[*/new MultiUnit1A_in(16)/*]*/;
-
-		System.out.println("Value = " + mu.get());
-	}
-	public void foo2(String[] args) {
-		MultiUnit1A_in	mu= new MultiUnit1A_in(24);
-
-		System.out.println("Value = " + mu.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1B_FFF_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1B_FFF_out.java
deleted file mode 100644
index 3af7242..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1B_FFF_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-public class MultiUnit1B_in {
-	public void foo3(String[] args) {
-		MultiUnit1A_in	mu= MultiUnit1A_in.createMultiUnit1A_in(16);
-
-		System.out.println("Value = " + mu.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1B_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1B_in.java
deleted file mode 100644
index 7bc879c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1B_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-public class MultiUnit1B_in {
-	public void foo3(String[] args) {
-		MultiUnit1A_in	mu= new MultiUnit1A_in(16);
-
-		System.out.println("Value = " + mu.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1C_FFF_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1C_FFF_out.java
deleted file mode 100644
index 2792b6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1C_FFF_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-public class MultiUnit1C_in {
-	public void foo4(String[] args) {
-		MultiUnit1A_in	mu= MultiUnit1A_in.createMultiUnit1A_in(16);
-
-		System.out.println("Value = " + mu.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1C_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1C_in.java
deleted file mode 100644
index 744cb6b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultiUnit1C_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-public class MultiUnit1C_in {
-	public void foo4(String[] args) {
-		MultiUnit1A_in	mu= new MultiUnit1A_in(16);
-
-		System.out.println("Value = " + mu.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultipleCallers_FFF.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultipleCallers_FFF.java
deleted file mode 100644
index 8c00367..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultipleCallers_FFF.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package p;
-
-public class MultipleCallers_in {
-	private int fN;
-	public static MultipleCallers_in createMultipleCallers_in(int N) {
-		return new MultipleCallers_in(N);
-	}
-	public MultipleCallers_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		MultipleCallers_in	mc= createMultipleCallers_in(16);
-
-		System.out.println("Value = " + mc.get());
-	}
-	public void bar(String[] args) {
-		MultipleCallers_in	mc= createMultipleCallers_in(16);
-
-		System.out.println("Value = " + mc.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultipleCallers_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultipleCallers_in.java
deleted file mode 100644
index e9d05d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/MultipleCallers_in.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class MultipleCallers_in {
-	private int fN;
-	public MultipleCallers_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		MultipleCallers_in	mc= /*[*/new MultipleCallers_in(16)/*]*/;
-
-		System.out.println("Value = " + mc.get());
-	}
-	public void bar(String[] args) {
-		MultipleCallers_in	mc= new MultipleCallers_in(16);
-
-		System.out.println("Value = " + mc.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/Names_FFF.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/Names_FFF.java
deleted file mode 100644
index 50b5a0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/Names_FFF.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-
-public class Names_in {
-	private int fN;
-	public static Names_in createThing(int N) {
-		return new Names_in(N);
-	}
-	private Names_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		Names_in	n= createThing(16);
-
-		System.out.println("Value = " + n.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/Names_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/Names_in.java
deleted file mode 100644
index 4999868..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/Names_in.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-public class Names_in {
-	private int fN;
-	public Names_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		Names_in	n= /*[*/new Names_in(16)/*]*/;
-
-		System.out.println("Value = " + n.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor1.java
deleted file mode 100644
index 3b7e05e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor1.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-
-public class ProtectConstructor1_in {
-	private int		fX;
-
-	private /*[*/ProtectConstructor1_in/*]*/(int x) {
-		fX= x;
-	}
-	public int getX() {
-		return fX;
-	}
-	public static void main(String[] args) {
-		ProtectConstructor1_in	pc= createProtectConstructor1_in(15);
-
-		System.out.println("Value = " + Integer.toHexString(pc.getX()));
-	}
-	public static ProtectConstructor1_in createProtectConstructor1_in(int x) {
-		return new ProtectConstructor1_in(x);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor1_in.java
deleted file mode 100644
index 2d757a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor1_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-public class ProtectConstructor1_in {
-	private int		fX;
-
-	public /*[*/ProtectConstructor1_in/*]*/(int x) {
-		fX= x;
-	}
-	public int getX() {
-		return fX;
-	}
-	public static void main(String[] args) {
-		ProtectConstructor1_in	pc= new ProtectConstructor1_in(15);
-
-		System.out.println("Value = " + Integer.toHexString(pc.getX()));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor2.java
deleted file mode 100644
index cac648f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor2.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-
-public class ProtectConstructor2_in {
-	private int		fX, fY;
-
-	private /*[*/ProtectConstructor2_in/*]*/(int x, int y) {
-		fX= x;
-		fY= y;
-	}
-	public int getX() {
-		return fX;
-	}
-	public int getY() {
-		return fY;
-	}
-	public static void main(String[] args) {
-		int						y=  20;
-		ProtectConstructor2_in	pc= createProtectConstructor2_in(15, y);
-
-		System.out.println("Value = " + Integer.toHexString(pc.getX() + pc.getY()));
-	}
-	public static ProtectConstructor2_in createProtectConstructor2_in(int x, int y) {
-		return new ProtectConstructor2_in(x, y);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor2_in.java
deleted file mode 100644
index 481f564..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/ProtectConstructor2_in.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p;
-
-public class ProtectConstructor2_in {
-	private int		fX, fY;
-
-	public /*[*/ProtectConstructor2_in/*]*/(int x, int y) {
-		fX= x;
-		fY= y;
-	}
-	public int getX() {
-		return fX;
-	}
-	public int getY() {
-		return fY;
-	}
-	public static void main(String[] args) {
-		int						y=  20;
-		ProtectConstructor2_in	pc= new ProtectConstructor2_in(15, y);
-
-		System.out.println("Value = " + Integer.toHexString(pc.getX() + pc.getY()));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/SelectConstructor.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/SelectConstructor.java
deleted file mode 100644
index cdfe4b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/SelectConstructor.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-public class SelectConstructor_in {
-	public /*[*/SelectConstructor_in/*]*/() {
-	}
-	public void test(String msg) {
-	}
-	public static void main(String[] args) {
-		SelectConstructor_in sc= createSelectConstructor_in();
-
-		sc.test("hello");
-	}
-	public static SelectConstructor_in createSelectConstructor_in() {
-		return new SelectConstructor_in();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/SelectConstructor_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/SelectConstructor_in.java
deleted file mode 100644
index d1f56a9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/SelectConstructor_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-public class SelectConstructor_in {
-	public /*[*/SelectConstructor_in/*]*/() {
-	}
-	public void test(String msg) {
-	}
-	public static void main(String[] args) {
-		SelectConstructor_in sc= new SelectConstructor_in();
-
-		sc.test("hello");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticContext_FFF.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticContext_FFF.java
deleted file mode 100644
index 3a32afd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticContext_FFF.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-
-public class StaticContext_in {
-	private int fN;
-	public StaticContext_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public static void main(String[] args) {
-		StaticContext_in	sc= createStaticContext_in(16);
-
-		System.out.println("Value = " + sc.get());
-	}
-	public static StaticContext_in createStaticContext_in(int N) {
-		return new StaticContext_in(N);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticContext_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticContext_in.java
deleted file mode 100644
index 6fbea54..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticContext_in.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-public class StaticContext_in {
-	private int fN;
-	public StaticContext_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public static void main(String[] args) {
-		StaticContext_in	sc= /*[*/new StaticContext_in(16)/*]*/;
-
-		System.out.println("Value = " + sc.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticInstance.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticInstance.java
deleted file mode 100644
index c9e0c40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticInstance.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package p;
-
-public class StaticInstance_in {
-	private int fN;
-	public StaticInstance_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		StaticInstance_in	si= createStaticInstance_in(16);
-
-		System.out.println("Value = " + si.get());
-	}
-	public static void bar(String[] args) {
-		StaticInstance_in	si= createStaticInstance_in(16);
-
-		System.out.println("Value = " + si.get());
-	}
-	public static StaticInstance_in createStaticInstance_in(int N) {
-		return new StaticInstance_in(N);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticInstance_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticInstance_in.java
deleted file mode 100644
index d5622b9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/StaticInstance_in.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class StaticInstance_in {
-	private int fN;
-	public StaticInstance_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		StaticInstance_in	si= /*[*/new StaticInstance_in(16)/*]*/;
-
-		System.out.println("Value = " + si.get());
-	}
-	public static void bar(String[] args) {
-		StaticInstance_in	si= new StaticInstance_in(16);
-
-		System.out.println("Value = " + si.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg1.java
deleted file mode 100644
index 0b6de63..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg1.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-
-public class UnmovableArg1_in {
-	private int fN;
-	public static UnmovableArg1_in createUnmovableArg1_in(int N) {
-		return new UnmovableArg1_in(N);
-	}
-	public UnmovableArg1_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		int				size;
-		UnmovableArg1_in	ua= createUnmovableArg1_in(size=16);
-
-		System.out.println("Value = " + ua.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg1_in.java
deleted file mode 100644
index 80078ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg1_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-public class UnmovableArg1_in {
-	private int fN;
-	public UnmovableArg1_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		int				size;
-		UnmovableArg1_in	ua= /*[*/new UnmovableArg1_in(size=16)/*]*/;
-
-		System.out.println("Value = " + ua.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg2.java
deleted file mode 100644
index 8ec1637..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg2.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-
-public class UnmovableArg2_in {
-	private int fN;
-	public static UnmovableArg2_in createUnmovableArg2_in(int N) {
-		return new UnmovableArg2_in(N);
-	}
-	public UnmovableArg2_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		int				size=16;
-		UnmovableArg2_in	ua= createUnmovableArg2_in(size);
-
-		System.out.println("Value = " + ua.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg2_in.java
deleted file mode 100644
index a28afbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceFactory/positive/UnmovableArg2_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-public class UnmovableArg2_in {
-	private int fN;
-	public UnmovableArg2_in(int N) {
-		fN= N;
-	}
-	public int get() {
-		return fN;
-	}
-	public void foo(String[] args) {
-		int				size=16;
-		UnmovableArg2_in	ua= /*[*/new UnmovableArg2_in(size)/*]*/;
-
-		System.out.println("Value = " + ua.get());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NoExpression1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NoExpression1.java
deleted file mode 100644
index c821588..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NoExpression1.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//selection: 7, 20, 7, 25
-package invalid;
-
-class Foo {
-    public static final int CONST= 3;
-	public int getImage(Object obj) {
-        return Foo.CONST;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NoMethodBinding.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NoMethodBinding.java
deleted file mode 100644
index 365d574..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NoMethodBinding.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//selection: 8, 17, 8, 18
-package invalid;
-
-class NoMethodBinding {
-	void method() { }
-	
-	void method() {
-		int x = 3; //<-- introduce 3 as a parameter
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod1.java
deleted file mode 100644
index 8cefbf2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod1.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//selection: 5, 23, 5, 28
-package invalid;
-
-class NotInMethod1 {
-	public int fSum= 1 + 2;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod2.java
deleted file mode 100644
index 3350a8d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod2.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//selection: 2, 9, 2, 16
-package invalid;
-
-class NotInMethod2 {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod3.java
deleted file mode 100644
index 48ddc2a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/NotInMethod3.java
+++ /dev/null

@@ -1,4 +0,0 @@
-//selection: 4, 7, 4, 19
-package invalid;
-
-class NotInMethod3 {}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/PartName1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/PartName1.java
deleted file mode 100644
index 2e6854e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/PartName1.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//selection: 7, 17, 7, 19
-package invalid;
-
-class PartName1 {
-	public static int foo() { return 17; }
-	void bar() {
-		int a= foo();
-	}
-	void use() {
-		bar();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/PartString.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/PartString.java
deleted file mode 100644
index 0a7547d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/invalid/PartString.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//selection: 6, 29, 6, 36
-package invalid;
-
-class PartString {
-	void bar() {
-		System.out.println("Charlie Chaplin");
-	}
-	void use() {
-		bar();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantExpression1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantExpression1.java
deleted file mode 100644
index 8bda48f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantExpression1.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//selection: 8, 16, 8, 24
-//name: i -> second
-package simple;
-
-public class ConstantExpression1 {
-	public static final int ZERO= -1;
-	public int m(int a) {
-		int b= ZERO - 2;
-		return m(3 * a);
-	}
-	public void use() {
-		m(17);
-		m(17 * m(18));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantExpression2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantExpression2.java
deleted file mode 100644
index 0c78305..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantExpression2.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//selection: 12, 16, 12, 52
-//name: i -> length
-package simple;
-
-import java.util.Vector;
-
-public class ConstantExpression2 {
-	private Vector fBeginners;
-	private Vector fAdvanced;
-	
-	private int count() {
-		return fBeginners.size() + fAdvanced.size();
-	}
-	public void use() {
-		count();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantString.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantString.java
deleted file mode 100644
index 7b036dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/ConstantString.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//selection: 7, 28, 7, 45
-//name: string -> name
-package simple;
-
-public class ConstantString {
-	void bar() {
-		System.out.println("Charlie Chaplin");
-	}
-	void use() {
-		bar();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Constructor1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Constructor1.java
deleted file mode 100644
index c11bfec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Constructor1.java
+++ /dev/null

@@ -1,27 +0,0 @@
-//selection: 25, 33, 25, 41
-//name: string -> name
-package simple;
-
-/**
- * @see Constructor1#create(int num)
- * @see #create(int)
- * 
- * @see Constructor1#Constructor1(String)
- * @see #Constructor1(String name)
- */
-public class Constructor1 {
-	/**
-	 * @param name the name
-	 */
-	private Constructor1(String name) {
-		System.out.println(name);
-	}
-	/**
-	 * Creator.
-	 * @param num the count
-	 * @return a Constructor1
-	 */
-	public Constructor1 create(int num) {
-		return new Constructor1("secret" + " #" + num);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Formatting1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Formatting1.java
deleted file mode 100644
index d5e343a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Formatting1.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//selection: 10, 21, 11, 40
-//name: is -> ints
-package simple;
-
-public class Formatting1 {
-	public void method1() {
-		method2();
-	}
-	public void method2() {
-		doSomething(new int[]{1, 2, //newline
-				3/*important comment*/});
-	}
-	private void doSomething(int[] is) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Javadoc1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Javadoc1.java
deleted file mode 100644
index 428ba87..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Javadoc1.java
+++ /dev/null

@@ -1,21 +0,0 @@
-//selection: 17, 21, 17, 40
-//name: is -> ints
-package simple;
-
-/**
- * @see Javadoc1#doSomething(int[])
- * @see #doSomething(int[] is)
- * 
- * @see Javadoc1#go(float)
- * @see #go(float ship)
- */
-public class Javadoc1 {
-	public void run() {
-		go(3.0f);
-	}
-	public void go(float ship) {
-		doSomething(new int[] {1, 2, 3});
-	}
-	static void doSomething(int[] is) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Javadoc2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Javadoc2.java
deleted file mode 100644
index 751cad3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/Javadoc2.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//selection: 10, 28, 10, 37
-//name: ship -> ship
-package simple;
-
-public class Javadoc2 {
-	/**
-	 * Run it.
-	 */
-	public void go() {
-		System.out.println(getShip());
-	}
-	private float getShip() {
-		return 3.0f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/NewInstance1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/NewInstance1.java
deleted file mode 100644
index 4613299..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/NewInstance1.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//selection: 7, 19, 7, 36
-//name: string -> abc
-package simple;
-
-public class NewInstance1 {
-	public void m(int a) {
-		String s= new String("abc");
-	}
-}
-
-class User {
-	public void use() {
-		new NewInstance1().m(17);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/NewInstanceImport.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/NewInstanceImport.java
deleted file mode 100644
index ec8e0f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/NewInstanceImport.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//selection: 9, 20, 9, 46
-//name: iterator -> iter
-package simple;
-
-import java.util.ArrayList;
-
-public class NewInstanceImport {
-	public void m(int a) {
-		boolean b= new ArrayList().iterator().hasNext();
-	}
-	public void use() {
-		m(17);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/StaticGetter1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/StaticGetter1.java
deleted file mode 100644
index 493ff83..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/StaticGetter1.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//selection: 9, 32, 9, 37
-//name: foo -> foo
-package simple;
-
-public class StaticGetter1 {
-	public static int foo() { return 17; }
-	void bar() {
-		int i= 3;
-		System.out.println(i + foo());
-	}
-	void use() {
-		bar();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantExpression1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantExpression1.java
deleted file mode 100644
index 7309026..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantExpression1.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//selection: 8, 16, 8, 24
-//name: i -> second
-package simple.out;
-
-public class ConstantExpression1 {
-	public static final int ZERO= -1;
-	public int m(int a, int second) {
-		int b= second;
-		return m(3 * a, ZERO - 2);
-	}
-	public void use() {
-		m(17, ZERO - 2);
-		m(17 * m(18, ZERO - 2), ZERO - 2);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantExpression2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantExpression2.java
deleted file mode 100644
index d8623fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantExpression2.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//selection: 12, 16, 12, 52
-//name: i -> length
-package simple.out;
-
-import java.util.Vector;
-
-public class ConstantExpression2 {
-	private Vector fBeginners;
-	private Vector fAdvanced;
-	
-	private int count(int length) {
-		return length;
-	}
-	public void use() {
-		count(fBeginners.size() + fAdvanced.size());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantString.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantString.java
deleted file mode 100644
index 830dc88..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/ConstantString.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//selection: 7, 28, 7, 45
-//name: string -> name
-package simple.out;
-
-public class ConstantString {
-	void bar(String name) {
-		System.out.println(name);
-	}
-	void use() {
-		bar("Charlie Chaplin");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Constructor1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Constructor1.java
deleted file mode 100644
index 8b397fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Constructor1.java
+++ /dev/null

@@ -1,28 +0,0 @@
-//selection: 25, 33, 25, 41
-//name: string -> name
-package simple;
-
-/**
- * @see Constructor1#create(int num, String name)
- * @see #create(int, String)
- * 
- * @see Constructor1#Constructor1(String)
- * @see #Constructor1(String name)
- */
-public class Constructor1 {
-	/**
-	 * @param name the name
-	 */
-	private Constructor1(String name) {
-		System.out.println(name);
-	}
-	/**
-	 * Creator.
-	 * @param num the count
-	 * @param name TODO
-	 * @return a Constructor1
-	 */
-	public Constructor1 create(int num, String name) {
-		return new Constructor1(name + " #" + num);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Formatting1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Formatting1.java
deleted file mode 100644
index 6d16fa7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Formatting1.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//selection: 10, 21, 11, 40
-//name: is -> ints
-package simple;
-
-public class Formatting1 {
-	public void method1() {
-		method2(new int[]{1, 2, //newline
-				3/*important comment*/});
-	}
-	public void method2(int[] ints) {
-		doSomething(ints);
-	}
-	private void doSomething(int[] is) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Javadoc1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Javadoc1.java
deleted file mode 100644
index cdce5fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Javadoc1.java
+++ /dev/null

@@ -1,21 +0,0 @@
-//selection: 17, 21, 17, 40
-//name: is -> ints
-package simple;
-
-/**
- * @see Javadoc1#doSomething(int[])
- * @see #doSomething(int[] is)
- * 
- * @see Javadoc1#go(float, int[])
- * @see #go(float ship, int[] ints)
- */
-public class Javadoc1 {
-	public void run() {
-		go(3.0f, new int[] {1, 2, 3});
-	}
-	public void go(float ship, int[] ints) {
-		doSomething(ints);
-	}
-	static void doSomething(int[] is) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Javadoc2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Javadoc2.java
deleted file mode 100644
index a97d154..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/Javadoc2.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//selection: 10, 28, 10, 37
-//name: ship -> ship
-package simple;
-
-public class Javadoc2 {
-	/**
-	 * Run it.
-	 * @param ship TODO
-	 */
-	public void go(float ship) {
-		System.out.println(ship);
-	}
-	private float getShip() {
-		return 3.0f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/NewInstance1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/NewInstance1.java
deleted file mode 100644
index 66bc558..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/NewInstance1.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//selection: 7, 19, 7, 36
-//name: string -> abc
-package simple.out;
-
-public class NewInstance1 {
-	public void m(int a, String abc) {
-		String s= abc;
-	}
-}
-
-class User {
-	public void use() {
-		new NewInstance1().m(17, new String("abc"));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/NewInstanceImport.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/NewInstanceImport.java
deleted file mode 100644
index 52577a9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/NewInstanceImport.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//selection: 8, 20, 8, 46
-package simple.out;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class NewInstanceImport {
-	public void m(int a, Iterator iter) {
-		boolean b= iter.hasNext();
-	}
-	public void use() {
-		m(17, new ArrayList().iterator());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/StaticGetter1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/StaticGetter1.java
deleted file mode 100644
index b8302d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/IntroduceParameter/simple/out/StaticGetter1.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//selection: 9, 32, 9, 37
-//name: foo -> foo
-package simple.out;
-
-public class StaticGetter1 {
-	public static int foo() { return 17; }
-	void bar(int foo) {
-		int i= 3;
-		System.out.println(i + foo);
-	}
-	void use() {
-		bar(foo());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_no_methodToItself/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_no_methodToItself/in/A.java
deleted file mode 100644
index 97fa672..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_no_methodToItself/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_fieldToOtherType/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_fieldToOtherType/in/A.java
deleted file mode 100644
index d52d02c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_fieldToOtherType/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	int f;
-}
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_fieldToOtherType/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_fieldToOtherType/out/A.java
deleted file mode 100644
index 94a935c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_fieldToOtherType/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-}
-class B{
-
-	int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_initializerToOtherType/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_initializerToOtherType/in/A.java
deleted file mode 100644
index b18d211..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_initializerToOtherType/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	{
-		int temp= 0;
-	}
-}
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_initializerToOtherType/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_initializerToOtherType/out/A.java
deleted file mode 100644
index b54d93a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_initializerToOtherType/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-import java.util.*;
-class A {
-}
-class B{
-
-	{
-		int temp= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_methodToOtherType/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_methodToOtherType/in/A.java
deleted file mode 100644
index 47ab6a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_methodToOtherType/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.util.*;
-class A {
-	void foo() {
-	}
-}
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_methodToOtherType/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_methodToOtherType/out/A.java
deleted file mode 100644
index 93d21ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Move/testDestination_yes_methodToOtherType/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-import java.util.*;
-class A {
-}
-class B{
-
-	void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/in/A.java
deleted file mode 100644
index 6873a21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	static class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/out/Inner.java
deleted file mode 100644
index 21ee4d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test0/out/Inner.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/in/A.java
deleted file mode 100644
index 4dedf74..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	public static class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/out/Inner.java
deleted file mode 100644
index 867d64b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test1/out/Inner.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/in/A.java
deleted file mode 100644
index 6c093e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	static int F= 1;
-	static class Inner{
-		void foo() {
-			F= 2;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/out/A.java
deleted file mode 100644
index c29dfbc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A {
-	static int F= 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/out/Inner.java
deleted file mode 100644
index 4b58e1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test10/out/Inner.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class Inner{
-	void foo() {
-		A.F= 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/in/A.java
deleted file mode 100644
index 920903b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	static int F= 1;
-	static class Inner{
-		void foo() {
-			F= 1;
-			A.F= 2;
-			p.A.F= 3;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/out/A.java
deleted file mode 100644
index c29dfbc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A {
-	static int F= 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/out/Inner.java
deleted file mode 100644
index 6b94852..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test11/out/Inner.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class Inner{
-	void foo() {
-		A.F= 1;
-		A.F= 2;
-		p.A.F= 3;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/in/A.java
deleted file mode 100644
index 9b1d176..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A {
-	static class Inner{
-		void foo() {
-			Inner2 a;
-		}
-	}
-	static class Inner2{
-		static class Inner2Inner{
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/out/A.java
deleted file mode 100644
index a3569f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	static class Inner2{
-		static class Inner2Inner{
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/out/Inner.java
deleted file mode 100644
index 48969f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test12/out/Inner.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import p.A.Inner2;
-
-class Inner{
-	void foo() {
-		Inner2 a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/in/A.java
deleted file mode 100644
index 0acd48f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A {
-	static class Inner{
-		void foo() {
-			Inner2.Inner2Inner a;
-		}
-	}
-	static class Inner2{
-		static class Inner2Inner{
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/out/A.java
deleted file mode 100644
index a3569f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	static class Inner2{
-		static class Inner2Inner{
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/out/Inner.java
deleted file mode 100644
index 3550f68..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test13/out/Inner.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import p.A.Inner2;
-import p.A.Inner2.Inner2Inner;
-
-class Inner{
-	void foo() {
-		Inner2.Inner2Inner a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/in/A.java
deleted file mode 100644
index eabae2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A {
-	static class Inner{
-		static void foo() {
-		}
-		static int t= 1;
-	}
-	static void f(){
-		Inner i;
-		A.Inner i2;
-		Inner.foo();
-		Inner.t =  2;
-		A.Inner.foo();
-		A.Inner.t =  2;
-		p.A.Inner.foo();
-		p.A.Inner.t =  2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/out/A.java
deleted file mode 100644
index 6a2228b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	static void f(){
-		Inner i;
-		Inner i2;
-		Inner.foo();
-		Inner.t =  2;
-		Inner.foo();
-		Inner.t =  2;
-		p.Inner.foo();
-		p.Inner.t =  2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/out/Inner.java
deleted file mode 100644
index ce9c712..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test14/out/Inner.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class Inner{
-	static void foo() {
-	}
-	static int t= 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/in/A.java
deleted file mode 100644
index fff5b25..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A {
-	public static class Inner{
-		public static void foo() {
-		}
-		public static int t= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/in/A1.java
deleted file mode 100644
index c3994e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/in/A1.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p1;
-import p.A;
-public class A1 {
-	static void f(){
-		A.Inner i;
-		A.Inner.foo();
-		A.Inner.t =  2;
-		p.A.Inner.foo();
-		p.A.Inner.t =  2;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/A.java
deleted file mode 100644
index f6125f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/A1.java
deleted file mode 100644
index 270c8dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/A1.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p1;
-import p.A;
-import p.Inner;
-public class A1 {
-	static void f(){
-		Inner i;
-		Inner.foo();
-		Inner.t =  2;
-		p.Inner.foo();
-		p.Inner.t =  2;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/Inner.java
deleted file mode 100644
index 2c20149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test15/out/Inner.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class Inner{
-	public static void foo() {
-	}
-	public static int t= 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/in/A.java
deleted file mode 100644
index fff5b25..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A {
-	public static class Inner{
-		public static void foo() {
-		}
-		public static int t= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/in/A1.java
deleted file mode 100644
index 15e07a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/in/A1.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p1;
-import p.A;
-public class A1 {
-	static void f(){
-		A.Inner i;
-		A.Inner.foo();
-		A.Inner.t =  2;
-		p.A.Inner.foo();
-		p.A.Inner.t =  2;
-		A a;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/A.java
deleted file mode 100644
index f6125f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/A1.java
deleted file mode 100644
index bc06aef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/A1.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p1;
-import p.A;
-import p.Inner;
-public class A1 {
-	static void f(){
-		Inner i;
-		Inner.foo();
-		Inner.t =  2;
-		p.Inner.foo();
-		p.Inner.t =  2;
-		A a;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/Inner.java
deleted file mode 100644
index 2c20149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test16/out/Inner.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class Inner{
-	public static void foo() {
-	}
-	public static int t= 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/in/A.java
deleted file mode 100644
index 2a955dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	static class Inner{
-		static void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/out/Inner.java
deleted file mode 100644
index 3688b89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test17/out/Inner.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class Inner{
-	static void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/in/A.java
deleted file mode 100644
index f0ec38f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A{
-	public static class Inner{
-		public class InnerInner{}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/in/A1.java
deleted file mode 100644
index 74360eb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/in/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p1;
-
-import p.A.Inner;
-
-class A1{
-	p.A.Inner a;
-	p.A.Inner.InnerInner a1;
-	Inner a2;
-	Inner.InnerInner a3;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/A.java
deleted file mode 100644
index 52c6073..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-public class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/A1.java
deleted file mode 100644
index a0cc4cc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p1;
-
-import p.Inner;
-
-class A1{
-	p.Inner a;
-	p.Inner.InnerInner a1;
-	Inner a2;
-	Inner.InnerInner a3;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/Inner.java
deleted file mode 100644
index 12cfc64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test18/out/Inner.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class Inner{
-	public class InnerInner{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/in/A.java
deleted file mode 100644
index f0ec38f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A{
-	public static class Inner{
-		public class InnerInner{}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/in/A1.java
deleted file mode 100644
index fa9bbd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/in/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p1;
-
-import p.A.*;
-
-class A1{
-	p.A.Inner a;
-	p.A.Inner.InnerInner a1;
-	Inner a2;
-	Inner.InnerInner a3;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/A.java
deleted file mode 100644
index 52c6073..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-public class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/A1.java
deleted file mode 100644
index 0c1b22c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/A1.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p1;
-
-import p.A.*;
-import p.Inner;
-
-class A1{
-	p.Inner a;
-	p.Inner.InnerInner a1;
-	Inner a2;
-	Inner.InnerInner a3;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/Inner.java
deleted file mode 100644
index 12cfc64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test19/out/Inner.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class Inner{
-	public class InnerInner{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/in/A.java
deleted file mode 100644
index f97b6d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private static class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/out/Inner.java
deleted file mode 100644
index 21ee4d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test2/out/Inner.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/in/A.java
deleted file mode 100644
index f0ec38f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A{
-	public static class Inner{
-		public class InnerInner{}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/in/A1.java
deleted file mode 100644
index fa9bbd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/in/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p1;
-
-import p.A.*;
-
-class A1{
-	p.A.Inner a;
-	p.A.Inner.InnerInner a1;
-	Inner a2;
-	Inner.InnerInner a3;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A.java
deleted file mode 100644
index 52c6073..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-public class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A1.java
deleted file mode 100644
index 5d6c4ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/A1.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p1;
-
-import p.Inner;
-import p.A.*;
-
-class A1{
-	p.Inner a;
-	p.Inner.InnerInner a1;
-	Inner a2;
-	Inner.InnerInner a3;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/Inner.java
deleted file mode 100644
index 12cfc64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test20/out/Inner.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class Inner{
-	public class InnerInner{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/in/A.java
deleted file mode 100644
index fb6b413..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class A {
-    static int i= 0;
-    interface Inner{
-        int I= i;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/out/A.java
deleted file mode 100644
index 831e943..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A {
-    static int i= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/out/Inner.java
deleted file mode 100644
index 2a485d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test21/out/Inner.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface Inner{
-    int I= A.i;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/in/A.java
deleted file mode 100644
index b75ae8e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class A {
-    static int i= 0;
-    static interface Inner{
-        int I= i;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/out/A.java
deleted file mode 100644
index 831e943..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A {
-    static int i= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/out/Inner.java
deleted file mode 100644
index 2a485d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test22/out/Inner.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface Inner{
-    int I= A.i;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/in/A.java
deleted file mode 100644
index d92e2fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class A {
-    Inner inner= new Inner();
-    static class Inner{
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/out/A.java
deleted file mode 100644
index 2477ba3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A {
-    Inner inner= new Inner();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/out/Inner.java
deleted file mode 100644
index 21ee4d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test23/out/Inner.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/in/A.java
deleted file mode 100644
index cc5ec8f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public interface A {
-    class Inner{
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/out/A.java
deleted file mode 100644
index b7eda42..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public interface A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/out/Inner.java
deleted file mode 100644
index 21ee4d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test24/out/Inner.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/in/A.java
deleted file mode 100644
index 12651d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-class A
-{
-	public static class Inner
-	{	
-	}
-	
-	public A()
-	{
-		super();
-		new A.Inner();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/out/A.java
deleted file mode 100644
index 50f6a43..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-class A
-{
-	public A()
-	{
-		super();
-		new Inner();
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/out/Inner.java
deleted file mode 100644
index 3e161ae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test25/out/Inner.java
+++ /dev/null

@@ -1,4 +0,0 @@
-
-public class Inner
-{	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/in/A.java
deleted file mode 100644
index 2706e60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	static protected class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/out/Inner.java
deleted file mode 100644
index 21ee4d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test3/out/Inner.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/in/A.java
deleted file mode 100644
index 61c05cb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	static protected final class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/out/Inner.java
deleted file mode 100644
index fea4077..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test4/out/Inner.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-final class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/in/A.java
deleted file mode 100644
index c9f122e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	static protected abstract class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/out/Inner.java
deleted file mode 100644
index 6aab93d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test5/out/Inner.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-abstract class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/in/A.java
deleted file mode 100644
index de26604..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	/**
-	 * Inner class javadoc
-	 */
-	static class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/out/Inner.java
deleted file mode 100644
index 2a08594..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test6/out/Inner.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-/**
- * Inner class javadoc
- */
-class Inner{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/in/A.java
deleted file mode 100644
index cf9f36d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	static void f(){}
-	static class Inner{
-		void foo(){
-			f();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/out/A.java
deleted file mode 100644
index f2d628f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A {
-	static void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/out/Inner.java
deleted file mode 100644
index 65ee93c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test7/out/Inner.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class Inner{
-	void foo(){
-		A.f();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/in/A.java
deleted file mode 100644
index fb37af6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	static void f(){}
-	static class Inner{
-		void f(){
-			f();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/out/A.java
deleted file mode 100644
index f2d628f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A {
-	static void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/out/Inner.java
deleted file mode 100644
index 5d15879..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test8/out/Inner.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class Inner{
-	void f(){
-		f();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/in/A.java
deleted file mode 100644
index 5ba341e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.List;
-
-class A {
-	static class Inner{
-		void foo(List list) {}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/A.java
deleted file mode 100644
index 688a6d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/Inner.java
deleted file mode 100644
index 756b5fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test9/out/Inner.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.List;
-
-class Inner{
-	void foo(List list) {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_0/in/A.java
deleted file mode 100644
index b1c2946..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_0/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	class Inner{
-		int a; //conflicting name
-		{foo();} //needs enclosing instance
-	}
-	void foo() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_1/in/A.java
deleted file mode 100644
index b3d961c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_1/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	class Inner{
-		Inner(int a){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_2/in/A.java
deleted file mode 100644
index 8c3974f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_2/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	class Inner{
-	}
-}
-class Inner {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_3/in/A.java
deleted file mode 100644
index 9afe08d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/testFail_nonstatic_3/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A {
-	void method() {
-		class Local {
-			class NestedLocal {
-				// move NestedLocal to new file
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/in/A.java
deleted file mode 100644
index 1a0b0eb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/out/Inner.java
deleted file mode 100644
index 8515d9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_0/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner{
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/in/A.java
deleted file mode 100644
index 62c3edf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	class Inner{
-		void f(){
-		}
-	}
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/out/A.java
deleted file mode 100644
index 19908f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		new Inner(this);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/out/Inner.java
deleted file mode 100644
index 5b0ff7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_1/out/Inner.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class Inner{
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/in/A.java
deleted file mode 100644
index e0b6d0f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A{
-	A a;
-	class Inner {
-	}
-	void f(A a){
-		a.a.a.new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/out/A.java
deleted file mode 100644
index eb1296d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A{
-	A a;
-	void f(A a){
-		new Inner(a.a.a);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/out/Inner.java
deleted file mode 100644
index 97caa31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_10/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner {
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/in/A.java
deleted file mode 100644
index dc4e7d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-	class Inner {
-		void f(){
-			new Inner();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/out/A.java
deleted file mode 100644
index db0b740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/out/Inner.java
deleted file mode 100644
index 0a82a90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_11/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		new Inner(this.a);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/in/A.java
deleted file mode 100644
index c0cba86..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	void foo(){
-	}
-	class Inner {
-		void f(){
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/out/A.java
deleted file mode 100644
index 0a7570e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A{
-	void foo(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/out/Inner.java
deleted file mode 100644
index 37357f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_12/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		this.a.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/in/A.java
deleted file mode 100644
index 54b819f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A{
-	int i;
-	class Inner {
-		void f(){
-			i= 1;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/out/A.java
deleted file mode 100644
index 0312fb1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A{
-	int i;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/out/Inner.java
deleted file mode 100644
index b662617..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_13/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		this.a.i= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/in/A.java
deleted file mode 100644
index 05c1028..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A{
-	class X{}
-	class Inner {
-		void f(){
-			X x= new X();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/out/A.java
deleted file mode 100644
index d39ac4f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A{
-	class X{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/out/Inner.java
deleted file mode 100644
index f22406a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_14/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner{
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		A.X x= this.a.new X();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/in/A.java
deleted file mode 100644
index 389caf8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	static void foo(){
-	}
-	class Inner {
-		void f(){
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/out/A.java
deleted file mode 100644
index f1f9373..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A{
-	static void foo(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/out/Inner.java
deleted file mode 100644
index b2950e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_15/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		A.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/in/A.java
deleted file mode 100644
index d007001..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A{
-	static int i;
-	class Inner {
-		void f(){
-			i= 1;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/out/A.java
deleted file mode 100644
index 4d145ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A{
-	static int i;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/out/Inner.java
deleted file mode 100644
index 657cc9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_16/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		A.i= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/in/A.java
deleted file mode 100644
index 472b58e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A{
-	static class X{}
-	class Inner {
-		void f(){
-			X x= new X();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/out/A.java
deleted file mode 100644
index ffe4df6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-class A{
-	static class X{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/out/Inner.java
deleted file mode 100644
index 3f8bfb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_17/out/Inner.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-class Inner{
-	private A a;
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-	void f(){
-		A.X x= new A.X();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/in/A.java
deleted file mode 100644
index 653e337..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	class Inner {
-		Inner(){
-			this(0);
-		}
-		Inner(int i){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/out/A.java
deleted file mode 100644
index db0b740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/out/Inner.java
deleted file mode 100644
index 163f99b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_18/out/Inner.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class Inner {
-	private A a;
-	Inner(A a){
-		this(a, 0);
-	}
-	Inner(A a, int i){
-		this.a= a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/in/A.java
deleted file mode 100644
index 04e9446..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-		Inner(){
-			this(0);
-		}
-		Inner(int i){
-			super();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/out/A.java
deleted file mode 100644
index db0b740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/out/Inner.java
deleted file mode 100644
index 5792e75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_19/out/Inner.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class Inner{
-	private A a;
-	Inner(A a){
-		this(a, 0);
-	}
-	Inner(A a, int i){
-		super();
-		this.a= a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/in/A.java
deleted file mode 100644
index f3e49b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	class Inner{
-		void f(){
-		}
-	}
-	class Inner2{
-		void f(){
-			new Inner();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/out/A.java
deleted file mode 100644
index 472b149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	class Inner2{
-		void f(){
-			new Inner(A.this);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/out/Inner.java
deleted file mode 100644
index 5b0ff7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_2/out/Inner.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class Inner{
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/in/A.java
deleted file mode 100644
index 77d3571..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-		Inner(){
-			super();
-		}
-		Inner(int i){
-			this();
-		}
-		Inner(boolean b){
-			this(1);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/out/A.java
deleted file mode 100644
index db0b740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/out/Inner.java
deleted file mode 100644
index 794db48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_20/out/Inner.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-class Inner{
-	private A a;
-	Inner(A a){
-		super();
-		this.a= a;
-	}
-	Inner(A a, int i){
-		this(a);
-	}
-	Inner(A a, boolean b){
-		this(a, 1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/in/A.java
deleted file mode 100644
index 3ff800d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-		Inner(){
-		}
-		Inner(int i){
-		}
-	}
-}
-class I2 extends A.Inner{
-	I2(){
-		new A().super();
-	}
-	I2(int i){
-		new A().super(i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/out/A.java
deleted file mode 100644
index d4c2cb4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A{
-}
-class I2 extends Inner{
-	I2(){
-		super(new A());
-	}
-	I2(int i){
-		super(new A(), i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/out/Inner.java
deleted file mode 100644
index 9c3ee68..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_21/out/Inner.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class Inner{
-	private A a;
-	Inner(A a){
-		this.a= a;
-	}
-	Inner(A a, int i){
-		this.a= a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/in/A.java
deleted file mode 100644
index 13f2db8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-	}
-}
-class I2 extends A.Inner{
-	I2(){
-		new A().super();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/out/A.java
deleted file mode 100644
index d9e0855..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-}
-class I2 extends Inner{
-	I2(){
-		super(new A());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/out/Inner.java
deleted file mode 100644
index 8515d9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_22/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner{
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/in/A.java
deleted file mode 100644
index dd2e1e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-	}
-}
-class I2 extends A.Inner{
-	I2(){
-		new A().super();
-	}
-}
-class I3 extends I2{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/out/A.java
deleted file mode 100644
index c6275fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-}
-class I2 extends Inner{
-	I2(){
-		super(new A());
-	}
-}
-class I3 extends I2{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/out/Inner.java
deleted file mode 100644
index 8515d9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_23/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner{
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/in/A.java
deleted file mode 100644
index 2fb8a75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	class Inner{
-		Inner(){
-			f();
-		}
-		void f(){
-		}
-	}
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/out/A.java
deleted file mode 100644
index 19908f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		new Inner(this);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/out/Inner.java
deleted file mode 100644
index 0d93aa3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_24/out/Inner.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class Inner{
-	private A a;
-	Inner(A a){
-		f();
-		this.a= a;
-	}
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/in/A.java
deleted file mode 100644
index 28ed338..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-		Inner(){
-			super();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/out/A.java
deleted file mode 100644
index db0b740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/out/Inner.java
deleted file mode 100644
index 6ba96f9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_25/out/Inner.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class Inner{
-	private A a;
-
-	Inner(A a){
-		super();
-		this.a= a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/in/A.java
deleted file mode 100644
index 389caf8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	static void foo(){
-	}
-	class Inner {
-		void f(){
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/out/A.java
deleted file mode 100644
index f1f9373..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A{
-	static void foo(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/out/Inner.java
deleted file mode 100644
index b2950e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_26/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		A.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/in/A.java
deleted file mode 100644
index 389caf8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	static void foo(){
-	}
-	class Inner {
-		void f(){
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/out/A.java
deleted file mode 100644
index f1f9373..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A{
-	static void foo(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/out/Inner.java
deleted file mode 100644
index b2950e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_27/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		A.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/in/A.java
deleted file mode 100644
index 1840ce6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class A {
-    public static class OtherInner {}
-    public class Inner extends OtherInner {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/out/A.java
deleted file mode 100644
index ea9b74c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A {
-    public static class OtherInner {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/out/Inner.java
deleted file mode 100644
index 6ab2c6b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_28/out/Inner.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-public class Inner extends A.OtherInner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/in/A.java
deleted file mode 100644
index ea7e1cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class A {
-    public class OtherInner {}
-    public class Inner extends OtherInner {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/out/A.java
deleted file mode 100644
index 3015e0c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A {
-    public class OtherInner {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/out/Inner.java
deleted file mode 100644
index b8721e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_29/out/Inner.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class Inner extends A.OtherInner {
-	private A a;
-
-	Inner(A a) {
-		a.super();
-		this.a = a;
-	}}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/in/A.java
deleted file mode 100644
index 02c0905..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-	}
-	
-	static class Inner2{
-		void f(){
-			new A().new Inner();
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/out/A.java
deleted file mode 100644
index 479c0de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-	static class Inner2{
-		void f(){
-			new Inner(new A());
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/out/Inner.java
deleted file mode 100644
index 8515d9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_3/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner{
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/in/A.java
deleted file mode 100644
index a03ceae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class A {
-	class Inner{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/out/A.java
deleted file mode 100644
index f6125f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/out/Inner.java
deleted file mode 100644
index a4cfe60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_30/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner{
-
-	private final A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/in/A.java
deleted file mode 100644
index 1016cbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	class Inner{
-		void f(){
-			A.this.m();
-		}
-	}
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/out/A.java
deleted file mode 100644
index 8e0003a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A {
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/out/Inner.java
deleted file mode 100644
index 3f86959..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_31/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner{
-	private final A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		this.a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/in/A.java
deleted file mode 100644
index 4441539..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	class Inner{
-		void f(){
-			A.this.m= 1;
-		}
-	}
-	int m;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/out/A.java
deleted file mode 100644
index 2540788..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A {
-	int m;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/out/Inner.java
deleted file mode 100644
index 5ed9d5a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_32/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner{
-	private final A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		this.a.m= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/in/A.java
deleted file mode 100644
index 162df04..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-	private class I{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/out/A.java
deleted file mode 100644
index 688a6d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/out/I.java
deleted file mode 100644
index 3182e0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_33/out/I.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class I{
-
-	private final A a;
-
-	/**
-	 * @param a
-	 */
-	I(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/in/A.java
deleted file mode 100644
index 304eb17..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/in/A.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package p;
-class A {
-
-	public class Inner {
-
-		public Inner() {
-			super();
-			System.out.println(getName());
-		}
-
-		public String getName() {
-			return getTopName() + ".Inner";
-		}
-	}
-
-	public A() {
-		new Object(){};
-		System.out.println(new Inner().getName());
-	}
-
-	public String getTopName() {
-		return "Top";
-	}
-
-	static public void main(String[] argv) {
-		new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/out/A.java
deleted file mode 100644
index 1638765..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A {
-
-	public A() {
-		new Object(){};
-		System.out.println(new Inner(this).getName());
-	}
-
-	public String getTopName() {
-		return "Top";
-	}
-
-	static public void main(String[] argv) {
-		new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/out/Inner.java
deleted file mode 100644
index 504cd39..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_34/out/Inner.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-public class Inner {
-
-	private final A a;
-
-	public Inner(A a) {
-		super();
-		this.a= a;
-		System.out.println(getName());
-	}
-
-	public String getName() {
-		return this.a.getTopName() + ".Inner";
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/in/A.java
deleted file mode 100644
index e603c16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	class Inner{
-		Inner(){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/out/Inner.java
deleted file mode 100644
index e41b7d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_35/out/Inner.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class Inner{
-	private A a;
-
-	Inner(A a){
-		this.a= a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/in/A.java
deleted file mode 100644
index ab93f74..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/in/A.java
+++ /dev/null

@@ -1,43 +0,0 @@
-package p;
-class A
-{
-	public String bar2()
-	{
-		return "wee!";
-	}
-	public String bar3;
-	
-	public class Inner
-	{
-		
-		public void bar0(){
-			class Local{
-				public void run()
-				{
-					System.out.println(bar2());
-					bar3= "fred";
-				}
-			}
-		}
-		
-		public void bar()
-		{
-			new Runnable()
-			{
-				public void run()
-				{
-					System.out.println(bar2());
-					bar3= "fred";
-				}
-			};
-		}
-		
-		class InnerInner{
-			public void run()
-			{
-				System.out.println(bar2());
-				bar3= "fred";
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/out/A.java
deleted file mode 100644
index 9d8430f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A
-{
-	public String bar2()
-	{
-		return "wee!";
-	}
-	public String bar3;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/out/Inner.java
deleted file mode 100644
index e6aaa36..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_36/out/Inner.java
+++ /dev/null

@@ -1,44 +0,0 @@
-package p;
-public class Inner
-{
-	
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	public void bar0(){
-		class Local{
-			public void run()
-			{
-				System.out.println(Inner.this.a.bar2());
-				Inner.this.a.bar3= "fred";
-			}
-		}
-	}
-	
-	public void bar()
-	{
-		new Runnable()
-		{
-			public void run()
-			{
-				System.out.println(Inner.this.a.bar2());
-				Inner.this.a.bar3= "fred";
-			}
-		};
-	}
-	
-	class InnerInner{
-		public void run()
-		{
-			System.out.println(Inner.this.a.bar2());
-			Inner.this.a.bar3= "fred";
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/in/A.java
deleted file mode 100644
index 241cdf0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-public class A {
-	class Inner {
-		public void doit() {
-			foo(bar());
-		}
-	}
-	public void foo(int value) {
-	}
-	public int bar() {
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/out/A.java
deleted file mode 100644
index a3a80a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A {
-	public void foo(int value) {
-	}
-	public int bar() {
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/out/Inner.java
deleted file mode 100644
index 751733b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_37/out/Inner.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-
-	public void doit() {
-		this.a.foo(this.a.bar());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/in/A.java
deleted file mode 100644
index cf3c242..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class A {
-	class Inner {
-		public void doit() {
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/out/A.java
deleted file mode 100644
index f6125f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/out/Inner.java
deleted file mode 100644
index 2df2577..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_38/out/Inner.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class Inner {
-	public void doit() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/in/A.java
deleted file mode 100644
index 0581341..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-public class A {
-	class Inner {
-		public void doit() {
-			foo();
-			fred++;
-			new Stat();
-		}
-	}
-	static void foo(){};
-	static int fred;
-	static class Stat{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/out/A.java
deleted file mode 100644
index 189e6f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class A {
-	static void foo(){};
-	static int fred;
-	static class Stat{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/out/Inner.java
deleted file mode 100644
index 3fffc78..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_39/out/Inner.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import p.A.Stat;
-
-class Inner {
-	public void doit() {
-		A.foo();
-		A.fred++;
-		new Stat();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/in/A.java
deleted file mode 100644
index 7f679a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-	}
-}
-class B extends A{
-	void f(){
-		new Inner();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/out/A.java
deleted file mode 100644
index 9398780..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-}
-class B extends A{
-	void f(){
-		new Inner(this);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/out/Inner.java
deleted file mode 100644
index 8515d9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_4/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner{
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/in/A.java
deleted file mode 100644
index c0704fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-	}
-}
-class B extends A.Inner{
-	B(){
-		new A().super();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/out/A.java
deleted file mode 100644
index b9043e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-}
-class B extends Inner{
-	B(){
-		super(new A());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/out/Inner.java
deleted file mode 100644
index 8515d9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_5/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner{
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/in/A.java
deleted file mode 100644
index 0c91ef8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A{
-	class Inner {
-		Inner(int t){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/out/A.java
deleted file mode 100644
index db0b740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/out/Inner.java
deleted file mode 100644
index 271d212..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_6/out/Inner.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class Inner {
-	private A a;
-
-	Inner(A a, int t){
-		this.a= a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/in/A.java
deleted file mode 100644
index ec0d825..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	class Inner {
-	}
-	class X extends A{
-		void f(){
-			new Inner();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/out/A.java
deleted file mode 100644
index 43b5118..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-	class X extends A{
-		void f(){
-			new Inner(this);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/out/Inner.java
deleted file mode 100644
index 97caa31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_7/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner {
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/in/A.java
deleted file mode 100644
index d862d48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A{
-	class Inner {
-	}
-	void f(){
-		new Inner(){
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/out/A.java
deleted file mode 100644
index 74333cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A{
-	void f(){
-		new Inner(this){
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/out/Inner.java
deleted file mode 100644
index 97caa31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_8/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner {
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/in/A.java
deleted file mode 100644
index cadbc90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A{
-	class Inner {
-	}
-	void f(){
-		new Inner(){
-			void ft(){
-				new Inner();
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/out/A.java
deleted file mode 100644
index ff9d08b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	void f(){
-		new Inner(this){
-			void ft(){
-				new Inner(A.this);
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/out/Inner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/out/Inner.java
deleted file mode 100644
index 97caa31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInnerToTopLevel/test_nonstatic_9/out/Inner.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Inner {
-
-	private A a;
-
-	/**
-	 * @param a
-	 */
-	Inner(A a) {
-		this.a= a;
-		// TODO Auto-generated constructor stub
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/A.java
deleted file mode 100644
index 826a46e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-// Move mA1 to parameter b, do not inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(B b) {

-		b.mB1();

-		mA2(); //test comment

-		b.mB2();

-		System.out.println(this);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/C.java
deleted file mode 100644
index c0eba7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/in/C.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p3;

-

-import p1.A;

-import p2.B;

-

-class C {

-	{

-		A a= new A();

-		a.mA1(new B());

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/A.java
deleted file mode 100644
index 762e718..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-// Move mA1 to parameter b, do not inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(B b) {

-		b.mA1(this);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/B.java
deleted file mode 100644
index 40bbade..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/B.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-

-	public void mA1(A a) {

-		mB1();

-		a.mA2(); //test comment

-		mB2();

-		System.out.println(a);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/C.java
deleted file mode 100644
index c0eba7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test0/out/C.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p3;

-

-import p1.A;

-import p2.B;

-

-class C {

-	{

-		A a= new A();

-		a.mA1(new B());

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/A.java
deleted file mode 100644
index 66a4ff9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-// Move mA1 to parameter b, inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(B b) {

-		b.mB1();

-		mA2();

-		b.mB2();

-		System.out.println(this);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/C.java
deleted file mode 100644
index 68dfcdb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/in/C.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p3;

-

-import p1.A;

-import p2.B;

-

-class C {

-	{

-		this.getA().m1A(getB());

-	}

-	

-	A getA() {

-		return null;

-	}

-	

-	B getB() {

-		return null;	

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/A.java
deleted file mode 100644
index 1834c0b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-// Move mA1 to parameter b, inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(B b) {

-		b.mA1(this);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/B.java
deleted file mode 100644
index 4d90b64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/B.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-	

-	public void mA1(A a) {

-		mB1();

-		a.mA2();

-		mB2();

-		System.out.println(a);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/C.java
deleted file mode 100644
index 09a8ec2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test1/out/C.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p3;

-

-import p1.A;

-import p2.B;

-

-class C {

-	{

-		getB().m1A(this.getA());

-	}

-

-	A getA() {

-		return null;

-	}

-

-	B getB() {

-		return null;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/in/A.java
deleted file mode 100644
index 8e05c5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(float j, B b, int foo, String bar) {

-		b.mB1();

-		System.out.println(bar + j);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/out/A.java
deleted file mode 100644
index 978b3db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(float j, B b, int foo, String bar) {

-		b.mA1(j, foo, bar);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/out/B.java
deleted file mode 100644
index 2dcaf1f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test10/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-

-	public void mA1(float j, int foo, String bar) {

-		mB1();

-		System.out.println(bar + j);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/in/A.java
deleted file mode 100644
index 9837c16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public int fInt;

-	public B fB;

-	public String fString;

-	public boolean fBool;

-	

-	public void mA1(float j, int foo, String bar) {

-		fB.mB1();

-		System.out.println(bar + j + this);

-		String z= fString + fBool;

-		fInt++;

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/out/A.java
deleted file mode 100644
index bbbda11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public int fInt;

-	public B fB;

-	public String fString;

-	public boolean fBool;

-	

-	public void mA1(float j, int foo, String bar) {

-		fB.mA1(this, j, foo, bar);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/out/B.java
deleted file mode 100644
index f1f026a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test11/out/B.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-

-	public void mA1(A a, float j, int foo, String bar) {

-		mB1();

-		System.out.println(bar + j + a);

-		String z= a.fString + a.fBool;

-		a.fInt++;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/in/A.java
deleted file mode 100644
index b9ab0fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public B fB;

-	

-	public void mA1(float j, int foo, String bar) {

-		fB.mB1();

-		System.out.println(bar + j);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/out/A.java
deleted file mode 100644
index 35e6bed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public B fB;

-	

-	public void mA1(float j, int foo, String bar) {

-		fB.mA1(j, foo, bar);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/out/B.java
deleted file mode 100644
index 2f3b673..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test12/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p2;
-
-public class B {
-	public void mB1() {}
-	
-	public void mB2() {}
-
-	public void mA1(float j, int foo, String bar) {
-		mB1();
-		System.out.println(bar + j);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/P.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/P.java
deleted file mode 100644
index 38a77a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/P.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;
-public interface P{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/TC.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/TC.java
deleted file mode 100644
index 1454a04..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/TC.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p1;

-public class TC {

-	public void runBare() {

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/TR.java
deleted file mode 100644
index d1c72a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/in/TR.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p1;

-

-public class TR {

-	protected void run(final TC test) {

-		startTest(test);

-		P p= new P() {

-			public void protect() throws Throwable {

-				test.runBare();

-			}

-		};

-		runProtected(test, p);

-

-		endTest(test);

-	}

-

-	private void runProtected(TC test, P p) {

-	}

-

-	private void endTest(TC test) {

-	}

-

-	private void startTest(TC test) {

-	}

-

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/P.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/P.java
deleted file mode 100644
index 38a77a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/P.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;
-public interface P{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/TC.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/TC.java
deleted file mode 100644
index 38e4feb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/TC.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p1;

-public class TC {

-	public void runBare() {

-	}

-

-	protected void run(TR tr) {

-		tr.startTest(this);

-		P p= new P() {

-			public void protect() throws Throwable {

-				runBare();

-			}

-		};

-		tr.runProtected(this, p);

-	

-		tr.endTest(this);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/TR.java
deleted file mode 100644
index c80b24a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test13/out/TR.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p1;

-

-public class TR {

-	protected void run(final TC test) {

-		test.run(this);

-	}

-

-	private void runProtected(TC test, P p) {

-	}

-

-	private void endTest(TC test) {

-	}

-

-	private void startTest(TC test) {

-	}

-

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/in/TC.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/in/TC.java
deleted file mode 100644
index c8e3f6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/in/TC.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;

-public class TC {

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/in/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/in/TR.java
deleted file mode 100644
index 2c97aa8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/in/TR.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p1;

-

-public class TR {

-	protected void run(TC test) {

-		startTest(test);

-	}

-

-	private void startTest(TC test) {

-	}

-

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/out/TC.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/out/TC.java
deleted file mode 100644
index d9e96f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/out/TC.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p1;

-public class TC {

-

-	protected void run(TR tr) {

-		tr.startTest(this);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/out/TR.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/out/TR.java
deleted file mode 100644
index c59a471..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test14/out/TR.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p1;

-

-public class TR {

-	protected void run(TC test) {

-		test.run(this);

-	}

-

-	private void startTest(TC test) {

-	}

-

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test15/in/A.java
deleted file mode 100644
index b800d70..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test15/in/A.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package p;
-
-public class A {
-	int fMagic;
-
-	public static void main(String[] args) {
-		Second s= new Second("Bingo");
-		A a= new A();
-		a.fMagic= 17;
-		a.print(s);
-	}
-
-	public void print(Second s) {
-		System.out.println(s + ": " + fMagic);
-	}
-}
-
-class Second {
-	String fName;
-	public Second(String name) {
-		fName= name;
-	}
-	public String toString() {
-		return fName;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test15/out/A.java
deleted file mode 100644
index 96a212c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test15/out/A.java
+++ /dev/null

@@ -1,29 +0,0 @@
-package p;
-
-public class A {
-	int fMagic;
-
-	public static void main(String[] args) {
-		Second s= new Second("Bingo");
-		A a= new A();
-		a.fMagic= 17;
-		a.print(s);
-	}
-
-	public void print(Second s) {
-		s.print(this);
-	}
-}
-
-class Second {
-	String fName;
-	public Second(String name) {
-		fName= name;
-	}
-	public String toString() {
-		return fName;
-	}
-	public void print(A a) {
-		System.out.println(this + ": " + a.fMagic);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test16/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test16/in/B.java
deleted file mode 100644
index 9860b4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test16/in/B.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-public class B {
-	private int count;
-
-	public void f() {
-		Inner s= new Inner();
-		print(s);
-	}
-	
-	public void print(Inner s) {
-		count++;
-		System.out.println(s);
-	}	
-
-	public class Inner {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test16/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test16/out/B.java
deleted file mode 100644
index 655f334..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test16/out/B.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p;
-
-public class B {
-	private int count;
-
-	public void f() {
-		Inner s= new Inner();
-		print(s);
-	}
-	
-	public void print(Inner s) {
-		s.print(this);
-	}	
-
-	public class Inner {
-
-		public void print(B b) {
-			b.count++;
-			System.out.println(this);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/in/Rectangle.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/in/Rectangle.java
deleted file mode 100644
index 8c2a166..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/in/Rectangle.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-
-public class Rectangle {
-	public int x;
-	public int y;
-	public int width;
-	public int height;
-
-	public Rectangle (int x, int y, int width, int height) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	public int getHeight() {
-		return height;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/in/Shape.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/in/Shape.java
deleted file mode 100644
index fdc0e24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/in/Shape.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class Shape {
-	Rectangle fBounds;
-	Rectangle fInnerBounds;
-	
-	public int area() {
-		int width= fBounds.getWidth();
-		int height= fBounds.getHeight();
-		return width*height;
-	}
-	
-	public int filledArea() {
-		return area() -	fInnerBounds.getWidth() * fInnerBounds.getHeight();
-	}
-	
-	public boolean isSmallerThan(Rectangle rect) {
-		return area() < rect.getWidth() * rect.getHeight();
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/out/Rectangle.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/out/Rectangle.java
deleted file mode 100644
index 91a6faa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/out/Rectangle.java
+++ /dev/null

@@ -1,29 +0,0 @@
-package p;
-
-public class Rectangle {
-	public int x;
-	public int y;
-	public int width;
-	public int height;
-
-	public Rectangle (int x, int y, int width, int height) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	public int getHeight() {
-		return height;
-	}
-
-	public int area() {
-		int width= getWidth();
-		int height= getHeight();
-		return width*height;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/out/Shape.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/out/Shape.java
deleted file mode 100644
index 66524b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test17/out/Shape.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-
-public class Shape {
-	Rectangle fBounds;
-	Rectangle fInnerBounds;
-	
-	public int area() {
-		return fBounds.area();
-	}
-	
-	public int filledArea() {
-		return area() -	fInnerBounds.getWidth() * fInnerBounds.getHeight();
-	}
-	
-	public boolean isSmallerThan(Rectangle rect) {
-		return area() < rect.getWidth() * rect.getHeight();
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/in/Rectangle.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/in/Rectangle.java
deleted file mode 100644
index 8c2a166..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/in/Rectangle.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-
-public class Rectangle {
-	public int x;
-	public int y;
-	public int width;
-	public int height;
-
-	public Rectangle (int x, int y, int width, int height) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	public int getHeight() {
-		return height;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/in/Shape.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/in/Shape.java
deleted file mode 100644
index fdc0e24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/in/Shape.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class Shape {
-	Rectangle fBounds;
-	Rectangle fInnerBounds;
-	
-	public int area() {
-		int width= fBounds.getWidth();
-		int height= fBounds.getHeight();
-		return width*height;
-	}
-	
-	public int filledArea() {
-		return area() -	fInnerBounds.getWidth() * fInnerBounds.getHeight();
-	}
-	
-	public boolean isSmallerThan(Rectangle rect) {
-		return area() < rect.getWidth() * rect.getHeight();
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/out/Rectangle.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/out/Rectangle.java
deleted file mode 100644
index 212e4c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/out/Rectangle.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package p;
-
-public class Rectangle {
-	public int x;
-	public int y;
-	public int width;
-	public int height;
-
-	public Rectangle (int x, int y, int width, int height) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	public int getHeight() {
-		return height;
-	}
-
-	public int filledArea(Shape shape) {
-		return shape.area() -	getWidth() * getHeight();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/out/Shape.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/out/Shape.java
deleted file mode 100644
index b93e1ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test18/out/Shape.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class Shape {
-	Rectangle fBounds;
-	Rectangle fInnerBounds;
-	
-	public int area() {
-		int width= fBounds.getWidth();
-		int height= fBounds.getHeight();
-		return width*height;
-	}
-	
-	public int filledArea() {
-		return fInnerBounds.filledArea(this);
-	}
-	
-	public boolean isSmallerThan(Rectangle rect) {
-		return area() < rect.getWidth() * rect.getHeight();
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/in/Rectangle.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/in/Rectangle.java
deleted file mode 100644
index 8c2a166..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/in/Rectangle.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-
-public class Rectangle {
-	public int x;
-	public int y;
-	public int width;
-	public int height;
-
-	public Rectangle (int x, int y, int width, int height) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	public int getHeight() {
-		return height;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/in/Shape.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/in/Shape.java
deleted file mode 100644
index fdc0e24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/in/Shape.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class Shape {
-	Rectangle fBounds;
-	Rectangle fInnerBounds;
-	
-	public int area() {
-		int width= fBounds.getWidth();
-		int height= fBounds.getHeight();
-		return width*height;
-	}
-	
-	public int filledArea() {
-		return area() -	fInnerBounds.getWidth() * fInnerBounds.getHeight();
-	}
-	
-	public boolean isSmallerThan(Rectangle rect) {
-		return area() < rect.getWidth() * rect.getHeight();
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/out/Rectangle.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/out/Rectangle.java
deleted file mode 100644
index d7b3b20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/out/Rectangle.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package p;
-
-public class Rectangle {
-	public int x;
-	public int y;
-	public int width;
-	public int height;
-
-	public Rectangle (int x, int y, int width, int height) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	public int getHeight() {
-		return height;
-	}
-
-	public boolean isSmallerThan(Shape shape) {
-		return shape.area() < getWidth() * getHeight();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/out/Shape.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/out/Shape.java
deleted file mode 100644
index cf0122b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test19/out/Shape.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package p;
-
-public class Shape {
-	Rectangle fBounds;
-	Rectangle fInnerBounds;
-	
-	public int area() {
-		int width= fBounds.getWidth();
-		int height= fBounds.getHeight();
-		return width*height;
-	}
-	
-	public int filledArea() {
-		return area() -	fInnerBounds.getWidth() * fInnerBounds.getHeight();
-	}
-	
-	public boolean isSmallerThan(Rectangle rect) {
-		return rect.isSmallerThan(this);
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/A.java
deleted file mode 100644
index 0faad9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-// Move mA1 to parameter b, inline delegator, remove delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(B b) {

-		b.mB1();

-		mA2();

-		b.mB2();

-		System.out.println(this);		

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/C.java
deleted file mode 100644
index 8a5c7bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/in/C.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p3;

-

-import p1.A;

-import p2.B;

-

-class C {

-	{

-		A a= new A();

-		a.m1A(new B());

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/A.java
deleted file mode 100644
index 0f4cec4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-// Move mA1 to parameter b, inline delegator, remove delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/B.java
deleted file mode 100644
index 9e98d3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/B.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-	

-	public void mA1(A a) {

-		mB1();

-		a.mA2();

-		mB2();

-		System.out.println(a);

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/C.java
deleted file mode 100644
index e7bacb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test2/out/C.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p3;

-

-import p1.A;

-import p2.B;

-

-class C {

-	{

-		A a= new A();

-		new B().m1A(a);

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/A.java
deleted file mode 100644
index 4a28847..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-
-public class A {
-	public static void main(String[] args) {
-		A a= new A();
-		B b= new B("Gugguseli");
-		a.print(b);
-	}
-
-	public void print(B b) {
-		System.out.println(
-			new StarDecorator() {
-				public String decorate(String in) {
-					return "(" + super.decorate(in) + ")";
-				}
-			}.decorate(b.toString())
-		);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/B.java
deleted file mode 100644
index 8af34a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/B.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-public class B {
-	private String fName;
-	
-	public B(String name) {
-		fName= name;
-	}
-		
-	public String toString() {
-		return fName;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/StarDecorator.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/StarDecorator.java
deleted file mode 100644
index 2bc37d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/in/StarDecorator.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class StarDecorator {
-	public String decorate(String in) {
-		return "*" + in + "*";
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/A.java
deleted file mode 100644
index 9018d9a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-public class A {
-	public static void main(String[] args) {
-		A a= new A();
-		B b= new B("Gugguseli");
-		a.print(b);
-	}
-
-	public void print(B b) {
-		b.print();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/B.java
deleted file mode 100644
index d7c8162..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/B.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-
-public class B {
-	private String fName;
-	
-	public B(String name) {
-		fName= name;
-	}
-		
-	public String toString() {
-		return fName;
-	}
-
-	public void print() {
-		System.out.println(
-			new StarDecorator() {
-				public String decorate(String in) {
-					return "(" + super.decorate(in) + ")";
-				}
-			}.decorate(toString())
-		);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/StarDecorator.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/StarDecorator.java
deleted file mode 100644
index 2bc37d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test20/out/StarDecorator.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class StarDecorator {
-	public String decorate(String in) {
-		return "*" + in + "*";
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/in/A.java
deleted file mode 100644
index 61c703e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-public class A {
-	Second s;
-	Second s2;
-	public void print() {
-		s.foo(s);
-		s.bar();
-		s.go(17, 18);
-
-		equals(this);
-		s.foo(s2);
-		s2.bar();
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/in/Second.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/in/Second.java
deleted file mode 100644
index 15a5b68..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/in/Second.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class Second {
-	public void foo(Second s) {
-		s.bar();
-	}
-
-	public void bar() {
-	}
-	
-	public void go(int i, int j) {
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/out/A.java
deleted file mode 100644
index e65e82b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-public class A {
-	Second s;
-	Second s2;
-	public void print() {
-		s.print(this);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/out/Second.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/out/Second.java
deleted file mode 100644
index 31e193c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test21/out/Second.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-class Second {
-	public void foo(Second s) {
-		s.bar();
-	}
-
-	public void bar() {
-	}
-	
-	public void go(int i, int j) {
-	}
-
-	public void print(A a) {
-		foo(this);
-		bar();
-		go(17, 18);
-	
-		a.equals(a);
-		foo(a.s2);
-		a.s2.bar();
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/in/A.java
deleted file mode 100644
index 25ad603..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class A {
-	Second s;
-	Second s2;
-	public void print() {
-		s.foo(s);
-		s.bar();
-		s.go(17, 18);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/in/Second.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/in/Second.java
deleted file mode 100644
index 76d195d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/in/Second.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class Second {
-	public void foo(Second s) {
-		s.bar();
-	}
-
-	public void bar() {
-	}
-	
-	public void go(int i, int j) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/out/A.java
deleted file mode 100644
index 119d5c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A {
-	Second s;
-	Second s2;
-	public void print() {
-		s.print();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/out/Second.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/out/Second.java
deleted file mode 100644
index 9aef244..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test22/out/Second.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class Second {
-	public void foo(Second s) {
-		s.bar();
-	}
-
-	public void bar() {
-	}
-	
-	public void go(int i, int j) {
-	}
-
-	public void print() {
-		foo(this);
-		bar();
-		go(17, 18);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/in/A.java
deleted file mode 100644
index 2eac327..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-public class A {
-	Second s;
-	Second s2;
-	public void print() {
-		s.foo(s);
-		int s= 17;
-		s= 18;
-		this.s.foo(s2);
-		this.s2.foo(this.s);
-		System.out.println(this.s.str);
-		this.getClass();
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/in/Second.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/in/Second.java
deleted file mode 100644
index 4462067..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/in/Second.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class Second {
-	public String str;
-	public void foo(Second s) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/out/A.java
deleted file mode 100644
index e65e82b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-public class A {
-	Second s;
-	Second s2;
-	public void print() {
-		s.print(this);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/out/Second.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/out/Second.java
deleted file mode 100644
index c9f4131..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test23/out/Second.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class Second {
-	public String str;
-	public void foo(Second s) {
-	}
-	public void print(A a) {
-		foo(this);
-		int s= 17;
-		s= 18;
-		foo(a.s2);
-		a.s2.foo(this);
-		System.out.println(str);
-		a.getClass();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/A.java
deleted file mode 100644
index 299b87b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p1;
-public class A {
-	public static void main(String[] args) {
-		A a= new A();
-		B b= new B("Gugguseli");
-		a.print(b);
-	}
-
-	public void print(B b) {
-		class StarDecorator1 extends StarDecorator{
-			public String decorate(String in) {
-				return "(" + super.decorate(in) + ")";
-			}
-		}
-		System.out.println(
-			new StarDecorator1().decorate(b.toString())
-		);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/B.java
deleted file mode 100644
index 92c1924..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/B.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p1;
-public class B {
-	private String fName;
-	
-	public B(String name) {
-		fName= name;
-	}
-		
-	public String toString() {
-		return fName;
-	}
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/StarDecorator.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/StarDecorator.java
deleted file mode 100644
index ea45227..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/in/StarDecorator.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p1;
-class StarDecorator {
-	public String decorate(String in) {
-		return "*" + in + "*";
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/A.java
deleted file mode 100644
index 7c025be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p1;
-public class A {
-	public static void main(String[] args) {
-		A a= new A();
-		B b= new B("Gugguseli");
-		a.print(b);
-	}
-
-	public void print(B b) {
-		b.print();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/B.java
deleted file mode 100644
index 90f75b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/B.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p1;
-public class B {
-	private String fName;
-	
-	public B(String name) {
-		fName= name;
-	}
-		
-	public String toString() {
-		return fName;
-	}
-
-	public void print() {
-		class StarDecorator1 extends StarDecorator{
-			public String decorate(String in) {
-				return "(" + super.decorate(in) + ")";
-			}
-		}
-		System.out.println(
-			new StarDecorator1().decorate(toString())
-		);
-	}
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/StarDecorator.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/StarDecorator.java
deleted file mode 100644
index ea45227..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test24/out/StarDecorator.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p1;
-class StarDecorator {
-	public String decorate(String in) {
-		return "*" + in + "*";
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/A.java
deleted file mode 100644
index 7b7b695..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-// Move mA1 to field fB, do not inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public B fB;

-	

-	public void mA1() {

-		fB.mB1();

-		mA2();

-		fB.mB2();

-		System.out.println(this);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/C.java
deleted file mode 100644
index 5e3e916..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/in/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p3;

-

-import p1.A;

-

-class C {

-	{

-		A a= new A();

-		a.mA1();

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/A.java
deleted file mode 100644
index 41d2b42..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-// Move mA1 to field fB, do not inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public B fB;

-	

-	public void mA1() {

-		fB.mA1(this);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/B.java
deleted file mode 100644
index a88c008..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/B.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-

-	public void mA1(A a) {

-		mB1();

-		a.mA2();

-		mB2();

-		System.out.println(a);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/C.java
deleted file mode 100644
index 5e3e916..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test3/out/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p3;

-

-import p1.A;

-

-class C {

-	{

-		A a= new A();

-		a.mA1();

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/A.java
deleted file mode 100644
index 93ec282..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-// Move mA1 to field fB, inline delegator, remove delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public B fB;

-	

-	public void mA1() {

-		fB.mB1();

-		mA2();

-		fB.mB2();

-		System.out.println(this);		

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/C.java
deleted file mode 100644
index 6e3fde3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/in/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p3;

-

-import p1.A;

-

-class C {

-	{

-		A a= new A();

-		a.m1A();

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/A.java
deleted file mode 100644
index 33f76bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-// Move mA1 to field fB, inline delegator, remove delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public B fB;

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/B.java
deleted file mode 100644
index 9e98d3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/B.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-	

-	public void mA1(A a) {

-		mB1();

-		a.mA2();

-		mB2();

-		System.out.println(a);

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/C.java
deleted file mode 100644
index e652b65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test4/out/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p3;

-

-import p1.A;

-

-class C {

-	{

-		A a= new A();

-		a.fB.m1A(a);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/in/A.java
deleted file mode 100644
index 3a1033a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/in/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-// Move mA1 to field fB, unqualified static member references are qualified

-package p1;

-

-import p2.B;

-

-public class A {

-	public static String fgHello= "Hello from A!";

-	

-	public B fB;

-	

-	public static void talk(B b) {

-		System.out.println("How are you?");

-	}

-	

-	public void mA1() {

-		System.out.println(fgHello);

-		talk(fB);

-		System.out.println(this);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/in/B.java
deleted file mode 100644
index 58042f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p2;

-

-public class B {

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/out/A.java
deleted file mode 100644
index c42dc5a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-// Move mA1 to field fB, unqualified static member references are qualified

-package p1;

-

-import p2.B;

-

-public class A {

-	public static String fgHello= "Hello from A!";

-	

-	public B fB;

-	

-	public static void talk(B b) {

-		System.out.println("How are you?");

-	}

-	

-	public void mA1() {

-		fB.mA1(this);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/out/B.java
deleted file mode 100644
index f23eb1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test5/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-

-	public void mA1(A a) {

-		System.out.println(A.fgHello);

-		A.talk(this);

-		System.out.println(a);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/in/B.java
deleted file mode 100644
index 7cfa088..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p2;

-public class B {

-	int b;

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/in/Nestor.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/in/Nestor.java
deleted file mode 100644
index c4f1649..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/in/Nestor.java
+++ /dev/null

@@ -1,15 +0,0 @@
-// class qualify referenced type name to top level, original receiver not used in method

-package p1;

-

-import p2.B;

-

-public class Nestor {

-	public static class Nestee {

-		public static int fgN;

-	}

-	

-	public void m(B b) {

-		Nestee n= null;

-		int i= Nestee.fgN;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/out/B.java
deleted file mode 100644
index 2e1ba31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p2;

-

-import p1.Nestor;

-

-public class B {

-	int b;

-

-	public void m() {

-		Nestor.Nestee n= null;

-		int i= Nestor.Nestee.fgN;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/out/Nestor.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/out/Nestor.java
deleted file mode 100644
index 4e208f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test6/out/Nestor.java
+++ /dev/null

@@ -1,14 +0,0 @@
-// class qualify referenced type name to top level, original receiver not used in method

-package p1;

-

-import p2.B;

-

-public class Nestor {

-	public static class Nestee {

-		public static int fgN;

-	}

-	

-	public void m(B b) {

-		b.m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/A.java
deleted file mode 100644
index fe0ba31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p1;

-

-import p2.B;

-import p3.N1;

-import p3.N1.N2.N3;

-

-public class A {

-	public void m(B b) {

-		N3 anN3= new N1().new N2().new N3();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/B.java
deleted file mode 100644
index 58042f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p2;

-

-public class B {

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/N1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/N1.java
deleted file mode 100644
index b57a23c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/in/N1.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p3;

-

-

-public class N1 {

-	public class N2 {

-		public class N3 {	

-		}

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/A.java
deleted file mode 100644
index 65ab6ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p1;

-

-import p2.B;

-import p3.N1;

-import p3.N1.N2.N3;

-

-public class A {

-	public void m(B b) {

-		b.m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/B.java
deleted file mode 100644
index 1ce7e6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p2;

-

-import p3.N1;

-import p3.N1.N2;

-import p3.N1.N2.N3;

-

-public class B {

-

-	public void m() {

-		N1.N2.N3 anN3= new N1().new N2().new N3();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/N1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/N1.java
deleted file mode 100644
index b57a23c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test7/out/N1.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p3;

-

-

-public class N1 {

-	public class N2 {

-		public class N3 {	

-		}

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/in/A.java
deleted file mode 100644
index e271c38..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	

-	public String foo= "foo";

-	

-	public Object m(B b) {

-		System.out.println(foo);

-		System.out.println(this.foo);

-		System.out.println(b.bar);

-		return null;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/in/B.java
deleted file mode 100644
index 3ad0a16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/in/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p2;

-

-public class B {

-	public String bar= "bar";

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/out/A.java
deleted file mode 100644
index 6670a84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	

-	public String foo= "foo";

-	

-	public Object m(B b) {

-		return b.m(this);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/out/B.java
deleted file mode 100644
index 16839c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test8/out/B.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-	public String bar= "bar";

-

-	public Object m(A a) {

-		System.out.println(a.foo);

-		System.out.println(a.foo);

-		System.out.println(bar);

-		return null;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/in/A.java
deleted file mode 100644
index 2bdc965..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(float j, B b, int foo, String bar) {

-		b.mB1();

-		mA2();

-		b.mB2();

-		System.out.println(this);

-		System.out.println(bar + j);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/out/A.java
deleted file mode 100644
index f10422a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(float j, B b, int foo, String bar) {

-		b.mA1(this, j, foo, bar);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/out/B.java
deleted file mode 100644
index 9eb376c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/canMove/test9/out/B.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p2;

-

-import p1.A;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-

-	public void mA1(A a, float j, int foo, String bar) {

-		mB1();

-		a.mA2();

-		mB2();

-		System.out.println(a);

-		System.out.println(bar + j);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail0/in/IA.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail0/in/IA.java
deleted file mode 100644
index 1687a31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail0/in/IA.java
+++ /dev/null

@@ -1,8 +0,0 @@
-

-package p1;

-

-public interface IA {

-	public void m1A(B b);

-}

-

-class B {}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail1/in/A.java
deleted file mode 100644
index e000705..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail1/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-

-package p1;

-

-public abstract class A {

-	public abstract void m1A(B b);

-}

-

-class B {}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/A.java
deleted file mode 100644
index b43bae7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-// Move mA1 to parameter b, do not inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	String s= "";

-	public void mA1() {

-		B b= null;

-		b.mB1();

-		mA2(); //test comment

-		b.mB2();

-		System.out.println(this);

-		System.out.println(s);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/C.java
deleted file mode 100644
index 8a5c7bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail10/in/C.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p3;

-

-import p1.A;

-import p2.B;

-

-class C {

-	{

-		A a= new A();

-		a.m1A(new B());

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail11/in/A.java
deleted file mode 100644
index d1b0603..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail11/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-// Move mA1 to parameter b, do not inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1(B b, int a) {

-		mA2();

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail11/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail11/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail11/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail12/in/A.java
deleted file mode 100644
index a5be4d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail12/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-// Move foobar
-package p1;
-class A {
-	
-	void foobar(String param, String param) {
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail2/in/A.java
deleted file mode 100644
index 31063b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail2/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public static int m(B b) {

-		return 0;

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail2/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail2/in/B.java
deleted file mode 100644
index c055114..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail2/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p2;

-

-public class B {}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail3/in/A.java
deleted file mode 100644
index ca1c37d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail3/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public native int m(B b);

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail3/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail3/in/B.java
deleted file mode 100644
index c055114..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail3/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p2;

-

-public class B {}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail4/in/A.java
deleted file mode 100644
index 063b593..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail4/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public int foob() {

-		return 1;	

-	}

-	

-	public static Child extends A {

-		public int m(B b) {

-			return super.foob();

-		}

-		

-		public int foob() {

-			return 2;	

-		}

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail4/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail4/in/B.java
deleted file mode 100644
index c055114..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail4/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p2;

-

-public class B {}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail5/in/A.java
deleted file mode 100644
index 2b87c26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail5/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	

-	public class Inner {

-		public void m(B b) {

-			System.out.println(A.this);

-		}	

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail5/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail5/in/B.java
deleted file mode 100644
index c055114..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail5/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p2;

-

-public class B {}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail6/in/A.java
deleted file mode 100644
index 70f27c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail6/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public int m(B b) {

-		return m(b);

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail6/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail6/in/B.java
deleted file mode 100644
index c055114..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail6/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p2;

-

-public class B {}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail7/in/A.java
deleted file mode 100644
index 86a42c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail7/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p1;

-

-public class A {

-	public int foo() {

-		class P {

-

-		};		

-		class O {

-			public void m(P p) {

-			}

-		};

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail8/in/A.java
deleted file mode 100644
index 93c36c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail8/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p1;

-

-import p2.B;

-

-public class A {

-	public synchronized int m(B b) {

-		return 0;

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail8/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail8/in/B.java
deleted file mode 100644
index c055114..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail8/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p2;

-

-public class B {}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/A.java
deleted file mode 100644
index 4f897f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-// Move mA1 to parameter b, do not inline delegator

-package p1;

-

-import p2.B;

-

-public class A {

-	public void mA1() {

-		B b= null;

-		b.mB1();

-		mA2(); //test comment

-		b.mB2();

-		System.out.println(this);

-	}

-	

-	public void mA2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/B.java
deleted file mode 100644
index e1a2f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-

-public class B {

-	public void mB1() {}

-	

-	public void mB2() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/C.java
deleted file mode 100644
index 8a5c7bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveInstanceMethod/cannotMove/testFail9/in/C.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p3;

-

-import p1.A;

-import p2.B;

-

-class C {

-	{

-		A a= new A();

-		a.m1A(new B());

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/in/A.java
deleted file mode 100644
index ae575ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/out/A.java
deleted file mode 100644
index 14904a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-public class A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/out/B.java
deleted file mode 100644
index a7dfd85..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test0/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class B{

-

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/in/A.java
deleted file mode 100644
index 9e3de83..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Set;

-public class A {

-	public static Set set;

-	public static List m() {

-		return new ArrayList(set);

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/out/A.java
deleted file mode 100644
index e90d632..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-import java.util.Set;

-public class A {

-	public static Set set;

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/out/B.java
deleted file mode 100644
index c64b134..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test1/out/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-

-import java.util.ArrayList;

-import java.util.List;

-

-class B{

-

-	public static List m() {

-		return new ArrayList(A.set);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/in/A.java
deleted file mode 100644
index ba9f5b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-public class A{

-	public static void m(){

-		A.m1();

-	}

-	public static void m1(){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/out/A.java
deleted file mode 100644
index a3b5f24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-public class A{

-	public static void m1(){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/out/B.java
deleted file mode 100644
index 59958dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test10/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class B{

-

-	public static void m(){

-		A.m1();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/in/A.java
deleted file mode 100644
index 1356107..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static int F;

-	public static void m(){

-		A.F= 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/out/A.java
deleted file mode 100644
index 8c30fb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static int F;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/out/B.java
deleted file mode 100644
index a584fbf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test11/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class B{

-

-	public static void m(){

-		A.F= 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/in/A.java
deleted file mode 100644
index e59ded1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static int F;

-	public static void m(){

-		F= 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/out/A.java
deleted file mode 100644
index 8c30fb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static int F;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/out/B.java
deleted file mode 100644
index a584fbf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test12/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class B{

-

-	public static void m(){

-		A.F= 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/in/A.java
deleted file mode 100644
index b2f4a07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-	public static void m(){

-		new A.Inner();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/out/A.java
deleted file mode 100644
index 14c9ee2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/out/B.java
deleted file mode 100644
index e8af359..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test13/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-

-import p.A.Inner;

-

-class B{

-

-	public static void m(){

-		new A.Inner();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/in/A.java
deleted file mode 100644
index ceaccc9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-	public static void m(){

-		new Inner();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/out/A.java
deleted file mode 100644
index 14c9ee2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/out/B.java
deleted file mode 100644
index e8af359..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test14/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-

-import p.A.Inner;

-

-class B{

-

-	public static void m(){

-		new A.Inner();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/in/A.java
deleted file mode 100644
index 404ca2e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;

-public class A{

-	public static int F;

-	public static void m(){

-		F= 0;

-		new A().F= 0;

-		new A().i().F= 0;

-		new A().i().i().F= 0;

-	}

-	A i(){

-		return this;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/out/A.java
deleted file mode 100644
index 681c18a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static int F;

-	A i(){

-		return this;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/out/B.java
deleted file mode 100644
index 1e82633..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test15/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-class B{

-

-	public static void m(){

-		A.F= 0;

-		A.F= 0;

-		A.F= 0;

-		A.F= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/in/A.java
deleted file mode 100644
index 806a299..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;

-public class A{

-	public static A F;

-	public static void m(){

-		F= null;

-		new A().F= null;

-		new A().i().F= null;

-		new A().i().i().F= null;

-		F.F= null;

-		F.F.F= null;

-	}

-	A i(){

-		return this;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/out/A.java
deleted file mode 100644
index a58c4bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static A F;

-	A i(){

-		return this;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/out/B.java
deleted file mode 100644
index 1b85e54..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test16/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;

-class B{

-

-	public static void m(){

-		A.F= null;

-		A.F= null;

-		A.F= null;

-		A.F= null;

-		A.F= null;

-		A.F= null;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/in/A.java
deleted file mode 100644
index 26178a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-	public static void m(){

-		Inner[] i;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/out/A.java
deleted file mode 100644
index 14c9ee2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/out/B.java
deleted file mode 100644
index 0f8a421..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test17/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-

-import p.A.Inner;

-

-class B{

-

-	public static void m(){

-		A.Inner[] i;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/in/A.java
deleted file mode 100644
index cf3588b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-	public static void m(){

-		A.Inner[] i;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/out/A.java
deleted file mode 100644
index 14c9ee2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/out/B.java
deleted file mode 100644
index 0f8a421..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test18/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-

-import p.A.Inner;

-

-class B{

-

-	public static void m(){

-		A.Inner[] i;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/in/A.java
deleted file mode 100644
index 919c883..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-	public static void m(){

-		Inner[][] i;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/out/A.java
deleted file mode 100644
index 14c9ee2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static class Inner{}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/out/B.java
deleted file mode 100644
index e2c6f2d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test19/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-

-import p.A.Inner;

-

-class B{

-

-	public static void m(){

-		A.Inner[][] i;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/in/A.java
deleted file mode 100644
index f434210..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-public class A{

-	public static void m(){

-		B.n();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/in/B.java
deleted file mode 100644
index c543866..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/in/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class B{

-	public static void n(){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/out/A.java
deleted file mode 100644
index 14904a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-public class A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/out/B.java
deleted file mode 100644
index 10195e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test2/out/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-class B{

-	public static void n(){

-	}

-

-	public static void m(){

-		n();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/in/A.java
deleted file mode 100644
index 67de40a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;

-public class A{

-	public static class F{}

-	public static void m(){

-		A.F[] y;

-		F[] ff;

-		F[ ] ff1;

-		F[][] fff;

-		A.F[][] fff1;

-		p.A.F[ ][ ] fff2;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/out/A.java
deleted file mode 100644
index d178a55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static class F{}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/out/B.java
deleted file mode 100644
index 48e422a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test20/out/B.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;

-

-import p.A.F;

-

-class B{

-

-	public static void m(){

-		A.F[] y;

-		A.F[] ff;

-		A.F[ ] ff1;

-		A.F[][] fff;

-		A.F[][] fff1;

-		p.A.F[ ][ ] fff2;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/in/A.java
deleted file mode 100644
index 51b8561..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-public class A{

-	private static int F;

-	public static int i= F;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/out/A.java
deleted file mode 100644
index 14904a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-public class A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/out/B.java
deleted file mode 100644
index b2483cb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test21/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class B{

-

-	private static int F;

-	public static int i= F;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/in/A.java
deleted file mode 100644
index e8c4c79..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-public class A{

-	public static A i;

-	public static A i2;

-	void f(){

-		A.i.i2= null;

-	}

-	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/out/A.java
deleted file mode 100644
index 0869e52..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-public class A{

-	public static A i2;

-	void f(){

-		B.i.i2= null;

-	}

-	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/out/B.java
deleted file mode 100644
index aeaac1f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test22/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class B{

-

-	public static A i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/in/A.java
deleted file mode 100644
index 5f59bfb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public interface A{

-	public static final int FRED= 1;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/in/B.java
deleted file mode 100644
index 3b0ee3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-interface B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/A.java
deleted file mode 100644
index 37ca4f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-public interface A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/B.java
deleted file mode 100644
index 836ccc9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test23/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-interface B{

-

-	public static final int FRED= 1;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/in/A.java
deleted file mode 100644
index 446ea60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public interface A{

-	public final int FRED= 1;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/in/B.java
deleted file mode 100644
index 3b0ee3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-interface B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/A.java
deleted file mode 100644
index 37ca4f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-public interface A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/B.java
deleted file mode 100644
index e11191d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test24/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-interface B{

-

-	public final int FRED= 1;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/in/A.java
deleted file mode 100644
index 9ba964c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class A{
-	public static final int[] FRED= {1};
-	void f(){
-		int i= A.FRED.length;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/in/B.java
deleted file mode 100644
index d110d65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/out/A.java
deleted file mode 100644
index c01e090..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class A{
-	void f(){
-		int i= B.FRED.length;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/out/B.java
deleted file mode 100644
index 59969db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test25/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class B{
-
-	public static final int[] FRED= {1};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/in/A.java
deleted file mode 100644
index 89831ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import java.util.List;
-
-public class A{
-	public static void n(){
-		List l;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/in/B.java
deleted file mode 100644
index 66189b1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package r;
-public class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/A.java
deleted file mode 100644
index 6d7cf60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-
-public class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/B.java
deleted file mode 100644
index 955ab4e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test26/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package r;
-
-import java.util.List;
-
-public class B{
-
-	public static void n(){
-		List l;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/in/A.java
deleted file mode 100644
index df1078e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-public class A{
-	public static void n(){
-	}
-	public static void m() {
-		n();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/in/B.java
deleted file mode 100644
index 66189b1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package r;
-public class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/out/A.java
deleted file mode 100644
index 7a383b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import r.B;
-
-public class A{
-	public static void m() {
-		B.n();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/out/B.java
deleted file mode 100644
index 30e5d69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test27/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package r;
-public class B{
-
-	public static void n(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/in/A.java
deleted file mode 100644
index 73e05e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-public class A{
-	public static void m() {
-		n();
-	}
-	public static void n() {
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/in/B.java
deleted file mode 100644
index d110d65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/out/A.java
deleted file mode 100644
index a07a93c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/out/B.java
deleted file mode 100644
index be0fd3d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test28/out/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class B{
-
-	public static void m() {
-		n();
-	}
-
-	public static void n() {
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/in/A.java
deleted file mode 100644
index 4599449..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class A {
-	// Garbage code;
-	static void m() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/in/B.java
deleted file mode 100644
index 2558bd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class B {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/out/A.java
deleted file mode 100644
index c75c639..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/out/B.java
deleted file mode 100644
index e3939ea..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test29/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class B {
-
-	// Garbage code;
-	static void m() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/in/A.java
deleted file mode 100644
index e71937a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-	public static void n(){

-		A.m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/out/A.java
deleted file mode 100644
index 54263d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-public class A{

-	public static void n(){

-		B.m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/out/B.java
deleted file mode 100644
index a7dfd85..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test3/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class B{

-

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/in/A.java
deleted file mode 100644
index 4b26b31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class A {
-	public final static String id= "Thing.id"; //$NON-NLS-1$
-	public final static String odd= "Thing.odd"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/in/B.java
deleted file mode 100644
index 2558bd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class B {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/out/A.java
deleted file mode 100644
index d961378..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A {
-	public final static String odd= "Thing.odd"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/out/B.java
deleted file mode 100644
index 11e6396..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test30/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class B {
-
-	public final static String id= "Thing.id"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/in/A.java
deleted file mode 100644
index 4b26b31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class A {
-	public final static String id= "Thing.id"; //$NON-NLS-1$
-	public final static String odd= "Thing.odd"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/in/B.java
deleted file mode 100644
index 2558bd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class B {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/out/A.java
deleted file mode 100644
index 8c635be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A {
-	public final static String id= "Thing.id"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/out/B.java
deleted file mode 100644
index b145420..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test31/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class B {
-
-	public final static String odd= "Thing.odd"; //$NON-NLS-1$
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test32/in/A.java
deleted file mode 100644
index 66ba095..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test32/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-public class A {
-	
-	static void abc() {
-	}
-	//Garbage code;
-	
-	//Is this comment retained somewhere?
-	
-	static void m() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test32/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test32/in/B.java
deleted file mode 100644
index 2558bd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test32/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class B {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/in/A.java
deleted file mode 100644
index 3d9af8d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public interface A{
-	public static final int i= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/in/B.java
deleted file mode 100644
index 3e51795..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/out/A.java
deleted file mode 100644
index 9d652f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public interface A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/out/B.java
deleted file mode 100644
index c542761..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test33/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class B{
-
-	public static final int i= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/in/A.java
deleted file mode 100644
index 304622b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A{
-	public static final int i= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/in/B.java
deleted file mode 100644
index dd7fb19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface B{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/A.java
deleted file mode 100644
index 4b3bee2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/B.java
deleted file mode 100644
index b5e3dad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test34/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-interface B{
-
-	public static final int i= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/A.java
deleted file mode 100644
index 0b322c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public interface A{
-	public int i= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/B.java
deleted file mode 100644
index 54deb26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class B{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/A.java
deleted file mode 100644
index 9d652f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public interface A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/B.java
deleted file mode 100644
index a500360..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-public class B{
-
-	public static final int i= 0;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/in/A.java
deleted file mode 100644
index b2bc28c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-public class A {
-	public static class I {
-		public I(I other) {
-			a= new A();
-		}
-		public static class J {
-			static int bla;
-			int x() {return 1;}
-		}
-	}
-	public static A a;
-	public A.I i;
-	{
-		i= new A.I(i);
-		int blub= I.J.bla + new I.J().x();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/in/B.java
deleted file mode 100644
index 54deb26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-public class B{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/out/A.java
deleted file mode 100644
index a879eb8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-public class A {
-	public static A a;
-	public B.I i;
-	{
-		i= new B.I(i);
-		int blub= B.I.J.bla + new B.I.J().x();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/out/B.java
deleted file mode 100644
index 02e64a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test36/out/B.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-public class B{
-
-	public static class I {
-		public I(I other) {
-			A.a= new A();
-		}
-		public static class J {
-			static int bla;
-			int x() {return 1;}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/in/A.java
deleted file mode 100644
index 5135075..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-public class A {
-	Inner i;
-	A.Inner ii;
-	p.A.Inner iii;
-	static class Inner {
-		Inner buddy;
-		public Inner(A.Inner other) {
-			buddy= other;
-		}
-	}
-}
-
-class AA {
-	A.Inner Inner;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/in/B.java
deleted file mode 100644
index c6fcfcb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class B {
-	A.Inner iFromB;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/out/A.java
deleted file mode 100644
index 52a504a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class A {
-	B.Inner i;
-	B.Inner ii;
-	p.B.Inner iii;
-}
-
-class AA {
-	B.Inner Inner;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/out/B.java
deleted file mode 100644
index a8b0d51..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test37/out/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-public class B {
-	static class Inner {
-		Inner buddy;
-		public Inner(B.Inner other) {
-			buddy= other;
-		}
-	}
-
-	B.Inner iFromB;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/in/A.java
deleted file mode 100644
index f5ae055..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-public class A {
-	Inner i;
-	A.Inner ii;
-	p.A.Inner iii;
-	public static class Inner {
-		Inner buddy;
-		public Inner(Inner other) {
-			buddy= other;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/in/B.java
deleted file mode 100644
index a6832f3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package r;
-
-public class B {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/out/A.java
deleted file mode 100644
index 768622d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-import r.B;
-
-public class A {
-	B.Inner i;
-	B.Inner ii;
-	r.B.Inner iii;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/out/B.java
deleted file mode 100644
index 1aa9f16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test38/out/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package r;
-
-public class B {
-
-	public static class Inner {
-		Inner buddy;
-		public Inner(Inner other) {
-			buddy= other;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/A.java
deleted file mode 100644
index bfb0de3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-import other.C; //(-import)
-
-public class A {
-	Inner i; //+import r.B.Inner
-	A.Inner ii; //+import r.B
-	p.A.Inner iii;
-	public static int a;
-	public static class Inner { //move to r.B
-		Inner buddy;
-		public Inner(A.Inner other) {
-					// ^ is direct access to enclosing type
-			buddy= C.ii; //+import other.C
-			int ia= a;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/B.java
deleted file mode 100644
index 1d74f75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package r;
-
-import p.A; //(-import)
-import p.A.Inner; //-import (invalid)
-
-public class B {
-	Inner iFromB; //->Inner
-	A.Inner iiFromB; //->Inner
-	p.A.Inner iiiFromB; //->Inner
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/C.java
deleted file mode 100644
index 44dbb1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test39/in/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package other;
-
-import p.A; //(-import)
-
-public class C {
-	public static A.Inner ii; //+import r.B
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/in/A.java
deleted file mode 100644
index d1174c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-	public void n(){

-		A.m();

-		p.A.m();

-		m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/out/A.java
deleted file mode 100644
index 97cb8dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-public class A{

-	public void n(){

-		B.m();

-		p.B.m();

-		B.m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/out/B.java
deleted file mode 100644
index a7dfd85..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test4/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class B{

-

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/in/A.java
deleted file mode 100644
index 4ab2ede..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/in/A.java
+++ /dev/null

@@ -1,36 +0,0 @@
-package p;
-/**
- * @see p.A
- * @see #m()
- * @see A#m()
- * @see p.A#m()
- * @see #f
- * @see A#f
- * @see p.A#f
- */
-public class A{
-	public A() {
-		m();
-		f= A.f;
-	}
-	
-	/**
-	 * @see A
-	 * @see p.A
-	 * @see #m()
-	 * @see A#m()
-	 * @see p.A#m()
-	 */
-	public static void m(){
-		A.m();
-		m();
-		f= A.f;
-	}
-	
-	/**
-	 * @see #f
-	 * @see A#f
-	 * @see p.A#f
-	 */
-	public static int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/in/B.java
deleted file mode 100644
index 14ec6a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/in/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-/**
- * @see A
- * @see p.A
- * @see p.A#m()
- * @see p.A#f
- */
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/out/A.java
deleted file mode 100644
index 1584999..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-/**
- * @see p.A
- * @see B#m()
- * @see B#m()
- * @see p.B#m()
- * @see B#f
- * @see B#f
- * @see p.B#f
- */
-public class A{
-	public A() {
-		B.m();
-		B.f= B.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/out/B.java
deleted file mode 100644
index 64bf4a8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test40/out/B.java
+++ /dev/null

@@ -1,29 +0,0 @@
-package p;
-/**
- * @see A
- * @see p.A
- * @see p.B#m()
- * @see p.B#f
- */
-class B{
-
-	/**
-	 * @see #f
-	 * @see B#f
-	 * @see p.B#f
-	 */
-	public static int f;
-
-	/**
-	 * @see A
-	 * @see p.A
-	 * @see #m()
-	 * @see B#m()
-	 * @see p.B#m()
-	 */
-	public static void m(){
-		B.m();
-		m();
-		f= B.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/in/A.java
deleted file mode 100644
index 8906b81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/in/A.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package p;
-/**
- * @see p.A
- * @see #m()
- * @see A#m()
- * @see p.A#m()
- * @see #f
- * @see A#f
- * @see p.A#f
- */
-public class A{
-	public A() {
-		m();
-		f= A.f;
-	}
-	
-	/**
-	 * @see A
-	 * @see p.A
-	 * @see #m()
-	 * @see A#m()
-	 * @see p.A#m()
-	 * @see #f
-	 * @see A#f
-	 * @see p.A#f
-	 */
-	public static void m(){
-		A.m();
-		m();
-		f= A.f;
-	}
-	
-	/**
-	 * @see #f
-	 * @see A#f
-	 * @see p.A#f
-	 */
-	public static int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/in/B.java
deleted file mode 100644
index 14ec6a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/in/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-/**
- * @see A
- * @see p.A
- * @see p.A#m()
- * @see p.A#f
- */
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/out/A.java
deleted file mode 100644
index fe6cc39..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/out/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-/**
- * @see p.A
- * @see B#m()
- * @see B#m()
- * @see p.B#m()
- * @see #f
- * @see A#f
- * @see p.A#f
- */
-public class A{
-	public A() {
-		B.m();
-		f= A.f;
-	}
-	
-	/**
-	 * @see #f
-	 * @see A#f
-	 * @see p.A#f
-	 */
-	public static int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/out/B.java
deleted file mode 100644
index 907c9dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test41/out/B.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package p;
-/**
- * @see A
- * @see p.A
- * @see p.B#m()
- * @see p.A#f
- */
-class B{
-
-	/**
-	 * @see A
-	 * @see p.A
-	 * @see #m()
-	 * @see B#m()
-	 * @see p.B#m()
-	 * @see A#f
-	 * @see A#f
-	 * @see p.A#f
-	 */
-	public static void m(){
-		B.m();
-		m();
-		A.f= A.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/in/A.java
deleted file mode 100644
index b7b65dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-public class A{

-	public static A f;

-	public void n(){

-		f= null;

-		A.f= null;

-		p.A.f= null;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/out/A.java
deleted file mode 100644
index 10339d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-public class A{

-	public void n(){

-		B.f= null;

-		B.f= null;

-		p.B.f= null;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/out/B.java
deleted file mode 100644
index f26b17f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test5/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class B{

-

-	public static A f;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/in/A.java
deleted file mode 100644
index 60a03d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-public class A{

-	public static int[] f;

-	public void n(){

-		f[0]= 0;

-		A.f[0]= 0;

-		p.A.f[0]= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/out/A.java
deleted file mode 100644
index 7246887..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-public class A{

-	public void n(){

-		B.f[0]= 0;

-		B.f[0]= 0;

-		p.B.f[0]= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/out/B.java
deleted file mode 100644
index 2581158..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test6/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class B{

-

-	public static int[] f;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/in/A.java
deleted file mode 100644
index ad38388..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-public class A{

-	public static int f;

-	public void n(){

-		f= 0;

-		A.f= 0;

-		p.A.f= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/out/A.java
deleted file mode 100644
index add690f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-public class A{

-	public void n(){

-		B.f= 0;

-		B.f= 0;

-		p.B.f= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/out/B.java
deleted file mode 100644
index f2968da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test7/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class B{

-

-	public static int f;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/in/A.java
deleted file mode 100644
index 61c4dc0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static int f;

-	public void n(){

-		f= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/in/B.java
deleted file mode 100644
index ce1c83c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package r;

-public class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/out/A.java
deleted file mode 100644
index beed3a9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-

-import r.B;

-

-public class A{

-	public void n(){

-		B.f= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/out/B.java
deleted file mode 100644
index 555ac4e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test8/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package r;

-public class B{

-

-	public static int f;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/in/A.java
deleted file mode 100644
index bc333f9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-public class A{

-	public static void m(){

-		m1();

-	}

-	public static void m1(){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/out/A.java
deleted file mode 100644
index a3b5f24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-public class A{

-	public static void m1(){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/out/B.java
deleted file mode 100644
index 59958dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test9/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class B{

-

-	public static void m(){

-		A.m1();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail0/in/A.java
deleted file mode 100644
index ae575ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail0/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail0/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail0/in/B.java
deleted file mode 100644
index 7f1fd4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail0/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class X{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail1/in/A.java
deleted file mode 100644
index ae575ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail1/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail1/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail1/in/B.java
deleted file mode 100644
index e50e6fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail1/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B{

-	class X{}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail10/in/A.java
deleted file mode 100644
index e517b90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail10/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static void m(){

-		A.F= 0;

-	}

-	private static int F;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail10/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail10/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail10/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail11/in/A.java
deleted file mode 100644
index 51b8561..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail11/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-public class A{

-	private static int F;

-	public static int i= F;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail11/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail11/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail11/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail12/in/A.java
deleted file mode 100644
index 551ebad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail12/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-public class A{

-	private static int m(){ return 1;};

-	public static int i= m();

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail12/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail12/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail12/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail13/in/A.java
deleted file mode 100644
index 551ebad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail13/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-public class A{

-	private static int m(){ return 1;};

-	public static int i= m();

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail13/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail13/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail13/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail14/in/A.java
deleted file mode 100644
index 470a151..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail14/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-public class A{

-	private static int i;

-	public static int F= i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail14/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail14/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail14/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail15/in/A.java
deleted file mode 100644
index 8dd646c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail15/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static native void m();

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail15/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail15/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail15/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail16/in/A.java
deleted file mode 100644
index 61c4dc0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail16/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static int f;

-	public void n(){

-		f= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail16/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail16/in/B.java
deleted file mode 100644
index 8cedd36..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail16/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package r;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail17/in/A.java
deleted file mode 100644
index ae575ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail17/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail17/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail17/in/B.java
deleted file mode 100644
index 7f1fd4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail17/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class X{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail18/in/A.java
deleted file mode 100644
index ae575ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail18/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail18/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail18/in/B.java
deleted file mode 100644
index 7f1fd4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail18/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class X{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail19/in/A.java
deleted file mode 100644
index ae575ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail19/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail19/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail19/in/B.java
deleted file mode 100644
index 3b0ee3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail19/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-interface B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail2/in/A.java
deleted file mode 100644
index ae575ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail2/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail2/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail2/in/B.java
deleted file mode 100644
index 472d4e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail2/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B{

-	public static void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail21/in/A.java
deleted file mode 100644
index 77a7078..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail21/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public interface A{

-	static void m();

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail21/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail21/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail21/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail24/in/A.java
deleted file mode 100644
index 80582ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail24/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public interface A{

-	public void m();

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail24/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail24/in/B.java
deleted file mode 100644
index 3b0ee3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail24/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-interface B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail3/in/A.java
deleted file mode 100644
index 8b596a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail3/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(int i, int j){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail3/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail3/in/B.java
deleted file mode 100644
index a32ef23..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail3/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B{

-	void m(int i, int j){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail4/in/A.java
deleted file mode 100644
index 8b596a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail4/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(int i, int j){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail4/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail4/in/B.java
deleted file mode 100644
index f5203f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail4/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B{

-	void m(int i, boolean j){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail5/in/A.java
deleted file mode 100644
index 8b596a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail5/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static void m(int i, int j){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail5/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail5/in/B.java
deleted file mode 100644
index 5ad2158..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail5/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B{

-	int m(int i, boolean j){ return 0;}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail6/in/A.java
deleted file mode 100644
index e329962..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail6/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static int i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail6/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail6/in/B.java
deleted file mode 100644
index eb75024..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail6/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B{

-	public static int i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail7/in/A.java
deleted file mode 100644
index e329962..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail7/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static int i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail7/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail7/in/B.java
deleted file mode 100644
index 6956889..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail7/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B{

-	int i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail8/in/A.java
deleted file mode 100644
index e329962..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail8/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-public class A{

-	public static int i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail8/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail8/in/B.java
deleted file mode 100644
index 4587b16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail8/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B{

-	Object i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail9/in/A.java
deleted file mode 100644
index c328d05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail9/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-public class A{

-	public static void m(){

-		A.f();

-	}

-	private static void f(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail9/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail9/in/B.java
deleted file mode 100644
index fb99727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/testFail9/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p1/A.java
deleted file mode 100644
index c289c87..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p1/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p1;

-import p2.C;

-public class A{

-	C c;

-	p2.C p2c;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p1/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p1/B.java
deleted file mode 100644
index deb429c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p1/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p1;

-import p2.C;

-public class B{

-	C c;

-	p2.C m(C C, A A){

-		return C;

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p2/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p2/C.java
deleted file mode 100644
index 781f2ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/in/p2/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p2;

-import p1.A;

-import p1.*;

-import p1.B;

-public class C{

-	A a;

-	p1.A p1a;

-	B b;

-	p1.B p1B;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/A.java
deleted file mode 100644
index 6a6e418..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p2;

-public class A{

-	C c;

-	p2.C p2c;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/B.java
deleted file mode 100644
index c2b9f89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-public class B{

-	C c;

-	p2.C m(C C, A A){

-		return C;

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/C.java
deleted file mode 100644
index 9254329..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test0/out/p2/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p2;

-import p1.*;

-public class C{

-	A a;

-	p2.A p1a;

-	B b;

-	p2.B p1B;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p1/A.java
deleted file mode 100644
index c289c87..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p1/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p1;

-import p2.C;

-public class A{

-	C c;

-	p2.C p2c;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p1/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p1/B.java
deleted file mode 100644
index c8cdd28..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p1/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p1;

-import p2.C;

-public class B{

-	C c;

-	p2.C m(C C, p1.A A){

-		return C;

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p2/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p2/C.java
deleted file mode 100644
index 4a660d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/in/p2/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p2;

-import p1.A;

-import p1.*;

-import p1.B;

-public class C{

-	A a;

-	p1.A p1a;

-	B b;

-	p1.B p3B;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/A.java
deleted file mode 100644
index 6a6e418..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p2;

-public class A{

-	C c;

-	p2.C p2c;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/B.java
deleted file mode 100644
index efb2fb9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p2;

-public class B{

-	C c;

-	p2.C m(C C, p2.A A){

-		return C;

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/C.java
deleted file mode 100644
index 732913c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test1/out/p2/C.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p2;

-import p1.*;

-public class C{

-	A a;

-	p2.A p1a;

-	B b;

-	p2.B p3B;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p1/A.java
deleted file mode 100644
index 8203d86..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p1/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p1;

-import p2.C;

-public class A{

-	C c;

-	B b;

-	p1.B p1B;

-	p2.C p2c;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p1/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p1/B.java
deleted file mode 100644
index 8bdc298..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p1/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p1;

-import p2.C;

-public class B{

-	C c;

-	p1.A p1A;

-	p2.C m(C C, A A){

-		return C;

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p2/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p2/C.java
deleted file mode 100644
index 781f2ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/in/p2/C.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p2;

-import p1.A;

-import p1.*;

-import p1.B;

-public class C{

-	A a;

-	p1.A p1a;

-	B b;

-	p1.B p1B;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p1/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p1/B.java
deleted file mode 100644
index 937e954..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p1/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p1;

-import p2.A;

-import p2.C;

-public class B{

-	C c;

-	p2.A p1A;

-	p2.C m(C C, A A){

-		return C;

-	}	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p2/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p2/A.java
deleted file mode 100644
index 02251d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p2/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p2;

-import p1.B;

-public class A{

-	C c;

-	B b;

-	p1.B p1B;

-	p2.C p2c;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p2/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p2/C.java
deleted file mode 100644
index 5df9c3c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test2/out/p2/C.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p2;

-import p1.*;

-import p1.B;

-public class C{

-	A a;

-	p2.A p1a;

-	B b;

-	p1.B p1B;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p1/Outer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p1/Outer.java
deleted file mode 100644
index 3a14cd8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p1/Outer.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p1;
-public class Outer {
-    public class Inner1{}
-    public class Inner2{}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p1/empty.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p1/empty.txt
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p1/empty.txt
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p2/empty.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p2/empty.txt
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p2/empty.txt
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p3/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p3/Test.java
deleted file mode 100644
index e2d357d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/in/p3/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p3;
-
-import p1.Outer;
-import p1.Outer.Inner1;
-import p1.Outer.Inner2;
-
-public class Test {
-    Inner1 s;
-    Inner2 i;
-    Outer v;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p1/empty.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p1/empty.txt
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p1/empty.txt
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p2/Outer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p2/Outer.java
deleted file mode 100644
index 9af3bf3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p2/Outer.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p2;
-public class Outer {
-    public class Inner1{}
-    public class Inner2{}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p2/empty.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p2/empty.txt
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p2/empty.txt
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p3/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p3/Test.java
deleted file mode 100644
index 2038873..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MultiMove/test3/out/p3/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p3;
-
-import p2.Outer;
-import p2.Outer.Inner1;
-import p2.Outer.Inner2;
-
-public class Test {
-    Inner1 s;
-    Inner2 i;
-    Outer v;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/in/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/in/B.java
deleted file mode 100644
index d110d65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/out/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/out/B.java
deleted file mode 100644
index 4371f2c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test0/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class B{
-	class A{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/in/A.java
deleted file mode 100644
index 624128b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int y;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/in/B.java
deleted file mode 100644
index d110d65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/out/A.java
deleted file mode 100644
index 624128b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int y;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/out/B.java
deleted file mode 100644
index cdeb008..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test2/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class B{
-
-	int y;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/in/A.java
deleted file mode 100644
index e023a32..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-import java.lang.*;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/in/B.java
deleted file mode 100644
index 98313ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-import java.awt.*;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/out/A.java
deleted file mode 100644
index e023a32..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-import java.lang.*;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/out/B.java
deleted file mode 100644
index d446881..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test3/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-import java.awt.*;
-import java.lang.*;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/in/A.java
deleted file mode 100644
index 4bbce3a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	void f(){
-	}
-	
-	void f1(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/in/B.java
deleted file mode 100644
index 7a7c5ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-import java.awt.*;
-
-import java.lang.*;
-
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/out/A.java
deleted file mode 100644
index 7134157..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	void f(){
-	}
-	
-	void f1(){
-	}
-
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/out/B.java
deleted file mode 100644
index 7a7c5ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/test4/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-import java.awt.*;
-
-import java.lang.*;
-
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources0/in/A.java
deleted file mode 100644
index e578f80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources0/out/A.java
deleted file mode 100644
index cc5f83e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources0/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	void m(){
-	}
-
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources1/in/A.java
deleted file mode 100644
index 83dc3ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources1/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-	}
-	int f= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources1/out/A.java
deleted file mode 100644
index 8b7570f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources1/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(){
-	}
-	int f= 0;
-	int f= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources2/in/A.java
deleted file mode 100644
index ad361e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources2/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-	}
-	int f= 0, g= 9;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources2/out/A.java
deleted file mode 100644
index 2501922..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources2/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(){
-	}
-	int f= 0, g= 9;
-	int f= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources3/in/A.java
deleted file mode 100644
index 4016c4b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources3/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-	}
-	int[] f= null, g[]= null;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources3/out/A.java
deleted file mode 100644
index ea391f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/Paste/testPastingTypedResources3/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	void m(){
-	}
-	int[] f= null, g[]= null;
-	int[] f= null;
-	int[] g[]= null;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test0_in.java
deleted file mode 100644
index d24ca4b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test0_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//initialize in method
-class A{
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test0_out.java
deleted file mode 100644
index 0956f75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test0_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//initialize in method
-class A{
-	private int i;
-
-	void f(){
-		i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test10_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test10_in.java
deleted file mode 100644
index 11d4b3d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test10_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//final
-class A{
-	A(){
-	}
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test10_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test10_out.java
deleted file mode 100644
index e6d864f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test10_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//final
-class A{
-	private final int i;
-	A(){
-		i= 0;
-	}
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test11_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test11_in.java
deleted file mode 100644
index 898e5c3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test11_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//public
-class A{
-	A(){
-	}
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test11_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test11_out.java
deleted file mode 100644
index fdd2d2c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test11_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//public
-class A{
-	public int i;
-	A(){
-	}
-	void f(){
-		i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test12_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test12_in.java
deleted file mode 100644
index 0e48d3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test12_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//initialize in method
-class A{
-	static void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test12_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test12_out.java
deleted file mode 100644
index 949b9d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test12_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//initialize in method
-class A{
-	private static int i;
-
-	static void f(){
-		i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test13_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test13_in.java
deleted file mode 100644
index 1e2d00e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test13_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//initialize in method
-class A{
-	static void f(){
-		int i= 0, j= i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test13_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test13_out.java
deleted file mode 100644
index 900f236..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test13_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//initialize in method
-class A{
-	private static int i;
-
-	static void f(){
-		i= 0;
-		int j= i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test14_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test14_in.java
deleted file mode 100644
index b71c0d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test14_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//initialize in method
-class A{
-	static void f(){
-		int j= 0, i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test14_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test14_out.java
deleted file mode 100644
index cb9c1ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test14_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//initialize in method
-class A{
-	private static int i;
-
-	static void f(){
-		int j= 0;
-		i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test15_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test15_in.java
deleted file mode 100644
index 5eefe8e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test15_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//initialize in method
-class A{
-	static void f(){
-		int j= 0, i= 0, k;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test15_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test15_out.java
deleted file mode 100644
index 171daf7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test15_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//initialize in method
-class A{
-	private static int i;
-
-	static void f(){
-		int j= 0;
-		i= 0;
-		int k;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test16_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test16_in.java
deleted file mode 100644
index edcbba6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test16_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	A(){
-		this(5);
-	}
-	A(int u){
-		super();
-	}
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test16_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test16_out.java
deleted file mode 100644
index 3362abc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test16_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	private int i;
-	A(){
-		this(5);
-	}
-	A(int u){
-		super();
-		i= 0;
-	}
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test17_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test17_in.java
deleted file mode 100644
index 690a085..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test17_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		int i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test17_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test17_out.java
deleted file mode 100644
index caea7fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test17_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	private int i;
-
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test18_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test18_in.java
deleted file mode 100644
index 1a2c26a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test18_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	private static class Bar {
-		public void baz() {
-			int i = 0;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test18_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test18_out.java
deleted file mode 100644
index 356cb93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test18_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-class A {
-	private static class Bar {
-		private int i;
-
-		private Bar() {
-			i = 0;
-			// TODO Auto-generated constructor stub
-		}
-
-		public void baz() {
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test19_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test19_in.java
deleted file mode 100644
index 06ba6bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test19_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void someMethod(){
-		int someArray[];
- 	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test19_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test19_out.java
deleted file mode 100644
index 21c0790..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test19_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	private int fSomeArray[];
-
-	void someMethod(){
- 	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test1_in.java
deleted file mode 100644
index 5e7ae68..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test1_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//initialize in declaration
-class A{
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test1_out.java
deleted file mode 100644
index b559013..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test1_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//initialize in declaration
-class A{
-	private int i= 0;
-
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test20_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test20_in.java
deleted file mode 100644
index c6cdd61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test20_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void someMethod(){
-		double[] doubleDim[];
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test20_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test20_out.java
deleted file mode 100644
index 6245722..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test20_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	private double[] fDoubleDim[];
-
-	void someMethod(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test21_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test21_in.java
deleted file mode 100644
index d189d24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test21_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-class A {
-	public static void method2(final int i) {
-		final I x = new I() {//<-- refactor->convert local variable x to field
-			public void methodI() {
-				int y = 3;
-			}
-		};
-		I y= x;
-	}
-}
-interface I {
-	void methodI();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test21_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test21_out.java
deleted file mode 100644
index a63194e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test21_out.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A {
-	private static final I fgX= new I() {//<-- refactor->convert local variable x to field
-		public void methodI() {
-			int y = 3;
-		}
-	};
-
-	public static void method2(final int i) {
-		I y= fgX;
-	}
-}
-interface I {
-	void methodI();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test22_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test22_in.java
deleted file mode 100644
index 55e85df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test22_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	void m() {
-		SortByDefiningTypeAction fSortByDefiningTypeAction= new SortByDefiningTypeAction();
-	}
-}
-class SortByDefiningTypeAction {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test2_in.java
deleted file mode 100644
index 25302ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test2_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//initialize in constructor
-class A{
-	A(){
-	}
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test2_out.java
deleted file mode 100644
index 7aeefce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test2_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//initialize in constructor
-class A{
-	private int i;
-	A(){
-		i= 0;
-	}
-	void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test3_in.java
deleted file mode 100644
index b6bed8b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test3_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//initialize in constructors
-class A{
-	A(){
-	}
-	A(int e){
-	}
-	void f(){
-		int i= 0;
-		i++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test3_out.java
deleted file mode 100644
index f610888..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test3_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//initialize in constructors
-class A{
-	private int i;
-	A(){
-		i= 0;
-	}
-	A(int e){
-		i= 0;
-	}
-	void f(){
-		i++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test4_in.java
deleted file mode 100644
index 13826ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test4_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//initialize in constructors
-class A{
-	void f(){
-		int i= 0;
-		i++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test4_out.java
deleted file mode 100644
index 8d715a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test4_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//initialize in constructors
-class A{
-	private int i;
-
-	/**
-	 * 
-	 */
-	A() {
-		i= 0;
-		// TODO Auto-generated constructor stub
-	}
-
-	void f(){
-		i++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test5_in.java
deleted file mode 100644
index c75b1d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test5_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	void f(){
-		new Object(){
-			void fx(){
-				int i= 0;
-			}	
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test5_out.java
deleted file mode 100644
index d01037b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test5_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	void f(){
-		new Object(){
-			private int i;
-
-			void fx(){
-				i= 0;
-			}	
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test6_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test6_in.java
deleted file mode 100644
index 8a2eb40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test6_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	void f(){
-		new Object(){
-			void fx(){
-				int i= s();
-			}
-			int s(){return 3;}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test6_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test6_out.java
deleted file mode 100644
index 1a269a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test6_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	void f(){
-		new Object(){
-			private int i= s();
-			void fx(){
-			}
-			int s(){return 3;}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test7_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test7_in.java
deleted file mode 100644
index 95bd5da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test7_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		int i= 0, j= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test7_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test7_out.java
deleted file mode 100644
index 8493585..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test7_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	private int i= 0;
-
-	void f(){
-		int j= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test8_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test8_in.java
deleted file mode 100644
index 95bd5da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test8_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		int i= 0, j= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test8_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test8_out.java
deleted file mode 100644
index 3117a50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test8_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	private int i;
-
-	void f(){
-		i= 0;
-		int j= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test9_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test9_in.java
deleted file mode 100644
index 871629c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test9_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming
-class A{
-	void f(){
-		int i= 0;
-		i++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test9_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test9_out.java
deleted file mode 100644
index 2c59c6c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/canPromote/A_test9_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming
-class A{
-	private int field;
-
-	void f(){
-		field= 0;
-		field++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail0.java
deleted file mode 100644
index 5017152..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail0.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	void f(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail1.java
deleted file mode 100644
index 1e2327d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail1.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	void f(){
-		try{
-		} catch (Throwable e){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail2.java
deleted file mode 100644
index 8e18a37..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		class Local{}
-		Local l;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail3.java
deleted file mode 100644
index cb12cb8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail3.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		class Local{}
-		Object l= new Local();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail4.java
deleted file mode 100644
index 6beaca7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail4.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//can't init in constructor - name clash
-class A{
-	A(int i){
-	}
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail5.java
deleted file mode 100644
index 9e9244c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail5.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//name clash
-class A{
-	Object i;
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail6.java
deleted file mode 100644
index 2830bdf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/cannotPromote/A_testFail6.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void f(){
-		int j=0, i= j;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement0.java
deleted file mode 100644
index 3c97977..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement0.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//disabled: none
-class A{
-	void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement1.java
deleted file mode 100644
index b55c0fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//disabled: final, method, field, construcotr
-class A{
-	void f(){
-		int i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement2.java
deleted file mode 100644
index 19b4cf7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//disabled: method, field, constructor, final
-class A{
-	void f(){
-		int i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement3.java
deleted file mode 100644
index 24ebd6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement3.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//disabled: final
-class A{
-	void f(){
-		int i= 0;
-		i= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement4.java
deleted file mode 100644
index 2ff4177..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement4.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//disabled: constructor
-class A{
-	A(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement5.java
deleted file mode 100644
index 02c6bc1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement5.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//disabled: constructor
-class A{
-	void f(){
-		new Object(){
-			void g(){
-				int i= 0;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement6.java
deleted file mode 100644
index b0eaeb0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement6.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//disabled: constructor, field, method, final
-class A{
-	void f(){
-		new Object(){
-			void g(){
-				int i;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement7.java
deleted file mode 100644
index 153f4dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement7.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//disabled: construcotor
-class A{
-	static void f(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement8.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement8.java
deleted file mode 100644
index f90c359..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement8.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-    void f(){
-        int i= 0;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement9.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement9.java
deleted file mode 100644
index 7c668e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PromoteTempToField/testEnablement/A_testEnablement9.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-    void f(){
-        int y= 1 +x();
-    }
-    private int x() {
-        return 0;
-    }
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test0/in/A.java
deleted file mode 100644
index 041a067..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test0/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{	

-}

-class B extends A{

-	void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test0/out/A.java
deleted file mode 100644
index 0f7c3de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test0/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class A{

-

-	void m() {}	

-}

-class B extends A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test1/in/A.java
deleted file mode 100644
index a678d11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test1/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class A{	

-	void x(){}

-}

-class B extends A{

-	protected void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test1/out/A.java
deleted file mode 100644
index 5db597f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test1/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-class A{	

-	void x(){}

-

-	protected void m() {}

-}

-class B extends A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test10/in/A.java
deleted file mode 100644
index 180cd5e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test10/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;

-

-class A {

-	protected int j;

-	void a(){}

-}

-

-class B extends A {

-	protected void m() { 

-		super.j++;

-		super.j= 0;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test10/out/A.java
deleted file mode 100644
index 1e7bf5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test10/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;

-

-class A {

-	protected int j;

-	void a(){}

-	protected void m() { 

-		this.j++;

-		this.j= 0;

-	}

-}

-

-class B extends A {

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test11/in/A.java
deleted file mode 100644
index 4a683ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test11/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;

-

-class A {

-	int x;

-}

-

-class B extends A {

-	protected void m() { 

-		class T extends A{

-			void t(){

-				super.x++;

-			}

-		};

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test11/out/A.java
deleted file mode 100644
index f9e0fda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test11/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;

-

-class A {

-	int x;

-

-	protected void m() { 

-		class T extends A{

-			void t(){

-				super.x++;

-			}

-		};

-	}

-}

-

-class B extends A {

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/in/A.java
deleted file mode 100644
index 065bec9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class A{	

-	void x(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/in/B.java
deleted file mode 100644
index 4b081da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/in/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-import java.io.IOException;

-class B extends A{

-	private void m() throws IOException{

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/A.java
deleted file mode 100644
index 80b2d1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-

-import java.io.IOException;

-

-class A{	

-	void x(){}

-

-	private void m() throws IOException {

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/B.java
deleted file mode 100644
index 3a04ba7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test12/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-import java.io.IOException;

-class B extends A{

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test13/in/A.java
deleted file mode 100644
index ac22e50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test13/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-

-class A {

-}

-

-class B extends A {

-	protected void m() { 

-		new B();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test13/out/A.java
deleted file mode 100644
index 1b932df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test13/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-

-class A {

-

-	protected void m() { 

-		new B();

-	}

-}

-

-class B extends A {

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test14/in/A.java
deleted file mode 100644
index d98c9e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test14/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class A {

-void g(){

-	g();

-	}

-}

-class B extends A{

-	protected void m(){

-		List l= new ArrayList();

-		l.size();

-	}	

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test14/out/A.java
deleted file mode 100644
index c10cb8a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test14/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class A {

-void g(){

-	g();

-	}

-

-protected void m() {

-	List l= new ArrayList();

-	l.size();

-}

-}

-class B extends A{	

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test15/in/A.java
deleted file mode 100644
index 9ddf60c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test15/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class A {

-}

-class B extends A{

-	public void f(){}

-	void m(){

-		B b= new B();

-		b.f();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test15/out/A.java
deleted file mode 100644
index 82595fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test15/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class A {

-	protected void m(){

-		B b= new B();

-		b.f();

-	}

-

-}

-class B extends A{

-	public void f(){}

-	}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test16/in/A.java
deleted file mode 100644
index 571eeed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test16/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class A {

-}

-class B extends A{

-	public int j= 0;

-	void m(){

-		B b= new B();

-		b.j= 0;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test16/out/A.java
deleted file mode 100644
index 4807b3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test16/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class A {

-	void m(){

-		B b= new B();

-		b.j= 0;

-	}

-}

-class B extends A{

-	public int j= 0;

-	}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test17/in/A.java
deleted file mode 100644
index 1f2875c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test17/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;

-

-class A {

-}

-

-class B extends A {

-	void m() { 

-		int i= B.ss();

-	}	

-	public static int ss() { 

-		return 9;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test17/out/A.java
deleted file mode 100644
index 61cb3bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test17/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;

-

-public class A {

-	protected void m() { 

-		int i= B.ss();

-	}	

-}

-class B extends A{

-	public static int ss() { 

-		return 9;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18/in/A.java
deleted file mode 100644
index 35bf67f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-

-class A {

-}

-

-class B extends A {

-	void m() { 

-		int i= B.ss;

-	}	

-	public static int ss= 8;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18/out/A.java
deleted file mode 100644
index f321e72..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test18/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-

-public class A {

-	protected void m() { 

-		int i= B.ss;

-	}	

-}

-class B extends A{

-	public static int ss= 8;

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test19/in/A.java
deleted file mode 100644
index 85e4c69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test19/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-class A {
-    void m() {
-        //implementation
-    }
-}
-
-class C extends A {
-}
-
-class B extends C {
-	void m() {
-		super.m();
-		//further implementation
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test19/out/A.java
deleted file mode 100644
index 44db0ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test19/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-class A {
-    void m() {
-        //implementation
-    }
-}
-
-class C extends A {
-
-	void m() {
-		super.m();
-		//further implementation
-	}
-}
-
-class B extends C {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test2/in/A.java
deleted file mode 100644
index 7c09b1f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test2/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-class A{	

-	void x(){}

-}

-class B extends A{

-	protected void mmm(){}

-	protected void n(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test2/out/A.java
deleted file mode 100644
index 408d486..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test2/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;

-class A{	

-	void x(){}

-

-	protected void n() {}

-

-	protected void mmm() {}

-}

-class B extends A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test20/in/A.java
deleted file mode 100644
index 847cc24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test20/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-}
-
-class C extends A {
-}
-
-class B extends C {
-	void m() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test20/out/A.java
deleted file mode 100644
index 2259d5f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test20/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-
-	void m() {
-	}
-}
-
-class C extends A {
-}
-
-class B extends C {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test21/in/A.java
deleted file mode 100644
index 88d8f20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test21/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-}
-
-class C extends A {
-}
-
-class B extends C {
-	void m() {
-		super.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test21/out/A.java
deleted file mode 100644
index 41cef98..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test21/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-
-	void m() {
-		super.toString();
-	}
-}
-
-class C extends A {
-}
-
-class B extends C {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test22/in/A.java
deleted file mode 100644
index f9a344d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test22/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-class SuperA{
-	public void m() {
-	}
-}
-class A extends SuperA{
-}
-class B extends A{
-	public void m(){
-	}
-}
-class B1 extends A{
-	public void foo(){
-		A a= null;
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test22/out/A.java
deleted file mode 100644
index e88764d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test22/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class SuperA{
-	public void m() {
-	}
-}
-class A extends SuperA{
-
-	public void m() {
-	}
-}
-class B extends A{
-}
-class B1 extends A{
-	public void foo(){
-		A a= null;
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test23/in/A.java
deleted file mode 100644
index 9c381e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test23/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class SuperA{
-	void x(){}
-}
-class A extends SuperA{
-}
-class B extends A {
-	public void m() { 
-		super.x();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test23/out/A.java
deleted file mode 100644
index c8ddf1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test23/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class SuperA{
-	void x(){}
-}
-class A extends SuperA{
-
-	public void m() { 
-		super.x();
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test24/in/A.java
deleted file mode 100644
index 3682d51..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test24/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{	
-}
-class B extends A{
-	int[] m() throws java.lang.Exception, Throwable{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test24/out/A.java
deleted file mode 100644
index 52640c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test24/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-
-	int[] m() throws java.lang.Exception, Throwable {
-		return null;
-	}	
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test25/in/A.java
deleted file mode 100644
index 12e437e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test25/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{	
-}
-class B extends A{
-	int[] m()[] {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test25/out/A.java
deleted file mode 100644
index 614171e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test25/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-
-	int[] m()[] {
-		return null;
-	}	
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test26/in/A.java
deleted file mode 100644
index b53127f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test26/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	public int[] m()[] {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test26/out/A.java
deleted file mode 100644
index 8729caf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test26/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract int[] m()[];
-}
-class B extends A{
-	public int[] m()[] {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test27/in/A.java
deleted file mode 100644
index d63d4c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test27/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	public int[] m() {
-		return new int[0];
-	}
-}
-class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test27/out/A.java
deleted file mode 100644
index 9426542..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test27/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract int[] m();
-}
-class B extends A{
-	public int[] m() {
-		return new int[0];
-	}
-}
-class C extends A{
-
-	/* (non-Javadoc)
-	 * @see p.A#m()
-	 */
-	public int[] m() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test28/in/A.java
deleted file mode 100644
index c2f357f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test28/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	void m() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test28/out/A.java
deleted file mode 100644
index dd4e49a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test28/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-abstract class A{
-
-	protected abstract void m();
-}
-class B extends A{
-	protected void m() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test29/in/A.java
deleted file mode 100644
index 36aede0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test29/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	public boolean m(int[] a) throws Exception {
-		return true;
-	}
-}
-class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test29/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test29/out/A.java
deleted file mode 100644
index d036edd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test29/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract boolean m(int[] a) throws Exception;
-}
-class B extends A{
-	public boolean m(int[] a) throws Exception {
-		return true;
-	}
-}
-class C extends A{
-
-	/* (non-Javadoc)
-	 * @see p.A#m(int[])
-	 */
-	public boolean m(int[] a) throws Exception {
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test3/in/A.java
deleted file mode 100644
index 6cce546..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test3/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;

-class A{	

-	void x(){}

-}

-class B extends A{

-	protected void mmm(){}

-	protected void n(){}

-}

-class C extends A{

-	protected void mmm(){}

-	protected void n(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test3/out/A.java
deleted file mode 100644
index 538d2f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test3/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;

-class A{	

-	void x(){}

-

-	protected void n() {}

-

-	protected void mmm() {}

-}

-class B extends A{

-}

-class C extends A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test30/in/A.java
deleted file mode 100644
index 59349f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test30/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	public boolean m(int[] a) throws Exception {
-		return true;
-	}
-}
-abstract class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test30/out/A.java
deleted file mode 100644
index 298c1d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test30/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract boolean m(int[] a) throws Exception;
-}
-class B extends A{
-	public boolean m(int[] a) throws Exception {
-		return true;
-	}
-}
-abstract class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test31/in/A.java
deleted file mode 100644
index c46054b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test31/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	public boolean m(int[] a) throws Exception {
-		return true;
-	}
-}
-class B1 extends B{
-}
-abstract class C extends A{
-}
-class D extends C{
-}
-class D1 extends C{
-}
-class E extends D{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test31/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test31/out/A.java
deleted file mode 100644
index 5e6d331..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test31/out/A.java
+++ /dev/null

@@ -1,34 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract boolean m(int[] a) throws Exception;
-}
-class B extends A{
-	public boolean m(int[] a) throws Exception {
-		return true;
-	}
-}
-class B1 extends B{
-}
-abstract class C extends A{
-}
-class D extends C{
-
-	/* (non-Javadoc)
-	 * @see p.A#m(int[])
-	 */
-	public boolean m(int[] a) throws Exception {
-		return false;
-	}
-}
-class D1 extends C{
-
-	/* (non-Javadoc)
-	 * @see p.A#m(int[])
-	 */
-	public boolean m(int[] a) throws Exception {
-		return false;
-	}
-}
-class E extends D{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test32/in/A.java
deleted file mode 100644
index 06e63fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test32/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	public int m() {
-		return 2 +3;
-	}
-}
-class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test32/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test32/out/A.java
deleted file mode 100644
index 16f8edb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test32/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract int m();
-}
-class B extends A{
-	public int m() {
-		return 2 +3;
-	}
-}
-class C extends A{
-
-	/* (non-Javadoc)
-	 * @see p.A#m()
-	 */
-	public int m() {
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test33/in/A.java
deleted file mode 100644
index a395d92..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test33/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-}
-abstract class B extends A{
-	public abstract int m();
-}
-class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test33/out/A.java
deleted file mode 100644
index 3618cb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test33/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract int m();
-}
-abstract class B extends A{
-}
-class C extends A{
-
-	/* (non-Javadoc)
-	 * @see p.A#m()
-	 */
-	public int m() {
-		return 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test34/in/A.java
deleted file mode 100644
index 247219c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test34/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	B(){
-		super();
-	}
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test34/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test34/out/A.java
deleted file mode 100644
index 3c715de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test34/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void m();
-}
-class B extends A{
-	B(){
-		super();
-	}
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test35/in/A.java
deleted file mode 100644
index 1bc8be9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test35/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	A(int i){
-		this();
-	}
-	A(){}
-}
-class B extends A{
-	B(){
-		super();
-	}
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test35/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test35/out/A.java
deleted file mode 100644
index fa3b87e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test35/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-abstract class A{
-	A(int i){
-		this();
-	}
-	A(){}
-	public abstract void m();
-}
-class B extends A{
-	B(){
-		super();
-	}
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test36/in/A.java
deleted file mode 100644
index a8009c2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test36/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	public void m() {
-	}
-}
-class B1 extends A{
-	public void m() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test36/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test36/out/A.java
deleted file mode 100644
index d2acbb9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test36/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void m();
-}
-class B extends A{
-	public void m() {
-	}
-}
-class B1 extends A{
-	public void m() {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test37/in/A.java
deleted file mode 100644
index 1fdc08c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test37/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	public void m() {
-		f();
-	}
-	public void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test37/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test37/out/A.java
deleted file mode 100644
index b4a6645..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test37/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-
-	public void m() {
-		f();
-	}
-}
-class B extends A{
-	public void f(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test38/in/A.java
deleted file mode 100644
index 02ea52f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test38/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-
-	public static final int A = 0;
-
-	public static void m() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test38/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test38/out/A.java
deleted file mode 100644
index e105096..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test38/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-
-	public static void m() {
-	}
-
-	public static final int A = 0;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test39/in/A.java
deleted file mode 100644
index 396f912..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test39/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-
-	public static final int A = 0;
-
-	public static void m() {
-	}
-	
-	public static class X{
-	}
-
-	public static interface Y{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test39/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test39/out/A.java
deleted file mode 100644
index c33f58f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test39/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A{
-
-	public static interface Y{
-	}
-
-	public static class X{
-	}
-
-	public static void m() {
-	}
-
-	public static final int A = 0;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/in/A.java
deleted file mode 100644
index 065bec9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class A{	

-	void x(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/in/B.java
deleted file mode 100644
index 6d9a716..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/in/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-import java.util.List;

-class B extends A{

-	protected void m(List l){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/A.java
deleted file mode 100644
index 440cdf4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-

-import java.util.List;

-

-class A{	

-	void x(){}

-

-	protected void m(List l) {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/B.java
deleted file mode 100644
index 5e7bb11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test4/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-import java.util.List;

-class B extends A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test40/in/A.java
deleted file mode 100644
index 396e97e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test40/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	public static void m() {
-	}
-}
-class B extends A{
-	public static void m() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test40/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test40/out/A.java
deleted file mode 100644
index 06d012a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test40/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	public static void m() {
-	}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test41/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test41/in/A.java
deleted file mode 100644
index 76a19ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test41/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	int i = 0, j = 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test41/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test41/out/A.java
deleted file mode 100644
index b0177be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test41/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-
-	int i = 0;
-}
-class B extends A{
-	int j = 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test42/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test42/in/A.java
deleted file mode 100644
index 76a19ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test42/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	int i = 0, j = 1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test42/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test42/out/A.java
deleted file mode 100644
index de8e6ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test42/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-
-	int j = 1;
-	int i = 0;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test43/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test43/in/A.java
deleted file mode 100644
index 501ca6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test43/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test43/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test43/out/A.java
deleted file mode 100644
index bc542fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test43/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-
-	/**
-	 * comment
-	 */
-	void f() {}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/in/A.java
deleted file mode 100644
index 065bec9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class A{	

-	void x(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/in/B.java
deleted file mode 100644
index 1124d96..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-class B extends A{

-	protected void m(){}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/out/A.java
deleted file mode 100644
index c197fbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{	

-	void x(){}

-

-	protected void m() {}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/out/B.java
deleted file mode 100644
index ce146be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test5/out/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;

-class B extends A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test6/in/A.java
deleted file mode 100644
index 4d88e03..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test6/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-

-class A {

-	int x;

-}

-

-class B extends A {

-	protected void m() { 

-		super.x++;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test6/out/A.java
deleted file mode 100644
index 9d837d1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test6/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;

-

-class A {

-	int x;

-

-	protected void m() { 

-		this.x++;

-	}

-}

-

-class B extends A {

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test7/in/A.java
deleted file mode 100644
index de2a82f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test7/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-

-class A {

-	void a(A a){}

-}

-

-class B extends A {

-	protected void m() { 

-		a(this);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test7/out/A.java
deleted file mode 100644
index 31d68e8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test7/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;

-

-class A {

-	void a(A a){}

-

-	protected void m() { 

-		a(this);

-	}

-}

-

-class B extends A {

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test8/in/A.java
deleted file mode 100644
index fde7237..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test8/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;

-

-class A {

-	int x;

-}

-

-class B extends A {

-	public void m() { 

-		new B(){

-			void f(){

-				super.x++;

-			}

-		};

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test8/out/A.java
deleted file mode 100644
index b2275d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test8/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;

-

-class A {

-	int x;

-

-	public void m() { 

-		new B(){

-			void f(){

-				super.x++;

-			}

-		};

-	}

-}

-

-class B extends A {

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test9/in/A.java
deleted file mode 100644
index 9d2963f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test9/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;

-

-class A {

-	void a(){}

-}

-

-class B extends A {

-	public void m() { 

-		super.a();

-		super.a();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test9/out/A.java
deleted file mode 100644
index 7ccfca4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test9/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;

-

-class A {

-	void a(){}

-

-	public void m() { 

-		this.a();

-		this.a();

-	}

-}

-

-class B extends A {

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers0/in/A.java
deleted file mode 100644
index b023e99..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers0/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{	
-	void x(){}
-}
-class B extends A{
-	protected void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers1/in/A.java
deleted file mode 100644
index a120659..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers1/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{	
-	void x(){}
-}
-class B extends A{
-	protected void m(){ x();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers10/in/A.java
deleted file mode 100644
index 6717c0a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers10/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{	
-}
-class B extends A{
-	public static int foo(){return 1;}
-	protected static int m=  foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers11/in/A.java
deleted file mode 100644
index 2039533..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers11/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{	
-}
-class B extends A{
-	public static int foo(){return 1;}
-	protected int m= foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers12/in/A.java
deleted file mode 100644
index 77a9a17..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers12/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{	
-}
-class B extends A{
-	public int foo(){return 1;}
-	protected int m(){ return foo();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers2/in/A.java
deleted file mode 100644
index 80f72fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers2/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{	
-	void x(){}
-}
-class B extends A{
-	void x(){}
-	protected void m(){ x();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers3/in/A.java
deleted file mode 100644
index 2b77b08..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers3/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{	
-	void x(){}
-}
-class B extends A{
-	void y(){}
-	protected void m(){ y();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers4/in/A.java
deleted file mode 100644
index 61ebcb9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers4/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{	
-	void x(){}
-}
-class B extends A{
-	void y(){m();}
-	protected void m(){ y();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers5/in/A.java
deleted file mode 100644
index d0e65ea..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers5/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{	
-	void x(){}
-}
-class B extends A{
-	int y= m();
-	protected int m(){ return 9;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers6/in/A.java
deleted file mode 100644
index 0a8008b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers6/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{	
-	void x(){}
-}
-class B extends A{
-	public int hashCode(){return 1;}
-	protected int m(){ return hashCode();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers7/in/A.java
deleted file mode 100644
index 8e06ac7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers7/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{	
-}
-class B extends A{
-	public int foo(){return 1;}
-	protected static int m(){ return new B().foo();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers8/in/A.java
deleted file mode 100644
index c6abedb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers8/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{	
-}
-class B extends A{
-	public static int foo(){return 1;}
-	protected static int m(){ return foo();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers9/in/A.java
deleted file mode 100644
index fdd816d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testAddingRequiredMembers9/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{	
-}
-class B extends A{
-	public int foo(){return 1;}
-	protected static int m= new B().foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement0/in/A.java
deleted file mode 100644
index 501ca6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement0/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement1/in/A.java
deleted file mode 100644
index 5aa988a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement1/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-}
-class D extends A{
-	void f(){}
-}
-class B extends A{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement10/in/A.java
deleted file mode 100644
index 4071f37..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement10/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A<T>{
-}
-class Outer{
-	class B extends A<T>{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement11/in/A.java
deleted file mode 100644
index ad34816..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement11/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A<T>{
-}
-class Outer{
-	class B extends A<String>{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement12/in/A.java
deleted file mode 100644
index c665f75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement12/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A<T>{
-}
-class Outer<S>{
-	class B extends A<S>{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement13/in/A.java
deleted file mode 100644
index 20dfefb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement13/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A<T>{
-}
-class D extends A<Object>{
-	void f(){}
-}
-class B extends A<String>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement14/in/A.java
deleted file mode 100644
index 3825fd6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement14/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A<S>{
-}
-class D extends A<String{
-	void f(){}
-}
-class B<T> extends A<T>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement15/in/A.java
deleted file mode 100644
index d6a3a26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement15/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-}
-class D<T> extends A{
-	void f(){}
-}
-class B<S> extends A{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement16/in/A.java
deleted file mode 100644
index 48d9ac7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement16/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A<? extends Object>{
-}
-class D<S> extends A<S>{
-	void f(){}
-}
-class B extends A<String>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement17/in/A.java
deleted file mode 100644
index 88e60c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement17/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<S>{
-}
-class B<T> extends A<String>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement18/in/A.java
deleted file mode 100644
index 53ac10f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement18/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class B<T> extends A{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement19/in/A.java
deleted file mode 100644
index 2b215d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement19/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<S>{
-}
-class B<S> extends A<S>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement2/in/A.java
deleted file mode 100644
index 850e580..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement2/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-}
-class Outer{
-	class B extends A{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement20/in/A.java
deleted file mode 100644
index 7143ee7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement20/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<S>{
-}
-class B<S,T> extends A<S>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement21/in/A.java
deleted file mode 100644
index 8d72629..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement21/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<S>{
-}
-class B<S,T> extends A<S>{
-	/**
-	 * comment
-	 */
-	void f(S s){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement22/in/A.java
deleted file mode 100644
index 38ae00d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement22/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<S>{
-}
-class B<S,T> extends A<S>{
-	/**
-	 * comment
-	 */
-	void f(T t){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement23/in/A.java
deleted file mode 100644
index b9ff2c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement23/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<S>{
-	S s;
-}
-class B<S,T> extends A<S>{
-	/**
-	 * comment
-	 */
-	S f(T t){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement24/in/A.java
deleted file mode 100644
index c2355f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement24/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<S>{
-	S s;
-}
-class B<S,T> extends A<S>{
-	/**
-	 * comment
-	 */
-	String f(S s, T t){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement3/in/A.java
deleted file mode 100644
index 9474bd6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement4/in/A.java
deleted file mode 100644
index ee80865..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement4/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B<T> extends A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement5/in/A.java
deleted file mode 100644
index e8ccc47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement5/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B<String> extends A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement6/in/A.java
deleted file mode 100644
index a3b300e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement6/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T>{
-}
-class B<T> extends A<T>{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement7/in/A.java
deleted file mode 100644
index 22da73b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement7/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T>{
-}
-class B extends A<String>{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement8/in/A.java
deleted file mode 100644
index d2f4a55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement8/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-}
-class Outer<T>{
-	class B<T> extends A{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement9/in/A.java
deleted file mode 100644
index 262ded8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testEnablement9/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A<T>{
-}
-class Outer<T>{
-	class B<T> extends A<T>{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail0/in/A.java
deleted file mode 100644
index 23fadf3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail0/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-	int x;
-}
-
-class B extends A{
-	int x;
-	void m() { x++; }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail1/in/A.java
deleted file mode 100644
index b382d6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail1/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-	void a(A a){}
-	void a(B b){}
-}
-
-class B extends A {
-	void m() { 
-		a(this);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail10/in/A.java
deleted file mode 100644
index 9e3b26c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail10/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class B extends A {
-	private int a;
-	void m() { 
-		a++;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail10/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail10/in/B.java
deleted file mode 100644
index df913df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail10/in/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class B extends A {
-	int a;
-	void m() { 
-		a++;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail11/in/A.java
deleted file mode 100644
index 8b7d8d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail11/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail11/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail11/in/B.java
deleted file mode 100644
index 75a13a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail11/in/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class B extends A {
-	class P{};
-	void m() { 
-		P p= new P();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail12/in/A.java
deleted file mode 100644
index 33bf30b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail12/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A {
-	void a(A a){}
-	void a(B b){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail12/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail12/in/B.java
deleted file mode 100644
index 9412a56..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail12/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class B extends A {
-	void m() { 
-		a(this);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail13/in/A.java
deleted file mode 100644
index 9d6c2c9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail13/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class A {

-}

-class B extends A{

-	public void f(){}

-	void m(){

-		f();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail14/in/A.java
deleted file mode 100644
index bdee4cc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail14/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class Bar {
-}
-
-public class A extends Bar {
-	private static class Quux {}
-	public void m() {}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail15/in/A.java
deleted file mode 100644
index ec79222..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail15/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{}
-class C1 extends A{
-	public String toString(){
-		return null;
-	}
-}
-class B extends C1 {
-	public void m() {
-		super.toString();
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail16/in/A.java
deleted file mode 100644
index 1e822c9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail16/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{}
-class C1 extends A{
-	public void m() {
-	}
-}
-class B extends C1 {
-	public void m() {
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail17/in/A.java
deleted file mode 100644
index dba9d49..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail17/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-class A{
-	public void m() {
-	}
-}
-class C2 extends A{
-}
-class C1 extends C2{
-}
-class B extends C1 {
-	public void m() {
-	}
-}
-class B1 extends C1{
-	public void foo() {
-		m();//if you move B.m() to C2 this will result in a different call
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail18/in/A.java
deleted file mode 100644
index d33e6c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail18/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class SuperA{
-	public void m() {
-	}
-}
-class A extends SuperA{
-}
-class B extends A{
-	public void m(){
-	}
-}
-class B1 extends A{
-	public void foo(){
-		m();//if you move B.m() to A this will result in a different call
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail19/in/A.java
deleted file mode 100644
index 4e429c3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail19/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{}
-class C1 extends A{
-	public int a= 0;
-}
-class B extends C1 {
-	public void m() {
-		super.a = 1;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail2/in/A.java
deleted file mode 100644
index 6a2f9f2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail2/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-}
-
-class B extends A {
-	void m() { 
-		a();
-	}
-	private void a(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail20/in/A.java
deleted file mode 100644
index 86c5955..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail20/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{}
-class B extends A{
-	public void m() {
-	}
-	void f(){
-		A a= new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail21/in/A.java
deleted file mode 100644
index 202a8c9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail21/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	A(){}
-}
-class B extends A{
-	public void m() {
-	}
-	void f(){
-		A a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail22/in/A.java
deleted file mode 100644
index cc2bddd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail22/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-class A{
-	A(int i){}
-}
-class B extends A{
-	B(){
-		super(3);
-	}
-	public void m() {
-	}
-	void f(){
-		A a= new A(4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail23/in/A.java
deleted file mode 100644
index 275728c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail23/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{}
-class B extends A{
-	public void m() {
-	}
-}
-class B1 extends A{
-	private void m() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail24/in/A.java
deleted file mode 100644
index da01190..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail24/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{}
-class B extends A{
-	public void m() {
-	}
-}
-class B1 extends A{
-	public int m() {
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail25/in/A.java
deleted file mode 100644
index ca69911..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail25/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-public class A {
-	class Test{}
-}
-class B extends A{
-	public static class Test {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail26/in/A.java
deleted file mode 100644
index 6317af7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail26/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class Test{
-	static class A {
-	}
-}
-class B extends Test.A{
-	public static class Test {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail27/in/A.java
deleted file mode 100644
index 2e0c50b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail27/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	
-}
-class B extends A{
-	public static class A {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail28/in/A.java
deleted file mode 100644
index 5c99ac2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail28/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class Super{
-	static class A {
-	}
-}
-class B extends Super.A{
-	public static class Test {
-		static class X{
-			class Super{}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail29/in/A.java
deleted file mode 100644
index d0bd4a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail29/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-public class A {
-	private int stop() {
-		return 2;
-	}
-}
-
-class B extends A {
-	public void stop() //<-- pull up this method
-	{
-		System.out.println("pulled up!");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail3/in/A.java
deleted file mode 100644
index fbcea3a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail3/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-}
-
-class B extends A {
-	private int a;
-	void m() { 
-		a++;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail4/in/A.java
deleted file mode 100644
index 56e7c9f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail4/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-}
-
-class B extends A {
-	private class P{};
-	void m() { 
-		P p= new P();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail5/in/A.java
deleted file mode 100644
index aed7a46..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail5/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-}
-
-class B extends A {
-	void m() { 
-	}	
-}
-
-class C extends A {
-	void m() { 
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail6/in/A.java
deleted file mode 100644
index 8b7d8d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail6/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail6/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail6/in/B.java
deleted file mode 100644
index 658755a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail6/in/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class B extends A {
-	void m() { 
-		a();
-	}
-	private void a(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail7/in/A.java
deleted file mode 100644
index 9e3b26c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail7/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class B extends A {
-	private int a;
-	void m() { 
-		a++;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail7/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail7/in/B.java
deleted file mode 100644
index c9cedc1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail7/in/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class B extends A {
-	private int a;
-	void m() { 
-		a++;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail8/in/A.java
deleted file mode 100644
index 8b7d8d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail8/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail8/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail8/in/B.java
deleted file mode 100644
index f2f83c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail8/in/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class B extends A {
-	private class P{};
-	void m() { 
-		P p= new P();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail9/in/A.java
deleted file mode 100644
index 8b7d8d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail9/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail9/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail9/in/B.java
deleted file mode 100644
index 81440e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFail9/in/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class B extends A {
-	void m() { 
-		a();
-	}
-	void a(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFailTemplate/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFailTemplate/in/A.java
deleted file mode 100644
index ff4381d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFailTemplate/in/A.java
+++ /dev/null

@@ -1 +0,0 @@
-package p;

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testField0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testField0/in/A.java
deleted file mode 100644
index e5ad4e2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testField0/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{	

-}

-class B extends A{

-	int i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testField0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testField0/out/A.java
deleted file mode 100644
index 4123128..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testField0/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class A{

-

-	int i;	

-}

-class B extends A{

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail0/in/A.java
deleted file mode 100644
index 924c59a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail0/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	int x;	
-}
-
-class B extends A{
-	int x;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail1/in/A.java
deleted file mode 100644
index f3a8c65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail1/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-}
-
-class B extends A{
-	int x;
-}
-class C extends A{
-	boolean x;
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail2/in/A.java
deleted file mode 100644
index b12c71d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldFail2/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{}
-class C1 extends A{
-	public int f= 0;
-}
-class B extends C1 {
-	public int f= 0;
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldMethod0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldMethod0/in/A.java
deleted file mode 100644
index eb9e709..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldMethod0/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-

-class A {

-}

-

-class B extends A {

-	void m() { 

-		int i= f;

-	}	

-	int f;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldMethod0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldMethod0/out/A.java
deleted file mode 100644
index e5b6c76..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testFieldMethod0/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;

-

-class A {

-

-	int f;

-

-	void m() { 

-		int i= f;

-	}

-}

-

-class B extends A {

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics0/in/A.java
deleted file mode 100644
index ca4d126..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics0/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{	
-}
-class B<T> extends A<T>{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics0/out/A.java
deleted file mode 100644
index f919b42..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics0/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<T>{
-
-	void m() {}	
-}
-class B<T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics1/in/A.java
deleted file mode 100644
index fe13921..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics1/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<T>{	
-	void x(){}
-}
-class B<T> extends A<String>{
-	protected void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics1/out/A.java
deleted file mode 100644
index c6cba72..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics1/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A<T>{	
-	void x(){}
-
-	protected void m() {}
-}
-class B<T> extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics10/in/A.java
deleted file mode 100644
index a1455f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics10/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A<T> {
-	protected int j;
-	void a(T t){}
-}
-
-class B extends A<Object> {
-	protected void m() { 
-		super.j++;
-		super.j= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics10/out/A.java
deleted file mode 100644
index 388ae17..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics10/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A<T> {
-	protected int j;
-	void a(T t){}
-	protected void m() { 
-		this.j++;
-		this.j= 0;
-	}
-}
-
-class B extends A<Object> {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics11/in/A.java
deleted file mode 100644
index c43248f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics11/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-class A<X> {
-	int x;
-}
-
-class B<X> extends A<X> {
-	protected void m() { 
-		class T<X> extends A<X>{
-			void t(){
-				super.x++;
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics11/out/A.java
deleted file mode 100644
index 2b03da6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics11/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-class A<X> {
-	int x;
-
-	protected void m() { 
-		class T<X> extends A<X>{
-			void t(){
-				super.x++;
-			}
-		};
-	}
-}
-
-class B<X> extends A<X> {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/in/A.java
deleted file mode 100644
index 51425a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A<T>{	
-	void x(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/in/B.java
deleted file mode 100644
index edbe669..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/in/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.io.IOException;
-class B<T> extends A<T>{
-	private void m(T t) throws IOException{
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/A.java
deleted file mode 100644
index 8820ddf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.io.IOException;
-
-class A<T>{	
-	void x(){}
-
-	private void m(T t) throws IOException {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/B.java
deleted file mode 100644
index 2a8885e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics12/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-import java.io.IOException;
-class B<T> extends A<T>{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics13/in/A.java
deleted file mode 100644
index 1b31b2d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics13/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A {
-}
-
-class B extends A {
-	protected void m() { 
-		new B();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics13/out/A.java
deleted file mode 100644
index d96b2fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics13/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A {
-
-	protected void m() { 
-		new B();
-	}
-}
-
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics14/in/A.java
deleted file mode 100644
index bc2a597..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics14/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class A {
-void g(){
-	g();
-	}
-}
-class B extends A{
-	protected void m(){
-		List l= new ArrayList();
-		l.size();
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics14/out/A.java
deleted file mode 100644
index 03dd6fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics14/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class A {
-void g(){
-	g();
-	}
-
-protected void m() {
-	List l= new ArrayList();
-	l.size();
-}
-}
-class B extends A{	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics15/in/A.java
deleted file mode 100644
index 85e4c69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics15/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-
-class A {
-    void m() {
-        //implementation
-    }
-}
-
-class C extends A {
-}
-
-class B extends C {
-	void m() {
-		super.m();
-		//further implementation
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics15/out/A.java
deleted file mode 100644
index 44db0ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics15/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-class A {
-    void m() {
-        //implementation
-    }
-}
-
-class C extends A {
-
-	void m() {
-		super.m();
-		//further implementation
-	}
-}
-
-class B extends C {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics2/in/A.java
deleted file mode 100644
index c29baee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics2/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A<S>{	
-	void x(){}
-}
-class B<T> extends A<T>{
-	protected void mmm(T t){}
-	protected void n(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics2/out/A.java
deleted file mode 100644
index 1ada904..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics2/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<S>{	
-	void x(){}
-
-	protected void n() {}
-
-	protected void mmm(S t) {}
-}
-class B<T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics3/in/A.java
deleted file mode 100644
index 44124de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics3/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A<X>{	
-	void x(){}
-}
-class B<T> extends A<T>{
-	protected void mmm(T t){}
-	protected void n(){}
-}
-class C<S> extends A<S>{
-	protected void mmm(S s){}
-	protected void n(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics3/out/A.java
deleted file mode 100644
index 627f7a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics3/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A<X>{	
-	void x(){}
-
-	protected void n() {}
-
-	protected void mmm(X t) {}
-}
-class B<T> extends A<T>{
-}
-class C<S> extends A<S>{
-	protected void mmm(S s){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/in/A.java
deleted file mode 100644
index 51425a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A<T>{	
-	void x(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/in/B.java
deleted file mode 100644
index 57b998b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/in/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-import java.util.List;
-class B<T> extends A<T>{
-	protected void m(List<T> l){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/out/A.java
deleted file mode 100644
index a775c7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{	
-	void x(){}
-
-	protected void m(List<T> l) {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/out/B.java
deleted file mode 100644
index 605fe19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics4/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-import java.util.List;
-class B<T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/in/A.java
deleted file mode 100644
index 6181dfd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A<T>{	
-	void x(T t){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/in/B.java
deleted file mode 100644
index eef29da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B<S> extends A<S>{
-	protected void m(S s){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/out/A.java
deleted file mode 100644
index 94d82a8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{	
-	void x(T t){}
-
-	protected void m(T s) {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/out/B.java
deleted file mode 100644
index 15b4326..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics5/out/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B<S> extends A<S>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics6/in/A.java
deleted file mode 100644
index 4a1149d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics6/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A<S> {
-	int x;
-}
-
-class B<T> extends A<String> {
-	protected void m() { 
-		super.x++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics6/out/A.java
deleted file mode 100644
index 4ebadeb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics6/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A<S> {
-	int x;
-
-	protected void m() { 
-		this.x++;
-	}
-}
-
-class B<T> extends A<String> {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics7/in/A.java
deleted file mode 100644
index d5511ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics7/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A<T> {
-	void a(A<T> a){}
-}
-
-class B<T> extends A<T> {
-	protected void m() { 
-		a(this);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics7/out/A.java
deleted file mode 100644
index 9d6f744..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics7/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A<T> {
-	void a(A<T> a){}
-
-	protected void m() { 
-		a(this);
-	}
-}
-
-class B<T> extends A<T> {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics8/in/A.java
deleted file mode 100644
index a8bedec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics8/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-class A {
-	int x;
-}
-
-class B<T> extends A {
-	public void m() { 
-		new B<String>(){
-			void f(){
-				super.x++;
-			}
-		};
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics8/out/A.java
deleted file mode 100644
index 935737e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics8/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-class A {
-	int x;
-
-	public void m() { 
-		new B<String>(){
-			void f(){
-				super.x++;
-			}
-		};
-	}
-}
-
-class B<T> extends A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics9/in/A.java
deleted file mode 100644
index e43c71c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics9/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A<T> {
-	void a(T t){}
-}
-
-class B extends A<String> {
-	public void m() { 
-		super.a(null);
-		super.a(new String());
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics9/out/A.java
deleted file mode 100644
index 87c4ba5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenerics9/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A<T> {
-	void a(T t){}
-
-	public void m() { 
-		this.a(null);
-		this.a(new String());
-	}
-}
-
-class B extends A<String> {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail0/in/A.java
deleted file mode 100644
index 40c186c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail0/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-
-}
-
-class B<T> extends A{
-	void m(T t) {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail1/in/A.java
deleted file mode 100644
index 5a3acc8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail1/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A<S> {
-}
-
-class B<T,S> extends A<T> {
-	void m(S s) { 
-		a();
-	}
-	private void a(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail2/in/A.java
deleted file mode 100644
index bde2dbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testGenericsFail2/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A<S> {
-}
-
-class B<T,S> extends A<String> {
-	void m(T t) { 
-		a();
-	}
-	private void a(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testTemplate/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testTemplate/in/A.java
deleted file mode 100644
index b23b2d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testTemplate/in/A.java
+++ /dev/null

@@ -1 +0,0 @@
-package p;
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testTemplate/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testTemplate/out/A.java
deleted file mode 100644
index b23b2d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/testTemplate/out/A.java
+++ /dev/null

@@ -1 +0,0 @@
-package p;
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test0/in/A.java
deleted file mode 100644
index 05b3f05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test0/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	public void m() {}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test0/out/A.java
deleted file mode 100644
index 5d01caf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test0/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test1/in/A.java
deleted file mode 100644
index 05b3f05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test1/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	public void m() {}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test1/out/A.java
deleted file mode 100644
index dccef83..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test1/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-class B extends A{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test10/in/A.java
deleted file mode 100644
index c8b51b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test10/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
-class B extends A{
-}
-class B1 extends B{
-}
-class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test10/out/A.java
deleted file mode 100644
index 3c27d67..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test10/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
-class B1 extends B{
-}
-class C extends A{
-
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test11/in/A.java
deleted file mode 100644
index d925575..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test11/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test11/out/A.java
deleted file mode 100644
index 3da2ea6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test11/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test12/in/A.java
deleted file mode 100644
index c3443c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test12/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-
-	public int f;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test12/out/A.java
deleted file mode 100644
index 39e2fc7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test12/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-
-	public int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test13/in/A.java
deleted file mode 100644
index 6835bf8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test13/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-
-	public int f, g;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test13/out/A.java
deleted file mode 100644
index ea77920..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test13/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-
-	public int g;
-}
-class B extends A{
-
-	public int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test14/in/A.java
deleted file mode 100644
index ae28b6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test14/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-}
-abstract class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test14/out/A.java
deleted file mode 100644
index 8c4eb4b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test14/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-}
-abstract class B extends A{
-
-	public abstract void f();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test15/in/A.java
deleted file mode 100644
index ae28b6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test15/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-}
-abstract class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test15/out/A.java
deleted file mode 100644
index 67bf01a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test15/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-abstract class A{
-}
-abstract class B extends A{
-
-	public abstract void f();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test16/in/A.java
deleted file mode 100644
index 4dc0f8c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test16/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-}
-abstract class B extends A{
-}
-class C extends A{
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test16/out/A.java
deleted file mode 100644
index 90077a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test16/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A{
-}
-abstract class B extends A{
-
-	public abstract void f();
-}
-class C extends A{
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test17/in/A.java
deleted file mode 100644
index 4dc0f8c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test17/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-}
-abstract class B extends A{
-}
-class C extends A{
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test17/out/A.java
deleted file mode 100644
index 38de40e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test17/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-}
-abstract class B extends A{
-
-	public abstract void f();
-}
-class C extends A{
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test18/in/A.java
deleted file mode 100644
index 8efa469..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test18/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-
-	public void m() {}
-}
-abstract class B extends A{
-}
-class C extends A{
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test18/out/A.java
deleted file mode 100644
index 99bd6ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test18/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-abstract class A{
-}
-abstract class B extends A{
-
-	public void m() {}
-
-	public abstract void f();
-}
-class C extends A{
-	public void f(){}
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test19/in/A.java
deleted file mode 100644
index 8efa469..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test19/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-
-	public void m() {}
-}
-abstract class B extends A{
-}
-class C extends A{
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test19/out/A.java
deleted file mode 100644
index 69b4811..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test19/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-
-	public abstract void m();
-}
-abstract class B extends A{
-
-	public void m() {}
-
-	public abstract void f();
-}
-class C extends A{
-	public void f(){}
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test2/in/A.java
deleted file mode 100644
index 993b40b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test2/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-abstract class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test2/out/A.java
deleted file mode 100644
index b925b30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test2/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-abstract class A{
-}
-abstract class B extends A{
-
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/in/A.java
deleted file mode 100644
index 07fe39f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-class A{
-
-	public Collection i;	
-
-	public List f(){ 
-		return null;
-	}
-
-	public Set m(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/in/B.java
deleted file mode 100644
index f6e6d24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/out/A.java
deleted file mode 100644
index 4daef5d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-abstract class A{
-
-	public abstract Set m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/out/B.java
deleted file mode 100644
index 2d5632e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test20/out/B.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-class B extends A{
-
-	public Set m() {
-		return null;
-	}
-
-	public List f() { 
-		return null;
-	}
-
-	public Collection i;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/A.java
deleted file mode 100644
index 4b9e68b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-abstract class A{
-
-	public Collection i;
-
-	public List f() {
-		return null;
-	}
-
-	public abstract Set m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/B.java
deleted file mode 100644
index 1eaac0b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.Set;
-
-class B extends A{
-
-	public Set m() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/C.java
deleted file mode 100644
index e3310af..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/in/C.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-abstract class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/A.java
deleted file mode 100644
index 24a0113..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-abstract class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/B.java
deleted file mode 100644
index aa97dfb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/B.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-class B extends A{
-
-	public Collection i;
-
-	public List f() {
-		return null;
-	}
-
-	public Set m() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/C.java
deleted file mode 100644
index d855102..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test21/out/C.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-abstract class C extends A{
-
-	public List f() {
-		return null;
-	}
-
-	public Collection i;
-
-	public abstract Set m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test22/in/A.java
deleted file mode 100644
index 864f6c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test22/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-
-	private int bar;
-}
-class B extends A {
-
-	private int x;
-
-	public void fred(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test22/out/A.java
deleted file mode 100644
index 071dddd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test22/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-}
-class B extends A {
-
-	private int x;
-	private int bar;
-
-	public void fred(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test23/in/A.java
deleted file mode 100644
index 68e58be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test23/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-
-	private int bar;
-}
-class B extends A {
-
-	public void fred(){
-	}
-
-	private int x;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test23/out/A.java
deleted file mode 100644
index c78a2d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test23/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-}
-class B extends A {
-
-	public void fred(){
-	}
-
-	private int x;
-	private int bar;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test24/in/A.java
deleted file mode 100644
index f6255cb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test24/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-class A {
-	
-	private int foo;
-	
-	private int bar;
-}
-class B extends A {
-	
-	public void fred(){
-	}
-	
-	private int x;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test24/out/A.java
deleted file mode 100644
index 57424e8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test24/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A {
-}
-class B extends A {
-	
-	public void fred(){
-	}
-	
-	private int x;
-	private int bar;
-	private int foo;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test25/in/A.java
deleted file mode 100644
index 5566cc1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test25/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A {
-	
-	private int bar() {
-		return foo();
-	}
-
-	public int foo() {
-		return 2;
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test25/out/A.java
deleted file mode 100644
index fe6fb48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test25/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-abstract class A {
-	
-	private int bar() {
-		return foo();
-	}
-
-	public abstract int foo();
-}
-class B extends A {
-
-	public int foo() {
-		return 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test26/in/A.java
deleted file mode 100644
index ce7139f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test26/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-
-	public int bar() {
-		return 1;
-	}
-}
-class B extends A {
-
-	int fred;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test26/out/A.java
deleted file mode 100644
index 13b2870..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test26/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A {
-}
-class B extends A {
-
-	int fred;
-
-	public int bar() {
-		return 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test27/in/A.java
deleted file mode 100644
index 4a05aa4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test27/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-class A {
-
-	public int bar() {
-		return 1;
-	}
-}
-class B extends A {
-
-	public int foo() {
-		return 1;
-	}
-
-	int fred;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test27/out/A.java
deleted file mode 100644
index 0f2c9e8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test27/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-
-class A {
-}
-class B extends A {
-
-	public int foo() {
-		return 1;
-	}
-
-	public int bar() {
-		return 1;
-	}
-
-	int fred;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test28/in/A.java
deleted file mode 100644
index 82126d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test28/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-class A {
-	int i= 0, j= 1;
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test28/out/A.java
deleted file mode 100644
index efc501d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test28/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-}
-class B extends A {
-
-	int j = 1;
-	int i = 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test3/in/A.java
deleted file mode 100644
index d21beda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test3/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	public void m() {}
-}
-class B extends A{
-}
-class B1 extends B{
-}
-class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test3/out/A.java
deleted file mode 100644
index 3e436c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test3/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-
-	public void m() {}
-}
-class B1 extends B{
-}
-class C extends A{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test4/in/A.java
deleted file mode 100644
index d21beda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test4/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	public void m() {}
-}
-class B extends A{
-}
-class B1 extends B{
-}
-class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test4/out/A.java
deleted file mode 100644
index 6ed73df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test4/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-class B extends A{
-
-	public void m() {}
-}
-class B1 extends B{
-}
-class C extends A{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test5/in/A.java
deleted file mode 100644
index aafdd48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test5/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-abstract class B extends A{
-}
-abstract class B1 extends B{
-}
-abstract class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test5/out/A.java
deleted file mode 100644
index 5cf62cb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test5/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-abstract class A{
-}
-abstract class B extends A{
-
-	public abstract void m();
-}
-abstract class B1 extends B{
-}
-abstract class C extends A{
-
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test6/in/A.java
deleted file mode 100644
index 993b40b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test6/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-abstract class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test6/out/A.java
deleted file mode 100644
index b46a7c2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test6/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-abstract class B extends A{
-
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test7/in/A.java
deleted file mode 100644
index aafdd48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test7/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-abstract class B extends A{
-}
-abstract class B1 extends B{
-}
-abstract class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test7/out/A.java
deleted file mode 100644
index bea3686..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test7/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-abstract class B extends A{
-
-	public abstract void m();
-}
-abstract class B1 extends B{
-}
-abstract class C extends A{
-
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test8/in/A.java
deleted file mode 100644
index d925575..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test8/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test8/out/A.java
deleted file mode 100644
index 60b697a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test8/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-abstract class A{
-	/**
-	 * comment
-	 */
-	public abstract void m();
-}
-class B extends A{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test9/in/A.java
deleted file mode 100644
index c8b51b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test9/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
-class B extends A{
-}
-class B1 extends B{
-}
-class C extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test9/out/A.java
deleted file mode 100644
index 3b8d628..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test9/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-abstract class A{
-	/**
-	 * comment
-	 */
-	public abstract void m();
-}
-class B extends A{
-
-	public void m() {}
-}
-class B1 extends B{
-}
-class C extends A{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers0/in/A.java
deleted file mode 100644
index d2768ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers0/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//nothing added to m
-package p;
-class A{	
-	protected void m(){}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers1/in/A.java
deleted file mode 100644
index 4e4cdca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers1/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//nothing added to m
-package p;
-class A{	
-	protected void m(){
-		f();
-	}
-	public void f(){}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers2/in/A.java
deleted file mode 100644
index ea76392..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers2/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//nothing added to m
-package p;
-class A{	
-	protected void m(){
-		f();
-	}
-	public static void f(){}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers3/in/A.java
deleted file mode 100644
index 8134178..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers3/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//f added to m
-package p;
-class A{	
-	protected void m(){
-		f();
-	}
-	private void f(){}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers4/in/A.java
deleted file mode 100644
index fff2111..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers4/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//nothing added to m, f
-package p;
-class A{	
-	protected void m(){
-		f();
-	}
-	private void f(){}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers5/in/A.java
deleted file mode 100644
index 2f886b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers5/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//f added to m
-package p;
-class A{	
-	protected void m(){
-		f++;
-	}
-	private int f;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers6/in/A.java
deleted file mode 100644
index 4ff11d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers6/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//nothing added to m, f
-package p;
-class A{	
-	protected void m(){
-		f++;
-	}
-	private int f;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers7/in/A.java
deleted file mode 100644
index b016fdf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers7/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//m added to f
-package p;
-class A{	
-	private int m(){
-		return 2;
-	}
-	private int f= m();
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers8/in/A.java
deleted file mode 100644
index 5f9dd72..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers8/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//m added to f
-package p;
-class A{	
-	private int m= 1;
-	private int f= m;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers9/in/A.java
deleted file mode 100644
index bab8e48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testAddingRequiredMembers9/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//m added to f
-package p;
-class A{	
-	public int m= 1;
-	private int f= m;
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement0/in/A.java
deleted file mode 100644
index 852233b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement0/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement1/in/A.java
deleted file mode 100644
index 94061ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement1/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement10/in/A.java
deleted file mode 100644
index 942a1ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement10/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T>{
-}
-class B extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement11/in/A.java
deleted file mode 100644
index a0dcafd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement11/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B<T> extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement12/in/A.java
deleted file mode 100644
index c3b774b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement12/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A<T> extends Outer.B{
-}
-class Outer{
-	class B{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement13/in/A.java
deleted file mode 100644
index 92eb9c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement13/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A<T> extends Outer.B<T>{
-}
-class Outer{
-	class B<S>{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement14/in/A.java
deleted file mode 100644
index 42abfe6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement14/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A extends Outer.B<String>{
-}
-class Outer<S>{
-	class B<S>{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement15/in/A.java
deleted file mode 100644
index 064c127..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement15/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A<T> extends Outer.B<String>{
-}
-class Outer<S>{
-	class B{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement2/in/A.java
deleted file mode 100644
index 0ec26c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement2/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A extends Outer.B{
-}
-class Outer{
-	class B{
-		/**
-	 	* comment
-	 	*/
-		void f(){}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement3/in/A.java
deleted file mode 100644
index 9474bd6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B extends A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement4/in/A.java
deleted file mode 100644
index 43a71a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement4/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
-class B<T> extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement5/in/A.java
deleted file mode 100644
index 1c810d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement5/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<T>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
-class B<T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement6/in/A.java
deleted file mode 100644
index 7a696a8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement6/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<T>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
-class B<S,T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement7/in/A.java
deleted file mode 100644
index 43498be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement7/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<T>{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
-class B extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement8/in/A.java
deleted file mode 100644
index 0831dce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement8/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	/**
-	 * comment
-	 */
-	void f(){}
-}
-class B<S> extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement9/in/A.java
deleted file mode 100644
index 0090057..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testEnablement9/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T>{
-}
-class B<T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail0/in/A.java
deleted file mode 100644
index 4bad1a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail0/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//do subclasses
-package p;
-
-class A {
-	public void f(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail1/in/A.java
deleted file mode 100644
index 09ab090..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail1/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//interface
-package p;
-
-interface A {
-	public void f();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail10/in/A.java
deleted file mode 100644
index f89d007..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail10/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//pushing foo not possible - referenced by bar
-package p;
-
-class A {
-	
-	private int bar() {
-		return foo();
-	}
-
-	private int foo() {
-		return bar();
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail11/in/A.java
deleted file mode 100644
index 0731d5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail11/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//pushing foo not possible - referenced by bar
-package p;
-
-class A {
-	
-	private int bar= foo();
-
-	private int foo() {
-		return 1;
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail12/in/A.java
deleted file mode 100644
index 6ba6999..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail12/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//pushing bar not possible - referenced by foo
-package p;
-
-class A {
-	
-	private int bar= foo();
-
-	private int foo() {
-		return bar;
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail13/in/A.java
deleted file mode 100644
index cf57b6b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail13/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//abstracting foo not possible - referencing bar
-package p;
-
-class A {
-	
-	private int bar() {
-		return foo();
-	}
-
-	public int foo() {
-		return bar();
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail2/in/A.java
deleted file mode 100644
index 04f3a08..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail2/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//already exists
-package p;
-
-class A {
-	public void f(){}
-}
-class B extends A {
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail3/in/A.java
deleted file mode 100644
index de53f57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail3/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//already exists
-package p;
-
-class A {
-	public int i;
-}
-class B extends A {
-	public int i;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail4/in/A.java
deleted file mode 100644
index 1a6357f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail4/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//no access to m() from f
-package p;
-
-class A {
-	public void f(){
-		m();
-	}
-	private void m(){
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail5/in/A.java
deleted file mode 100644
index ac66e65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail5/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//no access to i from f
-package p;
-
-class A {
-	public void f(){
-		i++;
-	}
-	private int i;
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail6/in/A.java
deleted file mode 100644
index 01a263f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail6/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//no access to T from f
-package p;
-
-class A {
-	private static class T{}
-	public T f(){
-		return new T();
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail7/in/A.java
deleted file mode 100644
index 321fb7b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail7/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//making f abstract not possible - calls to A's constructors
-package p;
-
-class A {
-	A(){}
-	public void f(){
-	}
-}
-class B extends A {
-	void g(){
-		A a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail8/in/A.java
deleted file mode 100644
index 665ac2f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail8/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//making f abstract not possible - calls to A's constructors
-package p;
-
-class A {
-	public void f(){
-	}
-}
-class B extends A {
-	void g(){
-		A a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail9/in/A.java
deleted file mode 100644
index be0dcd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testFail9/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//pushing f not possible - referenced by getF
-package p;
-
-class A {
-	
-	private int f;
-
-	public int getF() {
-		return f;
-	}
-}
-class B extends A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics0/in/A.java
deleted file mode 100644
index 9a95622..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics0/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{
-	public void m() {}
-}
-class B extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics0/out/A.java
deleted file mode 100644
index eb60bad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics0/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<T>{
-}
-class B extends A<String>{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics1/in/A.java
deleted file mode 100644
index 9a95622..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics1/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{
-	public void m() {}
-}
-class B extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics1/out/A.java
deleted file mode 100644
index 54fc10a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics1/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-abstract class A<T>{
-	public abstract void m();
-}
-class B extends A<String>{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics10/in/A.java
deleted file mode 100644
index 143271b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics10/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A<T>{
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
-class B<T> extends A<T>{
-}
-class B1 extends B<String>{
-}
-class C extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics10/out/A.java
deleted file mode 100644
index 04c8b9f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics10/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-class A<T>{
-}
-class B<T> extends A<T>{
-
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
-class B1 extends B<String>{
-}
-class C extends A<String>{
-
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics11/in/A.java
deleted file mode 100644
index 82c080e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics11/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<T>{
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
-class B<T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics11/out/A.java
deleted file mode 100644
index 90bdb72..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics11/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<T>{
-}
-class B<T> extends A<T>{
-
-	/**
-	 * comment
-	 */
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics12/in/A.java
deleted file mode 100644
index d8cfeca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics12/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<T>{
-
-	public int f;
-}
-class B<T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics12/out/A.java
deleted file mode 100644
index 4a85771..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics12/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<T>{
-}
-class B<T> extends A<T>{
-
-	public int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics13/in/A.java
deleted file mode 100644
index 8123452..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics13/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A<T>{
-
-	public int f, g;
-	public T t;
-}
-class B extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics13/out/A.java
deleted file mode 100644
index 2ccca45..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics13/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<T>{
-
-	public int g;
-	public T t;
-}
-class B extends A<String>{
-
-	public int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics14/in/A.java
deleted file mode 100644
index cabdf41..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics14/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-}
-abstract class B<T> extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics14/out/A.java
deleted file mode 100644
index b5a01f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics14/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-abstract class A{
-
-	public abstract void f();
-}
-abstract class B<T> extends A{
-
-	public abstract void f();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics15/in/A.java
deleted file mode 100644
index 6eb4a85..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics15/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-abstract class A<T>{
-
-	public abstract void f();
-}
-abstract class B<T> extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics15/out/A.java
deleted file mode 100644
index 2865e11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics15/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-abstract class A<T>{
-}
-abstract class B<T> extends A<String>{
-
-	public abstract void f();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics16/in/A.java
deleted file mode 100644
index a43bf97..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics16/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A<T>{
-
-	public abstract T f();
-}
-abstract class B<T> extends A<String>{
-}
-class C extends A<Object>{
-	public Object f(){return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics16/out/A.java
deleted file mode 100644
index cbdb49a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics16/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A<T>{
-}
-abstract class B<T> extends A<String>{
-
-	public abstract String f();
-}
-class C extends A<Object>{
-	public Object f(){return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics17/in/A.java
deleted file mode 100644
index 4ca0001..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics17/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A<T>{
-
-	public abstract T f();
-}
-abstract class B<S> extends A<String>{
-}
-class C extends A<Object>{
-	public Object f(){return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics17/out/A.java
deleted file mode 100644
index f13689a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics17/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-abstract class A<T>{
-
-	public abstract T f();
-}
-abstract class B<S> extends A<String>{
-
-	public abstract String f();
-}
-class C extends A<Object>{
-	public Object f(){return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics18/in/A.java
deleted file mode 100644
index c3b9e8f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics18/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-abstract class A<T>{
-
-	public abstract void f();
-
-	public void m(T t) {}
-}
-abstract class B extends A<String>{
-}
-class C extends A<Object>{
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics18/out/A.java
deleted file mode 100644
index 3b4988b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics18/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-abstract class A<T>{
-}
-abstract class B extends A<String>{
-
-	public void m(String t) {}
-
-	public abstract void f();
-}
-class C extends A<Object>{
-	public void f(){}
-
-	public void m(Object t) {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics19/in/A.java
deleted file mode 100644
index 62d045b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics19/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-abstract class A<T>{
-
-	public abstract void f();
-
-	public T m(T t) {
-		T s= t;
-		return null;
-	}
-}
-abstract class B extends A<String>{
-}
-class C extends A<Object>{
-	public void f(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics19/out/A.java
deleted file mode 100644
index 6f17efa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics19/out/A.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package p;
-abstract class A<T>{
-
-	public abstract void f();
-
-	public abstract T m(T t);
-}
-abstract class B extends A<String>{
-
-	public String m(String t) {
-		String s= t;
-		return null;
-	}
-
-	public abstract void f();
-}
-class C extends A<Object>{
-	public void f(){}
-
-	public Object m(Object t) {
-		Object s= t;
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics2/in/A.java
deleted file mode 100644
index 2ef4708..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics2/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-abstract class A<S>{
-	public abstract void m();
-}
-abstract class B extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics2/out/A.java
deleted file mode 100644
index 7b77135..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics2/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-abstract class A<S>{
-}
-abstract class B extends A<String>{
-
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics3/in/A.java
deleted file mode 100644
index cf5ef21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics3/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<S>{
-	public void m() {}
-}
-class B<T> extends A<T>{
-}
-class B1 extends B<String>{
-}
-class C<R> extends A<R>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics3/out/A.java
deleted file mode 100644
index ad9dabd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics3/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A<S>{
-}
-class B<T> extends A<T>{
-
-	public void m() {}
-}
-class B1 extends B<String>{
-}
-class C<R> extends A<R>{
-
-	public void m() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics4/in/A.java
deleted file mode 100644
index bca198f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics4/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<T>{
-	public T m() {return null;}
-}
-class B extends A<String>{
-}
-class B1 extends B{
-}
-class C extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics4/out/A.java
deleted file mode 100644
index 899b984..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics4/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-abstract class A<T>{
-	public abstract T m();
-}
-class B extends A<String>{
-
-	public String m() {return null;}
-}
-class B1 extends B{
-}
-class C extends A<String>{
-
-	public String m() {return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics5/in/A.java
deleted file mode 100644
index 99a347e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics5/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A<T>{
-	public abstract void m();
-}
-abstract class B extends A<String>{
-}
-abstract class B1 extends B{
-}
-abstract class C extends A<String>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics5/out/A.java
deleted file mode 100644
index d4b87a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics5/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-abstract class A<T>{
-}
-abstract class B extends A<String>{
-
-	public abstract void m();
-}
-abstract class B1 extends B{
-}
-abstract class C extends A<String>{
-
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics6/in/A.java
deleted file mode 100644
index 67a2fdf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics6/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-abstract class A<T>{
-	public abstract T m();
-}
-abstract class B<S> extends A<S>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics6/out/A.java
deleted file mode 100644
index 144687e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics6/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-abstract class A<T>{
-	public abstract T m();
-}
-abstract class B<S> extends A<S>{
-
-	public abstract S m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics7/in/A.java
deleted file mode 100644
index b70508f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics7/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-abstract class B<S> extends A{
-}
-abstract class B1<S> extends B<String>{
-}
-abstract class C<S> extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics7/out/A.java
deleted file mode 100644
index 5a26357..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics7/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-abstract class A{
-	public abstract void m();
-}
-abstract class B<S> extends A{
-
-	public abstract void m();
-}
-abstract class B1<S> extends B<String>{
-}
-abstract class C<S> extends A{
-
-	public abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics8/in/A.java
deleted file mode 100644
index d249347..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics8/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A<T>{
-	/**
-	 * comment
-	 */
-	public T m() {return null;}
-}
-class B<T> extends A<T>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics8/out/A.java
deleted file mode 100644
index 829de8a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics8/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-abstract class A<T>{
-	/**
-	 * comment
-	 */
-	public abstract T m();
-}
-class B<T> extends A<T>{
-
-	public T m() {return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics9/in/A.java
deleted file mode 100644
index b97bf82..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics9/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A<T>{
-	/**
-	 * comment
-	 */
-	public T m() {return null;}
-}
-class B extends A<String>{
-}
-class B1 extends B{
-}
-class C extends A<Object>{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics9/out/A.java
deleted file mode 100644
index 7a109f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/testGenerics9/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-abstract class A<T>{
-	/**
-	 * comment
-	 */
-	public abstract T m();
-}
-class B extends A<String>{
-
-	public String m() {return null;}
-}
-class B1 extends B{
-}
-class C extends A<Object>{
-
-	public Object m() {return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RefactoringScanner/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RefactoringScanner/A.java
deleted file mode 100644
index 2fb8d0a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RefactoringScanner/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-class A{

-	/**

-	 * TestPattern

-	 * 	 TestPattern

-	 */

-	void f(){

-	}

-	

-	/*

-	 * TestPattern

-	 * 

-	 * 	TestPattern

-	 */

-	void f1(){

-		f1();//TestPattern //org.eclipse.TestPattern

-		String g= "TestPattern";

-		String g2= "org.eclipse.TestPattern";

-	}

-	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RefactoringScanner/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RefactoringScanner/B.java
deleted file mode 100644
index 5e79e3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RefactoringScanner/B.java
+++ /dev/null

@@ -1,21 +0,0 @@
-class B{

-	/**

-	 * TestTestPattern

-	 * 	 TestPattern

-	 */

-	void f(){

-	}

-	

-	/*

-	 * TestTestPattern

-	 * 

-	 * 	TestPattern

-	 */

-	void f1(){

-		f1();//TestPattern //org.eclipse.TestPattern

-		String g= "TestPattern";//TestTestPattern

-		String g2= "org.eclipse.TestPattern";

-		String g3= "org.eclipse.TestPatternMatching";

-	}

-	

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test0/in/A.java
deleted file mode 100644
index b350409..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test0/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-class A{
-	public void m(){};
-} 
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test0/out/A.java
deleted file mode 100644
index fcfc86f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test0/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-class A{
-	public void m(){};
-} 
-interface I {
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test1/in/A.java
deleted file mode 100644
index 1ef6f4d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test1/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-class A implements I{
-	public void m(){};
-} 
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test1/out/A.java
deleted file mode 100644
index e34858d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test1/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-class A implements I{
-	public void k(){};
-} 
-interface I {
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test10/in/A.java
deleted file mode 100644
index 4880ef7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test10/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-interface I{
-void m();
-}
-interface I2 extends I{
-}
-interface I3 extends I2{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test10/out/A.java
deleted file mode 100644
index bdfa91e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test10/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-interface I{
-void k();
-}
-interface I2 extends I{
-}
-interface I3 extends I2{
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test11/in/A.java
deleted file mode 100644
index 275bd81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test11/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-interface I2{
-void m();
-}
-interface I3 extends I, I2{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test11/out/A.java
deleted file mode 100644
index 9c5c52b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test11/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-interface I2{
-void k();
-}
-interface I3 extends I, I2{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test12/in/A.java
deleted file mode 100644
index fb2dbbf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test12/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-interface I2{
-void m();
-}
-interface I3 extends I, I2{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test12/out/A.java
deleted file mode 100644
index 70a291f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test12/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-interface I2{
-void k();
-}
-interface I3 extends I, I2{
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test14/in/A.java
deleted file mode 100644
index 6440b68..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test14/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-	void m();
-}
-interface I1 extends I{
-}
-interface I2 extends I1{
-	void m();
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test14/out/A.java
deleted file mode 100644
index 3cd2392..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test14/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-	void k();
-}
-interface I1 extends I{
-}
-interface I2 extends I1{
-	void k();
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test15/in/A.java
deleted file mode 100644
index a32d285..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test15/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-	void m();
-}
-interface J{
-	void m();
-}
-interface I1 extends I{
-}
-interface J1 extends J{
-}
-interface I2 extends I1, J1{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test15/out/A.java
deleted file mode 100644
index 25c1a19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test15/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-	void k();
-}
-interface J{
-	void k();
-}
-interface I1 extends I{
-}
-interface J1 extends J{
-}
-interface I2 extends I1, J1{
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test16/in/A.java
deleted file mode 100644
index 32d0d0d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test16/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-	void m();
-}
-interface J{
-	void m();
-}
-class C implements I, J{
-	public void m(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test16/out/A.java
deleted file mode 100644
index a98d2fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test16/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-	void k();
-}
-interface J{
-	void k();
-}
-class C implements I, J{
-	public void k(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test17/in/A.java
deleted file mode 100644
index d8b4757..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test17/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-	void m();
-}
-interface J{
-	void m();
-}
-class A{
-	public void m(){};
-}
-class C extends A implements I, J{
-	public void m(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test17/out/A.java
deleted file mode 100644
index dc8dc48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test17/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-	void k();
-}
-interface J{
-	void k();
-}
-class A{
-	public void k(){};
-}
-class C extends A implements I, J{
-	public void k(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test18/in/A.java
deleted file mode 100644
index 75b5aa0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test18/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void m();
-}
-interface J{
-	void m();
-}
-interface J2 extends J{
-	void m();
-}
-
-class A{
-	public void m(){}
-}
-class C extends A implements I, J{
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test18/out/A.java
deleted file mode 100644
index 7f42185..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test18/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void k();
-}
-interface J{
-	void k();
-}
-interface J2 extends J{
-	void k();
-}
-
-class A{
-	public void k(){}
-}
-class C extends A implements I, J{
-	public void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test19/in/A.java
deleted file mode 100644
index 057ee69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test19/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void m();
-}
-interface J{
-	void m();
-}
-interface J2 extends J{
-	void m();
-}
-
-class A{
-	private void m(){}
-}
-class C extends A implements I, J{
-	public void m(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test19/out/A.java
deleted file mode 100644
index fca3cb3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test19/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void k();
-}
-interface J{
-	void k();
-}
-interface J2 extends J{
-	void k();
-}
-
-class A{
-	private void m(){}
-}
-class C extends A implements I, J{
-	public void k(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test2/in/A.java
deleted file mode 100644
index 0211b7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test2/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming I.m to k
-package p;
-class A implements I{
-	public void m(){};
-	public void m(int y){};
-} 
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test2/out/A.java
deleted file mode 100644
index 806e8b1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test2/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming I.m to k
-package p;
-class A implements I{
-	public void k(){};
-	public void m(int y){};
-} 
-interface I {
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test20/in/A.java
deleted file mode 100644
index 4606b91..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test20/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void m();
-}
-interface J{
-	void m();
-}
-interface J2 extends J{
-	void m();
-}
-
-class A{
-	public void m(){}
-}
-class C extends A implements I, J{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test20/out/A.java
deleted file mode 100644
index 0179740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test20/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void k();
-}
-interface J{
-	void k();
-}
-interface J2 extends J{
-	void k();
-}
-
-class A{
-	public void k(){}
-}
-class C extends A implements I, J{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test21/in/A.java
deleted file mode 100644
index 6637d92..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test21/in/A.java
+++ /dev/null

@@ -1,39 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void m();
-}
-interface J{
-	void m();
-}
-interface J2 extends J{
-	void m();
-}
-
-class A{
-	public void m(){};
-}
-class C extends A implements I, J{
-	public void m(){};
-}
-class Test{
-	void k(){
-		I i= new C();
-		i.m();
-		I ii= new I(){
-			public void m(){}
-		};
-		ii.m();
-		J j= new C();
-		j.m();
-		J jj= new J(){
-			public void m(){}
-		};
-		jj.m();
-		A a= new C();
-		((I)a).m();
-		((J)a).m();
-		((C)a).m();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test21/out/A.java
deleted file mode 100644
index d8ecabe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test21/out/A.java
+++ /dev/null

@@ -1,39 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void k();
-}
-interface J{
-	void k();
-}
-interface J2 extends J{
-	void k();
-}
-
-class A{
-	public void k(){};
-}
-class C extends A implements I, J{
-	public void k(){};
-}
-class Test{
-	void k(){
-		I i= new C();
-		i.k();
-		I ii= new I(){
-			public void k(){}
-		};
-		ii.k();
-		J j= new C();
-		j.k();
-		J jj= new J(){
-			public void k(){}
-		};
-		jj.k();
-		A a= new C();
-		((I)a).k();
-		((J)a).k();
-		((C)a).k();
-		a.k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test22/in/A.java
deleted file mode 100644
index bb8601f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test22/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-interface I{
-void m();
-}
-interface I2{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test22/out/A.java
deleted file mode 100644
index 9da5d69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test22/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-interface I{
-void k();
-}
-interface I2{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test24/in/A.java
deleted file mode 100644
index 27496f9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test24/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-interface J{
-}
-interface I extends J{
-void m();
-}
-interface I1 extends J{
-void m();
-}
-interface K extends I, I1{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test24/out/A.java
deleted file mode 100644
index 0a0a465..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test24/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-interface J{
-}
-interface I extends J{
-void k();
-}
-interface I1 extends J{
-void k();
-}
-interface K extends I, I1{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test25/in/A.java
deleted file mode 100644
index ccef3b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test25/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-interface J{
-}
-interface I extends J{
-void m();
-}
-interface I1 extends J{
-void m();
-}
-class C implements I, I1{
-public void m(){}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test25/out/A.java
deleted file mode 100644
index a27964f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test25/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-interface J{
-}
-interface I extends J{
-void k();
-}
-interface I1 extends J{
-void k();
-}
-class C implements I, I1{
-public void k(){}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test26/in/A.java
deleted file mode 100644
index 6b63346..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test26/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface I{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test26/out/A.java
deleted file mode 100644
index d3b3476..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test26/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface I{
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test27/in/A.java
deleted file mode 100644
index 9752fe0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test27/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-interface I{
-void m();
-}
-class A{
-public void m(){};
-}
-class B1 extends A{
-public void m(){};
-}
-class B2 extends A implements I{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test27/out/A.java
deleted file mode 100644
index b3b2478..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test27/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-interface I{
-void k();
-}
-class A{
-public void k(){};
-}
-class B1 extends A{
-public void k(){};
-}
-class B2 extends A implements I{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test28/in/A.java
deleted file mode 100644
index 82ab659..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test28/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-interface I{
-void m();
-}
-class A{
-public void m(){};
-}
-class B1 extends A implements J{
-}
-class B2 extends A implements I{
-}
-interface J{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test28/out/A.java
deleted file mode 100644
index 9104fdc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test28/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-interface I{
-void k();
-}
-class A{
-public void k(){};
-}
-class B1 extends A implements J{
-}
-class B2 extends A implements I{
-}
-interface J{
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test29/in/A.java
deleted file mode 100644
index e1fd825..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test29/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-interface I{
-void m();
-}
-class A{
-public void m(){};
-}
-class B1 extends A implements J{
-}
-class B2 extends A implements I{
-}
-interface J{
-void m();
-}
-class C implements J{
-public void m(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test29/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test29/out/A.java
deleted file mode 100644
index c9b5575..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test29/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-interface I{
-void k();
-}
-class A{
-public void k(){};
-}
-class B1 extends A implements J{
-}
-class B2 extends A implements I{
-}
-interface J{
-void k();
-}
-class C implements J{
-public void k(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test3/in/A.java
deleted file mode 100644
index 4dcd03a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test3/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming I.m to k
-package p;
-class B {
-	public void m(){};
-} 
-class A extends B implements I{
-} 
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test3/out/A.java
deleted file mode 100644
index 240933e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test3/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming I.m to k
-package p;
-class B {
-	public void k(){};
-} 
-class A extends B implements I{
-} 
-interface I {
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test30/in/A.java
deleted file mode 100644
index bfa4f7f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test30/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-interface I{
-void m();
-}
-class A implements I, J{
-public void m(){};
-}
-interface J{
-void m();
-}
-class B implements J, K{
-public void m(){};
-}
-interface K{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test30/out/A.java
deleted file mode 100644
index 5f224c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test30/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-interface I{
-void k();
-}
-class A implements I, J{
-public void k(){};
-}
-interface J{
-void k();
-}
-class B implements J, K{
-public void k(){};
-}
-interface K{
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test31/in/A.java
deleted file mode 100644
index 0786e6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test31/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-interface I{
-void m();
-}
-class T{
-	void m(){
-		class X implements I{
-			public void m(){}
-		};
-		X x= new X();
-		x.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test31/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test31/out/A.java
deleted file mode 100644
index 6730892..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test31/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-interface I{
-void k();
-}
-class T{
-	void m(){
-		class X implements I{
-			public void k(){}
-		};
-		X x= new X();
-		x.k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test32/in/A.java
deleted file mode 100644
index 4f67f9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test32/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-interface I{
-void m();
-}
-class T implements I{
-	public void m(){
-		class X implements I{
-			public void m(){}
-		};
-		X x= new X();
-		x.m();
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test32/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test32/out/A.java
deleted file mode 100644
index c1f58ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test32/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-interface I{
-void k();
-}
-class T implements I{
-	public void k(){
-		class X implements I{
-			public void k(){}
-		};
-		X x= new X();
-		x.k();
-		k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test33/in/A.java
deleted file mode 100644
index 2aedcc3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test33/in/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-class A1 implements I, I1{
-public void m(){}
-}
-interface I1{
-void m();
-}
-class A2 implements I1, I2{
-public void m(){}
-}
-interface I2{
-void m();
-}
-class A3 implements I3, I2{
-public void m(){}
-}
-interface I3{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test33/out/A.java
deleted file mode 100644
index 1facb63..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test33/out/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-class A1 implements I, I1{
-public void k(){}
-}
-interface I1{
-void k();
-}
-class A2 implements I1, I2{
-public void k(){}
-}
-interface I2{
-void k();
-}
-class A3 implements I3, I2{
-public void k(){}
-}
-interface I3{
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test34/in/A.java
deleted file mode 100644
index 255c6b9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test34/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-
-class A1 implements I{
-public void m(){}
-}
-interface I1{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test34/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test34/out/A.java
deleted file mode 100644
index 4b8563e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test34/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-
-class A1 implements I{
-public void k(){}
-}
-interface I1{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test35/in/A.java
deleted file mode 100644
index 0b18234..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test35/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-interface I2{
-void m();
-}
-interface I3 extends I, I2{
-}
-class A implements I3{
-public void m(){}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test35/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test35/out/A.java
deleted file mode 100644
index fcbe37b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test35/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-interface I2{
-void k();
-}
-interface I3 extends I, I2{
-}
-class A implements I3{
-public void k(){}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test36/in/A.java
deleted file mode 100644
index 70cb32c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test36/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-interface I2{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test36/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test36/out/A.java
deleted file mode 100644
index d8a8fe0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test36/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-interface I2{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test37/in/A.java
deleted file mode 100644
index 51f4eb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test37/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-interface I2{
-void m();
-}
-interface I3 extends I{
-}
-interface I4 extends I3, I2{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test37/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test37/out/A.java
deleted file mode 100644
index 1feeb67..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test37/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-interface I2{
-void k();
-}
-interface I3 extends I{
-}
-interface I4 extends I3, I2{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test38/in/A.java
deleted file mode 100644
index 5f67be9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test38/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-class A{
-public void m(){}
-}
-class B1 extends A implements I{
-}
-class B2 extends A {
-public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test38/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test38/out/A.java
deleted file mode 100644
index 7ab2e0d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test38/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-class A{
-public void k(){}
-}
-class B1 extends A implements I{
-}
-class B2 extends A {
-public void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test39/in/A.java
deleted file mode 100644
index 51f4eb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test39/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void m();
-}
-interface I2{
-void m();
-}
-interface I3 extends I{
-}
-interface I4 extends I3, I2{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test39/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test39/out/A.java
deleted file mode 100644
index 1feeb67..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test39/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming I.m to k
-package p;
-interface I{
-void k();
-}
-interface I2{
-void k();
-}
-interface I3 extends I{
-}
-interface I4 extends I3, I2{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test4/in/A.java
deleted file mode 100644
index 70d4d12..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test4/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-class B {
-	public void m(){};
-} 
-class A extends B implements I{
-	public void m(){};
-}
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test4/out/A.java
deleted file mode 100644
index e6bd3c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test4/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-class B {
-	public void k(){};
-} 
-class A extends B implements I{
-	public void k(){};
-}
-interface I {
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test40/in/A.java
deleted file mode 100644
index 6ac8b0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test40/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-//renaming I.m to k
-interface I{
-	void m();
-}
-interface I2{
-	void m();
-}
-class A{
-}
-class B extends A implements I{
-public void m(){}
-}
-class C extends A implements I2{
-public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test40/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test40/out/A.java
deleted file mode 100644
index 546a461..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test40/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-//renaming I.m to k
-interface I{
-	void k();
-}
-interface I2{
-	void m();
-}
-class A{
-}
-class B extends A implements I{
-public void k(){}
-}
-class C extends A implements I2{
-public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test41/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test41/in/A.java
deleted file mode 100644
index 941088d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test41/in/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-//renaming I.m to k
-interface I{
-	void m();
-}
-interface I2{
-	void m();
-	void k();
-	
-}
-class A{
-}
-class B extends A implements I{
-public void m(){}
-}
-class C extends A implements I2{
-public void m(){}
-public void k(){}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test41/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test41/out/A.java
deleted file mode 100644
index 83eaff0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test41/out/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-//renaming I.m to k
-interface I{
-	void k();
-}
-interface I2{
-	void m();
-	void k();
-	
-}
-class A{
-}
-class B extends A implements I{
-public void k(){}
-}
-class C extends A implements I2{
-public void m(){}
-public void k(){}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test42/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test42/in/A.java
deleted file mode 100644
index 1215395..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test42/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//renaming I.m to k
-interface I{
-	void m();
-}
-interface I2{
-	void m();
-}
-class A{
-public void m(){}
-}
-class B extends A implements I{
-public void m(){}
-}
-class C extends A implements I2{
-public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test42/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test42/out/A.java
deleted file mode 100644
index c0a9e5b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test42/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//renaming I.m to k
-interface I{
-	void k();
-}
-interface I2{
-	void k();
-}
-class A{
-public void k(){}
-}
-class B extends A implements I{
-public void k(){}
-}
-class C extends A implements I2{
-public void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test43/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test43/in/A.java
deleted file mode 100644
index c210562..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test43/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void m();
-}
-class Test{
-	void k(){
-	}
-}
-class C implements I{
-	public void m(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test43/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test43/out/A.java
deleted file mode 100644
index 3945ff4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test43/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void k();
-}
-class Test{
-	void k(){
-	}
-}
-class C implements I{
-	public void k(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test44/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test44/in/A.java
deleted file mode 100644
index df5f328..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test44/in/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void m();
-}
-interface J{
-	void m();
-}
-interface J2 extends J{
-	void m();
-}
-
-class A{
-	public void m(){};
-}
-class C extends A implements I, J{
-	public void m(){};
-}
-class Test{
-	void k(){
-	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test44/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test44/out/A.java
deleted file mode 100644
index 3032211..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test44/out/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void k();
-}
-interface J{
-	void k();
-}
-interface J2 extends J{
-	void k();
-}
-
-class A{
-	public void k(){};
-}
-class C extends A implements I, J{
-	public void k(){};
-}
-class Test{
-	void k(){
-	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test45/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test45/in/A.java
deleted file mode 100644
index 27ca176..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test45/in/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-//renaming I.m to k
-interface I {
-void m();
-}
-class C1 implements I{
-	public void m(){};
-}
-class D{
-	void h(){
-		I a= new C1();
-		a.m();
-	}
-}
-class NotRel{
-	public void m(){};
-	void f(){
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test45/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test45/out/A.java
deleted file mode 100644
index af2fc07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test45/out/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-//renaming I.m to k
-interface I {
-void k();
-}
-class C1 implements I{
-	public void k(){};
-}
-class D{
-	void h(){
-		I a= new C1();
-		a.k();
-	}
-}
-class NotRel{
-	public void m(){};
-	void f(){
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test46/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test46/in/A.java
deleted file mode 100644
index c21e729..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test46/in/A.java
+++ /dev/null

@@ -1,21 +0,0 @@
-//nor ref update
-package p;
-//renaming I.m to k
-interface I {
-void m();
-}
-class C1 implements I{
-	public void m(){};
-}
-class D{
-	void h(){
-		I a= new C1();
-		a.m();
-	}
-}
-class NotRel{
-	public void m(){};
-	void f(){
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test46/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test46/out/A.java
deleted file mode 100644
index a6285d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test46/out/A.java
+++ /dev/null

@@ -1,21 +0,0 @@
-//nor ref update
-package p;
-//renaming I.m to k
-interface I {
-void k();
-}
-class C1 implements I{
-	public void m(){};
-}
-class D{
-	void h(){
-		I a= new C1();
-		a.m();
-	}
-}
-class NotRel{
-	public void m(){};
-	void f(){
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test47/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test47/in/A.java
deleted file mode 100644
index 2c113e2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test47/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//renaming I.m to k
-interface I {
-	void m();
-}
-class AQ implements I{
-	public void m(){}
-}
-
-class AQE extends AQ{
-	public void m(){
-		super.m();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test47/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test47/out/A.java
deleted file mode 100644
index 123757e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test47/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//renaming I.m to k
-interface I {
-	void k();
-}
-class AQ implements I{
-	public void k(){}
-}
-
-class AQE extends AQ{
-	public void k(){
-		super.k();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test5/in/A.java
deleted file mode 100644
index b85dfa1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test5/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-class B implements I{
-	public void m(){};
-} 
-class A extends B{
-	public void m(){};
-}
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test5/out/A.java
deleted file mode 100644
index 360aac9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test5/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-class B implements I{
-	public void k(){};
-} 
-class A extends B{
-	public void k(){};
-}
-interface I {
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test6/in/A.java
deleted file mode 100644
index 67da87a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test6/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-class B implements I{
-	public void m(){};
-} 
-class A extends B implements I{
-	public void m(){};
-}
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test6/out/A.java
deleted file mode 100644
index a75f6bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test6/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming I.m to k
-package p;
-class B implements I{
-	public void k(){};
-} 
-class A extends B implements I{
-	public void k(){};
-}
-interface I {
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test7/in/A.java
deleted file mode 100644
index 116b6bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test7/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void m();
-}
-interface I2 extends I{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test7/out/A.java
deleted file mode 100644
index fb57224..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/test7/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-interface I {
-	void k();
-}
-interface I2 extends I{
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail0/in/A.java
deleted file mode 100644
index c3d2d6b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail0/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-	void m();
-}
-class C implements I{
-	public void m(){}
-	public void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail1/in/A.java
deleted file mode 100644
index 7d763a1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail1/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-	void m();
-	void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail10/in/A.java
deleted file mode 100644
index 9c9d766..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail10/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//renaming I.m would require renaming a native method
-class A implements I{
-	public void m(){}
-}
-class B extends A{
-	public native void m();
-}
-interface I{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail11/in/A.java
deleted file mode 100644
index ae2f635..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail11/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//can't rename I.m to k - defined in subclass
-class A implements I{
-	public void m(){}
-}
-class B extends A{
-	public private void k(){}
-}
-interface I{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail12/in/A.java
deleted file mode 100644
index 824918a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail12/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//can't rename m to k - defined in subclass
-class A implements I{
-	public void m(){}
-}
-class B extends A{
-	public void k(){}
-}
-interface I{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail13/in/A.java
deleted file mode 100644
index 0ee357b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail13/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//can't rename m to k - defined in subclass
-class A implements I{
-	public void m(){
-	}
-}
-class B extends A{
-	static void k(){
-	}
-}
-interface I{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail14/in/A.java
deleted file mode 100644
index 3e0eeed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail14/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//can't rename m to k - defined in subclass
-class A implements I{
-	public void m(){
-	}
-}
-class B extends A{
-	private static void k(){
-	}
-}
-interface I{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail15/in/A.java
deleted file mode 100644
index b921f19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail15/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//can't rename A.m to k - defined in superclass
-class B {
-	void k(){
-	}
-}
-class A extends B implements I{
-	public void m(){
-	}
-}
-interface I{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail16/in/A.java
deleted file mode 100644
index 2ad70f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail16/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//can't rename A.m to k - defined in superclass
-class B {
-	static void k(){
-	}
-}
-class A extends B implements I{
-	public void m(){
-	}
-}
-interface I{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail17/in/A.java
deleted file mode 100644
index c4a3e84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail17/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//can't rename A.m to k - defined in superclass
-class B {
-	void k(){
-	}
-}
-class A extends B implements I{
-	public void m(){
-	}
-}
-interface I{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail18/in/A.java
deleted file mode 100644
index 1eddcad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail18/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//can't rename I.m to k - duplicate
-interface I {
-	void m();
-}
-class B implements I{
-	public void m(){}
-	private int k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail19/in/A.java
deleted file mode 100644
index 3b7102c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail19/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename A.m to k - duplicate
-class A implements I{
-	static void k(){}
-	public void m(){
-	}
-}
-interface I{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail20/in/A.java
deleted file mode 100644
index e19b316..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail20/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//can't rename A.m - declared in superclass
-class B {
-	public native void m();
-}
-class A extends B implements I{
-	public void m(){}
-}
-interface I{
-	void m();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail21/in/A.java
deleted file mode 100644
index 3d78d9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail21/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//can't rename A.m to k
-package p;
-public class A implements I{
-	public void m(String m){
-		System.out.println("A");
-	}
-}
-class B extends A{
-	public void k(Object m){
-		System.out.println("B");
-	}
-}
-interface I{
-void m(String k);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail22/in/A.java
deleted file mode 100644
index f295f57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail22/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//can't rename A.m to k
-package p;
-public class A implements I{
-	public void m(Object m){
-		System.out.println("A");
-	}
-}
-class B extends A{
-	public void k(String m){
-		System.out.println("B");
-	}
-}
-interface I{
-void m(Object s);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail23/in/A.java
deleted file mode 100644
index 32b8728..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail23/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface I{
-	String toString();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail24/in/A.java
deleted file mode 100644
index 694796b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail24/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//can't rename I.m to k
-class B{
-	public void k(){}
-}
-class A extends B implements I{
-	public void m(){}
-}
-interface I{
-	abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail25/in/A.java
deleted file mode 100644
index 05bcab4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail25/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-void m();
-}
-class A{
-public void m(){};
-}
-class B1 extends A implements J{
-		public void k(){}
-}
-class B2 extends A implements I{
-
-}
-interface J{
-void m();
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail26/in/A.java
deleted file mode 100644
index 0e4124e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail26/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-void m();
-}
-class A{
-public void m(){};
-}
-class B1 extends A implements J{
-}
-class B2 extends A implements I{
-}
-interface J{
-void m();
-}
-class C implements J{
-public void m(){};
-public void k(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail27/in/A.java
deleted file mode 100644
index 7d8be81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail27/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-interface I{
-void m();
-}
-class A implements I, J{
-public void m(){};
-}
-interface J{
-void m();
-}
-class B implements J, K{
-public void m(){};
-public void k(){};
-
-}
-interface K{
-void m();
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail28/in/A.java
deleted file mode 100644
index 4975fe7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail28/in/A.java
+++ /dev/null

@@ -1,25 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-void m();
-}
-class A1 implements I, I1{
-public void m(){}
-}
-interface I1{
-void m();
-}
-class A2 implements I1, I2{
-public void m(){}
-}
-interface I2{
-void m();
-}
-class A3 implements I3, I2{
-public void m(){}
-public void k(){}
-}
-interface I3{
-void m();
-void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail29/in/A.java
deleted file mode 100644
index 0832d75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail29/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-void m();
-}
-class A{
-public void m(){}
-}
-class B1 extends A implements I{
-}
-class B2 extends A {
-public void m(){}
-public void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail3/in/A.java
deleted file mode 100644
index 0dd7ffe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail3/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-	void m();
-}
-class C implements I{
-	public void m();
-	public void k();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail30/in/A.java
deleted file mode 100644
index 9be82b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail30/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//can't rename A.toString
-package p;
-interface I{
-	public java.lang.String toString();
-}
-class A implements I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail31/in/A.java
deleted file mode 100644
index f77d7bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail31/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//can't rename A.toString
-package p;
-interface I{
-	public String toString();
-}
-class A implements I{
-	public java.lang.String toString();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail32/in/A.java
deleted file mode 100644
index 266de81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail32/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to toString
-//see the spec: 9.2
-package p;
-interface I{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail33/in/A.java
deleted file mode 100644
index 7f62c76..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail33/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to toString
-//see the spec: 9.2
-package p;
-interface I{
-	String m() throws Exception;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail34/in/A.java
deleted file mode 100644
index acdbe6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail34/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to equals
-//see the lang spec: 9.2
-package p;
-interface I{
-	void m(Object o);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail35/in/A.java
deleted file mode 100644
index 49acc1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail35/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to equals
-//see the lang spec: 9.2
-package p;
-interface I{
-	void m(java.lang.Object o);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail36/in/A.java
deleted file mode 100644
index 66c4eb3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail36/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to getClass
-//see the lang spec: 9.2
-package p;
-interface I{
-	int m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail37/in/A.java
deleted file mode 100644
index 85bfa66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail37/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to hashCode
-//see the lang spec: 9.2
-package p;
-interface I{
-	String m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail38/in/A.java
deleted file mode 100644
index 95dfb37..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail38/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to notify
-//see the lang spec: 9.2
-package p;
-interface I{
-	String m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail39/in/A.java
deleted file mode 100644
index 41a77fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail39/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to notifyAll
-//see the lang spec: 9.2
-package p;
-interface I{
-	String m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail4/in/A.java
deleted file mode 100644
index eaeb936..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail4/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-	void m();
-}
-class C1 {
-	public void k(){}
-}
-class C2 extends C1 implements I{
-	public void m(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail40/in/A.java
deleted file mode 100644
index 4a86f82..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail40/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to wait
-//see the lang spec: 9.2
-package p;
-interface I{
-	String m(long timeout, int nanos);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail41/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail41/in/A.java
deleted file mode 100644
index 4a022be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail41/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to wait
-//see the lang spec: 9.2
-package p;
-interface I{
-	String m(long timeout) throws InterruptedException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail42/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail42/in/A.java
deleted file mode 100644
index d9c9ece..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail42/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to wait
-//see the lang spec: 9.2
-package p;
-interface I{
-	String m() throws InterruptedException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail43/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail43/in/A.java
deleted file mode 100644
index 0b159e6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail43/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//can't rename m to wait
-//see the lang spec: 9.2
-package p;
-interface I{
-	String m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail44/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail44/in/A.java
deleted file mode 100644
index 0a21f10..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail44/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming I.m to k
-package p;
-interface I extends I2{
-void m();
-}
-interface I2{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail45/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail45/in/A.java
deleted file mode 100644
index 57d503f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail45/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-interface J{
-void m();
-}
-interface I extends J{
-void m();
-}
-interface I1 extends J{
-void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail5/in/A.java
deleted file mode 100644
index ab81c78..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail5/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-	void m();
-}
-class C1 {
-	static void k(){}
-}
-class C2 extends C1 implements I{
-	public void m(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail6/in/A.java
deleted file mode 100644
index 5e1ee21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail6/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//can't rename I.m to k
-package p;
-interface I{
-	void m();
-}
-class C1 {
-	static void k(){}
-}
-abstract class C2 extends C1 implements I{
-	abstract public void m();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail7/in/A.java
deleted file mode 100644
index 623d316..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail7/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//can't rename I.m to k
-abstract class B{
-	abstract void k();
-}
-class A extends B implements I{
-	public void m(){}
-}
-interface I{
-	public void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail8/in/A.java
deleted file mode 100644
index b0e2291..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail8/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//can't rename I.m to k
-class B{
-	public void k(int x){}
-}
-class A extends B implements I{
-	public void m(int f){}
-}
-interface I{
-	public void m(int y);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail9/in/A.java
deleted file mode 100644
index 25017e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodInInterface/testFail9/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//can't rename m to k
-class C {
-	public void k(){}
-}
-class B extends C{
-}
-class A extends B implements I{
-	public void m(){}
-}
-interface I{
-	public void m();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test0/in/A.java
deleted file mode 100644
index 6ee5fcc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test0/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-/**
- * @see #f
- * @see A#f
- * @see B#f
- */
-class A{
-	/**
-	 * @see #f
-	 */
-	int f;
-}
-
-class B{
-	/**
-	 * @see A#f
-	 */
-	int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test0/out/A.java
deleted file mode 100644
index e8c6ae9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test0/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-/**
- * @see #g
- * @see A#g
- * @see B#f
- */
-class A{
-	/**
-	 * @see #g
-	 */
-	int g;
-}
-
-class B{
-	/**
-	 * @see A#g
-	 */
-	int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test1/in/A.java
deleted file mode 100644
index f31ed22..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test1/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	protected int f;
-	void m(){
-		f++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test1/out/A.java
deleted file mode 100644
index b31f55f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test1/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	protected int g;
-	void m(){
-		g++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test10/in/A.java
deleted file mode 100644
index 47d015c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test10/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	public A f;
-	public int k;
-	void m(){
-		for (int g= 0; g < 10; g++){
-		
-		}
-		f.k=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test10/out/A.java
deleted file mode 100644
index 9701909..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test10/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	public A g;
-	public int k;
-	void m(){
-		for (int g= 0; g < 10; g++){
-		
-		}
-		g.k=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test11/in/A.java
deleted file mode 100644
index 212d616..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test11/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int f;
-}
-class B extends A{
-	A a;
-	void m(){
-		int g= a.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test11/out/A.java
deleted file mode 100644
index 4c6d120..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test11/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int g;
-}
-class B extends A{
-	A a;
-	void m(){
-		int g= a.g;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test12/in/A.java
deleted file mode 100644
index cedb240..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test12/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class A {
-	static int f= 0;
-	void m(){
-		A.f= 0; /**/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test12/out/A.java
deleted file mode 100644
index b62dcc2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test12/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class A {
-	static int g= 0;
-	void m(){
-		A.g= 0; /**/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test13/in/A.java
deleted file mode 100644
index b2ef453..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test13/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class A {
-	static int f= 0;
-	void m(){
-		p.A.f= 0; /**/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test13/out/A.java
deleted file mode 100644
index 83bd4f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test13/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class A {
-	static int g= 0;
-	void m(){
-		p.A.g= 0; /**/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test14/in/A.java
deleted file mode 100644
index 0fe2457..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test14/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//no ref update
-package p;
-public class A {
-	static int f= 0;
-	void m(){
-		p.A.f= 0; /**/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test14/out/A.java
deleted file mode 100644
index 309aa0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test14/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//no ref update
-package p;
-public class A {
-	static int g= 0;
-	void m(){
-		p.A.f= 0; /**/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test15/in/A.java
deleted file mode 100644
index aa68794..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test15/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//no ref update
-package p;
-public class A {
-	public int f= 0;
-	void m(){
-		f= 0; /**/
-	}
-}
-class B{
-	void m(){
-		new A().f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test15/out/A.java
deleted file mode 100644
index 20f65e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test15/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//no ref update
-package p;
-public class A {
-	public int g= 0;
-	void m(){
-		f= 0; /**/
-	}
-}
-class B{
-	void m(){
-		new A().f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test16/in/A.java
deleted file mode 100644
index 62fd9d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test16/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int f;
-	public int getF() {
-		return (this.f);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test16/out/A.java
deleted file mode 100644
index 4e08471..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test16/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int g;
-	public int getF() {
-		return (this.g);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test17/in/A.java
deleted file mode 100644
index f97cafd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test17/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int f; // field f, or A.f
-	public int getF() {
-		return (this.f);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test17/out/A.java
deleted file mode 100644
index e486fdd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test17/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int g; // field g, or A.g
-	public int getF() {
-		return (this.f);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test2/in/A.java
deleted file mode 100644
index ff87d50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test2/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A{
-	int f= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test2/out/A.java
deleted file mode 100644
index c083c1b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test2/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A{
-	int g= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test3/in/A.java
deleted file mode 100644
index 8ae7bb8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test3/in/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-/**
- * @see #f
- * @see A#f
- * @see p.A#f
- * @see B#f
- */
-class A{
-	protected int f;
-	void m(){
-		f++;
-	}
-}
-/**
- * @see #f
- */
-class B{
-	A a;
-	protected int f;
-	void m(){
-		a.f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test3/out/A.java
deleted file mode 100644
index 38b1d21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test3/out/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-/**
- * @see #g
- * @see A#g
- * @see p.A#g
- * @see B#f
- */
-class A{
-	protected int g;
-	void m(){
-		g++;
-	}
-}
-/**
- * @see #f
- */
-class B{
-	A a;
-	protected int f;
-	void m(){
-		a.g= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test4/in/A.java
deleted file mode 100644
index 96cfc37..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test4/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	protected int f;
-	void m(){
-		f++;
-	}
-}
-class B extends A{
-	void m(){
-		f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test4/out/A.java
deleted file mode 100644
index 700b2f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test4/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	protected int g;
-	void m(){
-		g++;
-	}
-}
-class B extends A{
-	void m(){
-		g= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test5/in/A.java
deleted file mode 100644
index f6469d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test5/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A{
-	protected int f;
-	void m(){
-		f++;
-	}
-}
-
-class AA extends A{
-	protected int f;
-}
-
-class B{
-	A a;
-	void m(){
-		a.f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test5/out/A.java
deleted file mode 100644
index 51818fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test5/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A{
-	protected int g;
-	void m(){
-		g++;
-	}
-}
-
-class AA extends A{
-	protected int f;
-}
-
-class B{
-	A a;
-	void m(){
-		a.g= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test6/in/A.java
deleted file mode 100644
index 6e60f89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test6/in/A.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p;
-class A{
-	protected int f;
-	void m(){
-		f++;
-	}
-}
-
-class AA extends A{
-	protected int f;
-}
-
-class B{
-	A a;
-	AA b;
-	A ab= new AA();
-	void m(){
-		a.f= 0;
-		b.f= 0;
-		ab.f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test6/out/A.java
deleted file mode 100644
index d730014..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test6/out/A.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package p;
-class A{
-	protected int g;
-	void m(){
-		g++;
-	}
-}
-
-class AA extends A{
-	protected int f;
-}
-
-class B{
-	A a;
-	AA b;
-	A ab= new AA();
-	void m(){
-		a.g= 0;
-		b.f= 0;
-		ab.g= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test7/in/A.java
deleted file mode 100644
index 7553eba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test7/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	int f;
-	void m(int g){
-		this.f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test7/out/A.java
deleted file mode 100644
index d332730..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test7/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	int g;
-	void m(int g){
-		this.g= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test8/in/A.java
deleted file mode 100644
index 97e3a36..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test8/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	public A f;
-	public int k;
-	void m(){
-		f.f.f.k=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test8/out/A.java
deleted file mode 100644
index 83a958b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test8/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	public A g;
-	public int k;
-	void m(){
-		g.g.g.k=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test9/in/A.java
deleted file mode 100644
index 5c15dcf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test9/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	public A f;
-	public int k;
-	void m(){
-		{
-			int g;
-		}
-		f.k=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test9/out/A.java
deleted file mode 100644
index 92d20b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/test9/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	public A g;
-	public int k;
-	void m(){
-		{
-			int g;
-		}
-		g.k=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testBug5821/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testBug5821/in/A.java
deleted file mode 100644
index 90c971f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testBug5821/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class A {
-    public int test = 0;
-
-    public static void main(String[] args) {
-        A test = new A();
-
-        test.test = 1;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testBug5821/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testBug5821/out/A.java
deleted file mode 100644
index 8f2706a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testBug5821/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class A {
-    public int test1 = 0;
-
-    public static void main(String[] args) {
-        A test = new A();
-
-        test.test1 = 1;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail0/in/A.java
deleted file mode 100644
index 039339c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	int f;
-	private int g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail1/in/A.java
deleted file mode 100644
index 282d63c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail1/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	public int f;
-	public String g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail10/in/A.java
deleted file mode 100644
index b1131d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail10/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	public A f;
-	public int k;
-	void m(){
-		for (int g= 0; g < 10; g++){
-			f.k=0;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail11/in/A.java
deleted file mode 100644
index b263907..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail11/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-class A{
-	int f;
-	void m(){
-		{
-				int g;
-			{
-				{
-					int y= f + 0;
-				}
-			}
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail12/in/A.java
deleted file mode 100644
index 36c9d0d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail12/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	int f;
-	void m(){
-		int g= f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail13/in/A.java
deleted file mode 100644
index b2eb79d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail13/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	int f;
-}
-class B extends A{
-	A a;
-	void m(){
-		int g= f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail14/in/A.java
deleted file mode 100644
index e09468d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail14/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	int f;
-}
-class B extends A{
-	A a;
-	int m(){
-		int g;
-		return f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail2/in/A.java
deleted file mode 100644
index 42161ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail2/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	int f;
-	public static int g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail3/in/A.java
deleted file mode 100644
index a887ae1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	protected int f;
-	private static int g;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail4/in/A.java
deleted file mode 100644
index e2e3c00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail4/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	public static int f;
-	public Object g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail5/in/A.java
deleted file mode 100644
index 731bb0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail5/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class B {
-	int g;
-	class A {
-		final int f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail6/in/A.java
deleted file mode 100644
index 2efe7c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail6/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	private int f;
-	class B {
-		public int g;
-	}
-}	
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail7/in/A.java
deleted file mode 100644
index 0ebc1c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail7/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	int f;
-	void m(int g){
-		f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail8/in/A.java
deleted file mode 100644
index f841ee0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail8/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	int f;
-	void m(){
-		Object g;
-		f++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail9/in/A.java
deleted file mode 100644
index 58b9cd4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameNonPrivateField/testFail9/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	public A f;
-	public int k;
-	void m(){
-		A g;
-		f.f.f.k=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test0/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test0/in/r/A.java
deleted file mode 100644
index 889b397..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test0/in/r/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package r;
-/**
- * This is in r.
- * @see r
- * @see r.A
- * @see r.A#A()
- */
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test0/out/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test0/out/p1/A.java
deleted file mode 100644
index eac7aa1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test0/out/p1/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p1;
-/**
- * This is in r.
- * @see p1
- * @see p1.A
- * @see p1.A#A()
- */
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test1/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test1/in/r/A.java
deleted file mode 100644
index 362ea30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test1/in/r/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package r;
-class A{
-	r.A a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test1/out/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test1/out/p1/A.java
deleted file mode 100644
index b0933c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test1/out/p1/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p1;
-class A{
-	p1.A a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/in/fred/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/in/fred/A.java
deleted file mode 100644
index 4e91e5a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/in/fred/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package fred;
-import r.*;
-class A{
-	r.A a;
-	A a1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/in/r/A.java
deleted file mode 100644
index 5833a58..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/in/r/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package r;
-public class A{
-	r.A a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/out/fred/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/out/fred/A.java
deleted file mode 100644
index 2fbde2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/out/fred/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package fred;
-import p1.*;
-class A{
-	p1.A a;
-	A a1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/out/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/out/p1/A.java
deleted file mode 100644
index e4cf018..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test2/out/p1/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p1;
-public class A{
-	p1.A a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/in/fred/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/in/fred/A.java
deleted file mode 100644
index bb332c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/in/fred/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package fred;
-import r.r.*;
-class A{
-	r.r.B a;
-	A a1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/in/r/r/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/in/r/r/B.java
deleted file mode 100644
index 8620e84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/in/r/r/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package r.r;
-public class B{
-	r.r.B a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/out/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/out/r/A.java
deleted file mode 100644
index bbc81b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/out/r/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package r;
-import r.r.*;
-class A{
-	r.r.B a;
-	A a1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/out/r/r/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/out/r/r/B.java
deleted file mode 100644
index 8620e84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test3/out/r/r/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package r.r;
-public class B{
-	r.r.B a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/in/r/A.java
deleted file mode 100644
index ebb7363..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/in/r/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r;
-class C{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/in/r/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/in/r/p1/A.java
deleted file mode 100644
index 2878942..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/in/r/p1/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r.p1;
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/out/q/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/out/q/A.java
deleted file mode 100644
index 5fbbe5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/out/q/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package q;
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/out/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/out/r/A.java
deleted file mode 100644
index ebb7363..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test4/out/r/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r;
-class C{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test5/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test5/in/r/A.java
deleted file mode 100644
index 9307b7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test5/in/r/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//no ref update
-package r;
-class A{
-	r.A d;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test5/out/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test5/out/p1/A.java
deleted file mode 100644
index 4860a3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test5/out/p1/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//no ref update
-package p1;
-class A{
-	r.A d;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test6/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test6/in/r/A.java
deleted file mode 100644
index 460f1b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test6/in/r/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//no ref update but update of textual match to r and "r"
-package r;
-class A{
-	r.A d;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test6/out/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test6/out/p1/A.java
deleted file mode 100644
index 0647bcc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/test6/out/p1/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//no ref update but update of textual match to p1 and "p1"
-package p1;
-class A{
-	r.A d;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail0/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail0/in/r/A.java
deleted file mode 100644
index 96dae97..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail0/in/r/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r;
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail1/in/r/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail1/in/r/p1/A.java
deleted file mode 100644
index 2878942..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail1/in/r/p1/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r.p1;
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail10/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail10/in/r/A.java
deleted file mode 100644
index ebb7363..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail10/in/r/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r;
-class C{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail10/in/r/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail10/in/r/p1/A.java
deleted file mode 100644
index 2878942..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail10/in/r/p1/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r.p1;
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail11/in/q/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail11/in/q/A.java
deleted file mode 100644
index ebb7363..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail11/in/q/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r;
-class C{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail11/in/q/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail11/in/q/p1/A.java
deleted file mode 100644
index 2878942..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail11/in/q/p1/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r.p1;
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail2/in/r/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail2/in/r/p1/A.java
deleted file mode 100644
index 2878942..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail2/in/r/p1/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package r.p1;
-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail3/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail3/in/r/A.java
deleted file mode 100644
index 2cf2cac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail3/in/r/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package r;
-class A{
-	native void f();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail4/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail4/in/r/A.java
deleted file mode 100644
index ac8b4bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail4/in/r/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package r;
-class A{
-	class B{
-		native void f();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail5/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail5/in/r/A.java
deleted file mode 100644
index e2601f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail5/in/r/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package r;
-public class A{
-	public class B{
-		public static void main(String[] args){
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail6/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail6/in/r/A.java
deleted file mode 100644
index 09f2187..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail6/in/r/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package r;
-class A{
-	public static void main(String[] args){
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail7/in/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail7/in/p1/A.java
deleted file mode 100644
index b6a96e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail7/in/p1/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p1;
-class B{
-	void m(AA fred){
-		r.A.length();
-	}
-}
-class AA{
-	static String A;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail7/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail7/in/r/A.java
deleted file mode 100644
index 323bb3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail7/in/r/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package r;
-public class A{
-	public static int length(){return 42;};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail8/in/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail8/in/p1/A.java
deleted file mode 100644
index e561724..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail8/in/p1/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p1;
-import r.*;
-class B{
-	void m(){
-		r.A a;
-	}
-}
-class fred{
-	class A{};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail8/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail8/in/r/A.java
deleted file mode 100644
index 5ce5e47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail8/in/r/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package r;
-public class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail9/in/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail9/in/p1/A.java
deleted file mode 100644
index 2c4fd17..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail9/in/p1/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p1;
-class B{
-	native void m(p.A a);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail9/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail9/in/r/A.java
deleted file mode 100644
index 5ce5e47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testFail9/in/r/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package r;
-public class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcPrg/p/p/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcPrg/p/p/A.java
deleted file mode 100644
index f8557b1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcPrg/p/p/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p.p; //p.p -> q
-/**
- * @see p.p.A and subclasses
- */
-public class A {
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/p/p/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/p/p/ATest.java
deleted file mode 100644
index 60ef000..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/p/p/ATest.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p.p;
-
-public class ATest {
-	A a; // is A unique in p.p?
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/tests/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/tests/AllTests.java
deleted file mode 100644
index 4e391fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/in/srcTest/tests/AllTests.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package tests;
-
-import p.p.* /* p.p - textual ref */;
-
-/**
- * The field {@link aTest aTest} has an {@link ATest#a}.
- * @see p.p.ATest
- */
-public class AllTests {
-	ATest aTest;
-	A a;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcPrg/q/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcPrg/q/A.java
deleted file mode 100644
index 581a023..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcPrg/q/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package q; //q -> q
-/**
- * @see q.A and subclasses
- */
-public class A {
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/p/p/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/p/p/ATest.java
deleted file mode 100644
index a049da6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/p/p/ATest.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p.p;
-
-import q.A;
-
-public class ATest {
-	A a; // is A unique in q?
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java
deleted file mode 100644
index b3c8964..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots1/out/srcTest/tests/AllTests.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package tests;
-
-import p.p.ATest;
-import q.*;
-
-/**
- * The field {@link aTest aTest} has an {@link ATest#a}.
- * @see q.ATest
- */
-public class AllTests {
-	ATest aTest;
-	A a;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcPrg/p/p/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcPrg/p/p/A.java
deleted file mode 100644
index 119ba1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcPrg/p/p/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p.p;
-
-public class A {
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/ATest.java
deleted file mode 100644
index 1a94a1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/ATest.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p.p;
-
-import p.p.*; //myself
-
-public class ATest {
-	A aFromOtherPackageFragment;
-	p.p.A aQualifiedFromNamesake;
-	
-	public void test1() {
-		TestHelper.log("x");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/TestHelper.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/TestHelper.java
deleted file mode 100644
index e0d5861..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/p/p/TestHelper.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p.p;
-import java.util.Date;
-public class TestHelper {
-	public static void log(String s) {
-		System.out.println(new Date() + ": " + s);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/AllTests.java
deleted file mode 100644
index 982f144..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/AllTests.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package tests;
-
-import p.p.*; //danger!
-
-import p.p.ATest;
-import p.p.A;
-
-public class AllTests {
-	ATest aTest;
-	p.p.ATest aQualifiedTest;
-
-	A a;
-	p.p.A aQualified;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/QualifiedTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/QualifiedTests.java
deleted file mode 100644
index df0c6f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/in/srcTest/tests/QualifiedTests.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package tests;
-
-public class QualifiedTests {
-	static {
-		p.p.ATest aQualifiedTest;
-		p.p.A aQualified;
-	}
-	static {
-		p.
-		//comment
-		p/*internal*/.ATest aQualifiedTest;
-		p.
-		p //unreadable
-		/*stuff*/.A aQualified;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcPrg/q/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcPrg/q/A.java
deleted file mode 100644
index 27bbd75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcPrg/q/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package q;
-
-public class A {
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/ATest.java
deleted file mode 100644
index 07594b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/ATest.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p.p;
-
-import q.*;
-
-public class ATest {
-	A aFromOtherPackageFragment;
-	q.A aQualifiedFromNamesake;
-	
-	public void test1() {
-		TestHelper.log("x");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/TestHelper.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/TestHelper.java
deleted file mode 100644
index e0d5861..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/p/p/TestHelper.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p.p;
-import java.util.Date;
-public class TestHelper {
-	public static void log(String s) {
-		System.out.println(new Date() + ": " + s);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java
deleted file mode 100644
index 677fccb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/AllTests.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package tests;
-
-
-import p.p.ATest;
-import q.*;
-
-public class AllTests {
-	ATest aTest;
-	p.p.ATest aQualifiedTest;
-
-	A a;
-	q.A aQualified;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/QualifiedTests.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/QualifiedTests.java
deleted file mode 100644
index 75b7cf3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots2/out/srcTest/tests/QualifiedTests.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package tests;
-
-public class QualifiedTests {
-	static {
-		p.p.ATest aQualifiedTest;
-		q.A aQualified;
-	}
-	static {
-		p.
-		//comment
-		p/*internal*/.ATest aQualifiedTest;
-		q //unreadable
-		/*stuff*/.A aQualified;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/in/srcPrg/p/p/ToQ.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/in/srcPrg/p/p/ToQ.java
deleted file mode 100644
index c89a2ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/in/srcPrg/p/p/ToQ.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p.p;
-
-public class ToQ extends Ref {
-	Ref r;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/in/srcTest/p/p/Ref.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/in/srcTest/p/p/Ref.java
deleted file mode 100644
index 209140e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/in/srcTest/p/p/Ref.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p.p;
-
-public class Ref {
-	ToQ t;
-	ToQ t2;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/out/srcPrg/q/ToQ.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/out/srcPrg/q/ToQ.java
deleted file mode 100644
index 7fe1bcd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/out/srcPrg/q/ToQ.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package q;
-
-import p.p.Ref;
-
-public class ToQ extends Ref {
-	Ref r;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/out/srcTest/p/p/Ref.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/out/srcTest/p/p/Ref.java
deleted file mode 100644
index 4f2cfa8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots3/out/srcTest/p/p/Ref.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p.p;
-
-import q.ToQ;
-
-public class Ref {
-	ToQ t;
-	ToQ t2;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/A.java
deleted file mode 100644
index 086a0bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-public class A {
-	public class ARunner implements Runnable {
-		public void run() {
-			new ATest.ATestI();
-			new ATest.ATestI.ATestIIb();
-		}
-	}
-	B.BRunner br;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/B.java
deleted file mode 100644
index eb5c869..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcPrg/p/B.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-import p.ATest.ATestI;
-import p.ATest.ATestI.ATestIIb;
-import p.A.ARunner;
-
-public class B {
-	public class BRunner implements Runnable {
-		public void run() {
-			(new ATestI()).new ATestII();
-			new ATestIIb();
-		}
-	}
-	ARunner ar;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcTest/p/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcTest/p/ATest.java
deleted file mode 100644
index 23e9bf8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/in/srcTest/p/ATest.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-import p.B.BRunner;
-
-public class ATest {
-	A.ARunner runner;
-	BRunner br;
-	
-	public static class ATestI {
-		public class ATestII {}
-		public static class ATestIIb {}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/A.java
deleted file mode 100644
index 6dc9713..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package a.b.c;
-
-import p.ATest;
-
-public class A {
-	public class ARunner implements Runnable {
-		public void run() {
-			new ATest.ATestI();
-			new ATest.ATestI.ATestIIb();
-		}
-	}
-	B.BRunner br;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/B.java
deleted file mode 100644
index bb1b193..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcPrg/a/b/c/B.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package a.b.c;
-
-import a.b.c.A.ARunner;
-import p.ATest.ATestI;
-import p.ATest.ATestI.ATestIIb;
-
-public class B {
-	public class BRunner implements Runnable {
-		public void run() {
-			(new ATestI()).new ATestII();
-			new ATestIIb();
-		}
-	}
-	ARunner ar;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcTest/p/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcTest/p/ATest.java
deleted file mode 100644
index 08153e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots4/out/srcTest/p/ATest.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-import a.b.c.A;
-import a.b.c.B.BRunner;
-
-public class ATest {
-	A.ARunner runner;
-	BRunner br;
-	
-	public static class ATestI {
-		public class ATestII {}
-		public static class ATestIIb {}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/in/srcPrg/p/p/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/in/srcPrg/p/p/A.java
deleted file mode 100644
index b051539..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/in/srcPrg/p/p/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p.p;
-
-public class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/in/srcTest/p/p/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/in/srcTest/p/p/ATest.java
deleted file mode 100644
index bacb85c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/in/srcTest/p/p/ATest.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p.p;
-
-public class ATest { //srcTest
-	A t;
-	A t2;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/out/srcPrg/p/p/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/out/srcPrg/p/p/A.java
deleted file mode 100644
index b051539..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/out/srcPrg/p/p/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p.p;
-
-public class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/out/srcTest/q/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/out/srcTest/q/ATest.java
deleted file mode 100644
index 35a2fe7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots5/out/srcTest/q/ATest.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package q;
-
-import p.p.A;
-
-public class ATest { //srcTest
-	A t;
-	A t2;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/in/srcPrg/p/p/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/in/srcPrg/p/p/A.java
deleted file mode 100644
index b051539..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/in/srcPrg/p/p/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p.p;
-
-public class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/in/srcTest/p/p/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/in/srcTest/p/p/ATest.java
deleted file mode 100644
index c81eec4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/in/srcTest/p/p/ATest.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p.p;
-
-import p.p.A;
-
-public class ATest {
-	A a;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/out/srcPrg/p/p/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/out/srcPrg/p/p/A.java
deleted file mode 100644
index b051539..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/out/srcPrg/p/p/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p.p;
-
-public class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/out/srcTest/cheese/ATest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/out/srcTest/cheese/ATest.java
deleted file mode 100644
index 6b24812..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots6/out/srcTest/cheese/ATest.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package cheese;
-
-import p.p.A;
-
-public class ATest {
-	A a;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.other/pack/Namesake.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.other/pack/Namesake.java
deleted file mode 100644
index fc04046..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.other/pack/Namesake.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package pack;
-
-public class Namesake {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/Referer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/Referer.java
deleted file mode 100644
index 5086136..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/Referer.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package pack;
-
-public class Referer {
-	DingsDa dd;
-	Namesake n;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/man/StarImporter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/man/StarImporter.java
deleted file mode 100644
index 792945e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj.ref/pack/man/StarImporter.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package pack.man;
-
-import pack.*;
-
-public class StarImporter {
-	DingsDa dida;
-	Referer ref;
-	Namesake ns;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj/pack/DingsDa.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj/pack/DingsDa.java
deleted file mode 100644
index dd569cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/in/srcPrj/pack/DingsDa.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package pack;
-
-public class DingsDa {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.other/pack/Namesake.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.other/pack/Namesake.java
deleted file mode 100644
index fc04046..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.other/pack/Namesake.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package pack;
-
-public class Namesake {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/Referer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/Referer.java
deleted file mode 100644
index ce8f057..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/Referer.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package pack;
-
-import com.packt.DingsDa;
-
-public class Referer {
-	DingsDa dd;
-	Namesake n;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/man/StarImporter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/man/StarImporter.java
deleted file mode 100644
index 5366b30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj.ref/pack/man/StarImporter.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package pack.man;
-
-import com.packt.*;
-import pack.Namesake;
-import pack.Referer;
-
-public class StarImporter {
-	DingsDa dida;
-	Referer ref;
-	Namesake ns;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj/com/packt/DingsDa.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj/com/packt/DingsDa.java
deleted file mode 100644
index 5a33ebb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testImportFromMultiRoots7/out/srcPrj/com/packt/DingsDa.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package com.packt;
-
-public class DingsDa {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testReadOnly/in/r/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testReadOnly/in/r/A.java
deleted file mode 100644
index 9307b7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testReadOnly/in/r/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//no ref update
-package r;
-class A{
-	r.A d;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testReadOnly/out/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testReadOnly/out/p1/A.java
deleted file mode 100644
index 4860a3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePackage/testReadOnly/out/p1/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//no ref update
-package p1;
-class A{
-	r.A d;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_in.java
deleted file mode 100644
index 0519ecb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_in.java
+++ /dev/null

@@ -1 +0,0 @@
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_out.java
deleted file mode 100644
index 0519ecb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_out.java
+++ /dev/null

@@ -1 +0,0 @@
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test0_in.java
deleted file mode 100644
index f99f456..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test0_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test0_out.java
deleted file mode 100644
index a595b24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test0_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(int j){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test10_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test10_in.java
deleted file mode 100644
index 35d3439..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test10_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	native void m(int i);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test10_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test10_out.java
deleted file mode 100644
index 58f2f20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test10_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	native void m(int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test11_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test11_in.java
deleted file mode 100644
index eab99a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test11_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//rename to j
-package p;
-class A{
-	int k;
-	void m(int i){
-		A a= new A(){
-			void m(int i){
-				i++;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test11_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test11_out.java
deleted file mode 100644
index 4dc6467..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test11_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//rename to j
-package p;
-class A{
-	int k;
-	void m(int j){
-		A a= new A(){
-			void m(int i){
-				i++;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test12_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test12_in.java
deleted file mode 100644
index ea84baf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test12_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//rename to j
-package p;
-class A{
-	void m(final int i){
-		A a= new A(){
-			void m(int k){
-				k= i;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test12_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test12_out.java
deleted file mode 100644
index f2afa2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test12_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//rename to j
-package p;
-class A{
-	void m(final int j){
-		A a= new A(){
-			void m(int k){
-				k= j;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test13_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test13_in.java
deleted file mode 100644
index 8682f8a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test13_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(int i){
-	}
-	void n(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test13_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test13_out.java
deleted file mode 100644
index a706f40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test13_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(int j){
-	}
-	void n(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test14_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test14_in.java
deleted file mode 100644
index 7ee39c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test14_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: j
-package p;
-class A{
-	A i;
-	A m(A i){
-		return i.m(i.m(this.i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test14_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test14_out.java
deleted file mode 100644
index f9d9ef3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test14_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: j
-package p;
-class A{
-	A i;
-	A m(A j){
-		return j.m(j.m(this.i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test15_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test15_in.java
deleted file mode 100644
index 4f56552..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test15_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to: j, i
-package p;
-class A{
-	int m(int i, int j){
-		return i + j;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test15_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test15_out.java
deleted file mode 100644
index 14f918d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test15_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to: j, i
-package p;
-class A{
-	int m(int j, int i){
-		return j + i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test16_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test16_in.java
deleted file mode 100644
index b3a0098..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test16_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	void m(int i){
-		class X{
-			int j;
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test16_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test16_out.java
deleted file mode 100644
index f14f73b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test16_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	void m(int j){
-		class X{
-			int j;
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test17_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test17_in.java
deleted file mode 100644
index ed8c347..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test17_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j, i, k
-package p;
-class A{
-	int l;
-	int m(int i, int j, int k){
-		int m= 0;
-		return i + j + k + l + m;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test17_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test17_out.java
deleted file mode 100644
index 93d3e70..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test17_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j, i, k
-package p;
-class A{
-	int l;
-	int m(int j, int i, int k){
-		int m= 0;
-		return j + i + k + l + m;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test18_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test18_in.java
deleted file mode 100644
index 3e13887..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test18_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	void m(Object i){
-		class j{}
-		i= new j();
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test18_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test18_out.java
deleted file mode 100644
index ffd9994..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test18_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	void m(Object j){
-		class j{}
-		j= new j();
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test19_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test19_in.java
deleted file mode 100644
index 657fe9e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test19_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	A i;

-	void m(A i){

-		i.toString();

-		i.equals(i.toString());

-		i.i.i= i;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test19_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test19_out.java
deleted file mode 100644
index 263cd01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test19_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	A i;

-	void m(A j){

-		j.toString();

-		j.equals(j.toString());

-		j.i.i= j;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test1_in.java
deleted file mode 100644
index 10079c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test1_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(int i){
-		i++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test1_out.java
deleted file mode 100644
index dedcb99..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test1_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(int j){
-		j++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test20_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test20_in.java
deleted file mode 100644
index 10d3162..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test20_in.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	Object m(i i){

-		i.i.i= i.i;

-		i:{

-			while(true){

-				break i;

-			}

-		}

-		return i;

-	};

-}

-class i{

-	i i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test20_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test20_out.java
deleted file mode 100644
index d12c537..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test20_out.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	Object m(i j){

-		j.i.i= j.i;

-		i:{

-			while(true){

-				break i;

-			}

-		}

-		return j;

-	};

-}

-class i{

-	i i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test21_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test21_in.java
deleted file mode 100644
index 7ed06f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test21_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	void m(int i){

-		A[] o= new A[8];

-		int[] ii= new int[i];

-		for (; i == i;){

-			i++;

-			ii[++i]= i ==7 ? i: i + i;

-		}

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test21_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test21_out.java
deleted file mode 100644
index 378d1d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test21_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	void m(int j){

-		A[] o= new A[8];

-		int[] ii= new int[j];

-		for (; j == j;){

-			j++;

-			ii[++j]= j ==7 ? j: j + j;

-		}

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test22_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test22_in.java
deleted file mode 100644
index 3358054..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test22_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int i;

-	void m(int i){

-		int u= i + this.i;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test22_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test22_out.java
deleted file mode 100644
index b6bb716..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test22_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int i;

-	void m(int j){

-		int u= j + this.i;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test23_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test23_in.java
deleted file mode 100644
index 8a8dec2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test23_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j, i

-package p;

-class A{

-	int j;

-	int m(final int i, int j){

-		return i + j;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test23_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test23_out.java
deleted file mode 100644
index b6a9dd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test23_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j, i

-package p;

-class A{

-	int j;

-	int m(final int j, int i){

-		return j + i;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test24_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test24_in.java
deleted file mode 100644
index 1fa6d29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test24_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int i;

-	void m(int i){

-		this.i= i;

-	};

-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test24_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test24_out.java
deleted file mode 100644
index a2134c9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test24_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int i;

-	void m(int j){

-		this.i= j;

-	};

-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test25_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test25_in.java
deleted file mode 100644
index 368e29e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test25_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(int i){

-		return i + m(m(i));

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test25_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test25_out.java
deleted file mode 100644
index 4ade063..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test25_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(int j){

-		return j + m(m(j));

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test26_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test26_in.java
deleted file mode 100644
index 415fcdd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test26_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(int i){

-		new A(){

-			int m(int i){

-				return i;

-			}

-		};

-		return i + m(m(i));

-	};

-}   
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test26_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test26_out.java
deleted file mode 100644
index 7ca75e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test26_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(int j){

-		new A(){

-			int m(int i){

-				return i;

-			}

-		};

-		return j + m(m(j));

-	};

-}   
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test27_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test27_in.java
deleted file mode 100644
index bece931..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test27_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(final int i){

-		new A(){

-			int m(int o){

-				return i;

-			}

-		};

-		return i + m(m(i));

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test27_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test27_out.java
deleted file mode 100644
index c25cf40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test27_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(final int j){

-		new A(){

-			int m(int o){

-				return j;

-			}

-		};

-		return j + m(m(j));

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test28_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test28_in.java
deleted file mode 100644
index 5e4af90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test28_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int m(int[] i){

-		i[0]= 0;

-		return 1;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test28_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test28_out.java
deleted file mode 100644
index 3f4716c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test28_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int m(int[] j){

-		j[0]= 0;

-		return 1;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test29_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test29_in.java
deleted file mode 100644
index 69716a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test29_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to b

-package p;

-class A{

-   A A;

-   A m(A A){

-     A:

-        for (;;){

-          if (A.m(A)==A)

-             break A;

-        }

-      return A;

-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test29_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test29_out.java
deleted file mode 100644
index bcd70c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test29_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to b

-package p;

-class A{

-   A A;

-   A m(A b){

-     A:

-        for (;;){

-          if (b.m(b)==b)

-             break A;

-        }

-      return b;

-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test2_in.java
deleted file mode 100644
index 3ce000b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test2_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//rename to: j, k
-package p;
-class A{
-	void m(int i, int k){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test2_out.java
deleted file mode 100644
index 2e49b16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test2_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//rename to: j, k
-package p;
-class A{
-	void m(int j, int k){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test30_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test30_in.java
deleted file mode 100644
index e4ad09f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test30_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming to i, k

-package p;

-class A{

-	private void m(final int i, int j){

-		class J{

-			int k;

-			void k(){

-				k= k;

-			}

-		}

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test30_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test30_out.java
deleted file mode 100644
index 9ee3399..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test30_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming to i, k

-package p;

-class A{

-	private void m(final int i, int k){

-		class J{

-			int k;

-			void k(){

-				k= k;

-			}

-		}

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test31_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test31_in.java
deleted file mode 100644
index a4e0e9e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test31_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming to kk, j

-package p;

-class A{

-	private void m(final int i, int j){

-		new Object(){

-			int kk;

-			void fred(){

-				kk= 0;

-			}

-		};

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test31_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test31_out.java
deleted file mode 100644
index 8f95274..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test31_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming to kk, j

-package p;

-class A{

-	private void m(final int kk, int j){

-		new Object(){

-			int kk;

-			void fred(){

-				kk= 0;

-			}

-		};

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test32_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test32_in.java
deleted file mode 100644
index 275aaf9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test32_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	A(int i){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test32_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test32_out.java
deleted file mode 100644
index 5516e0b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test32_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	A(int j){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test33_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test33_in.java
deleted file mode 100644
index 9fffecf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test33_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to b, no ref update

-package p;

-class A{

-   A A;

-   A m(A A){

-     A:

-        for (;;){

-          if (A.m(A)==A)

-             break A;

-        }

-      return A;

-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test33_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test33_out.java
deleted file mode 100644
index 33fdb83..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test33_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to b, no ref update

-package p;

-class A{

-   A A;

-   A m(A b){

-     A:

-        for (;;){

-          if (A.m(A)==A)

-             break A;

-        }

-      return A;

-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test34_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test34_in.java
deleted file mode 100644
index bf71a37..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test34_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	public void m(boolean test) {

-        boolean t= (test);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test34_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test34_out.java
deleted file mode 100644
index 87bf3d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test34_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	public void m(boolean test2) {

-        boolean t= (test2);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test35_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test35_in.java
deleted file mode 100644
index b9b24c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test35_in.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A{
-	/**
-	 * @param i
-	 */
-	void m(int i){
-	}
-	
-	/**
-	 * @param i
-	 */
-	void m1(int i){
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test35_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test35_out.java
deleted file mode 100644
index 6ae1707..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test35_out.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A{
-	/**
-	 * @param j
-	 */
-	void m(int j){
-	}
-	
-	/**
-	 * @param i
-	 */
-	void m1(int i){
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test36_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test36_in.java
deleted file mode 100644
index fbabcd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test36_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	//
-	void m(int i){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test36_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test36_out.java
deleted file mode 100644
index a6dc3d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test36_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	//
-	void m(int j){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test3_in.java
deleted file mode 100644
index 7676ba8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test3_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: j, j1
-package p;
-class A{
-	int m(int i, int k){
-		{
-			return i + k;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test3_out.java
deleted file mode 100644
index d1f6340..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test3_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: j, j1
-package p;
-class A{
-	int m(int j, int j1){
-		{
-			return j + j1;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test4_in.java
deleted file mode 100644
index f607274..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test4_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: k
-package p;
-class A{
-	int k;
-	void m(A i){
-		i.k= i.k;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test4_out.java
deleted file mode 100644
index 4e4b4c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test4_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: k
-package p;
-class A{
-	int k;
-	void m(A k){
-		k.k= k.k;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test5_in.java
deleted file mode 100644
index 99ea05e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test5_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: k
-package p;
-class A{
-	int i;
-	void m(int i){
-		this.i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test5_out.java
deleted file mode 100644
index b4d2054..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test5_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: k
-package p;
-class A{
-	int i;
-	void m(int k){
-		this.i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test6_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test6_in.java
deleted file mode 100644
index efa9a84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test6_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to k
-package p;
-class A{
-	void m(int i){
-		m(i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test6_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test6_out.java
deleted file mode 100644
index 4dc489d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test6_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to k
-package p;
-class A{
-	void m(int k){
-		m(k);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test7_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test7_in.java
deleted file mode 100644
index 66d473e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test7_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//rename to k
-package p;
-class B{
-	int i;
-}
-class A extends B{
-	void m(A i){
-		super.i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test7_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test7_out.java
deleted file mode 100644
index 22e4796..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test7_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//rename to k
-package p;
-class B{
-	int i;
-}
-class A extends B{
-	void m(A k){
-		super.i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test8_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test8_in.java
deleted file mode 100644
index e458281..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test8_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-abstract class A{
-	abstract void m(int i);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test8_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test8_out.java
deleted file mode 100644
index c7cc090..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test8_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-abstract class A{
-	abstract void m(int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test9_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test9_in.java
deleted file mode 100644
index 181663e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test9_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-interface A{
-	void m(int i);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test9_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test9_out.java
deleted file mode 100644
index 39e113f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/canRename/A_test9_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-interface A{
-	void m(int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail0.java
deleted file mode 100644
index 65d173b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail0.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	void m(final int i){
-		class X{
-			int j;
-			void m(){
-				j= i;
-			}
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail1.java
deleted file mode 100644
index 4347583..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail1.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//nothing to rename
-package p;
-class A{
-	void m(){
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail10.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail10.java
deleted file mode 100644
index 536d555..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail10.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//cannot rename to: j, j
-package p;
-abstract class A{
-	abstract void m(int i, int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail11.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail11.java
deleted file mode 100644
index 275aadd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail11.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//cannot rename to: j, j
-package p;
-interface A{
-	 void m(int i, int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail12.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail12.java
deleted file mode 100644
index 6327219..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail12.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//cannot rename to j
-package p;
-class A{
-	void m(final int i){
-		A a= new A(){
-			void m(int j){
-				i++;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail13.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail13.java
deleted file mode 100644
index 14ecb4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail13.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//cannot rename to j
-package p;
-class A{
-	int j;
-	void m(int i){
-		j= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail14.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail14.java
deleted file mode 100644
index 78a687f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail14.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//cannot rename to j
-package p;
-class A{
-	int k;
-	static class j{
-		static int k;
-	}
-	void m(A i){
-		j.k= 0;
-	}
-}	
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail15.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail15.java
deleted file mode 100644
index 259c6a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail15.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	void m(int i){
-		for (int j= 0; j < 10; j++){
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail16.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail16.java
deleted file mode 100644
index dc723dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail16.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	void m(int i){
-		for (int k= 0, j= 0;;) {
-		}
-		
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail17.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail17.java
deleted file mode 100644
index 7b7cb27..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail17.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	void m(int i){
-		try{
-			m(1);
-		}
-		catch (Throwable j){
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail18.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail18.java
deleted file mode 100644
index 64c7495..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail18.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//cannot rename to: j
-package p;
-class A{

-	String j;
-	void m(int i){
-		j.toString();	
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail19.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail19.java
deleted file mode 100644
index ea734b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail19.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//cannot rename to: j
-package p;

-class B{

-	int j;

-}
-class A extends B{
-	void m(int i){
-		j= 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail2.java
deleted file mode 100644
index 258a47d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//cannot rename to i, i
-package p;
-class A{
-	int m(int i, int j){
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail20.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail20.java
deleted file mode 100644
index 9022b40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail20.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//cannot rename to: j

-package p;

-interface B{

-	int j= 0;

-}

-class A implements B{

-	void m(int i){

-		int y= j;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail21.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail21.java
deleted file mode 100644
index 98aa351..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail21.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	int j;
-	int m(final int i){
-		new A(){
-			int m(int o){
-				return i;
-			}
-		};
-		return i + m(m(i));
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail3.java
deleted file mode 100644
index 549fe00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail3.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//cannot rename to: i, 9
-package p;
-class A{
-	int m(int i, int j){
-			return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail4.java
deleted file mode 100644
index ce47b19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail4.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	int m(int i){
-		int j;
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail5.java
deleted file mode 100644
index a0397a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail5.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	int m(int i){
-		{
-			int j;
-		}
-				return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail6.java
deleted file mode 100644
index fe77c6b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail6.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	int m(final int i){
-		class X{
-			int j;
-			void m(){
-				j= i;
-			}
-		}
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail7.java
deleted file mode 100644
index 752c308..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail7.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//cannot rename to: j
-package p;
-class B{
-	int j;
-}
-class A extends B{
-	int m(int i){
-		j= 0;
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail8.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail8.java
deleted file mode 100644
index dd61295..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail8.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//cannot rename to: j
-package p;
-interface B{
-	int j= 0;
-}
-class A implements B{
-	int m(int i){
-		i= j;
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail9.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail9.java
deleted file mode 100644
index 0cb5868..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/A_testFail9.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//cannot rename to: j
-package p;
-
-class B{
-	int j;
-	class A {
-		int m(int i){
-			i= j;
-			return 0;
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/a.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/a.java
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameParameters/cannotRename/a.java
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test0/in/A.java
deleted file mode 100644
index 09d7beb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test0/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	private int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test0/out/A.java
deleted file mode 100644
index 54638c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test0/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	private int g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test1/in/A.java
deleted file mode 100644
index e7b1fae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test1/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	private int f;
-	void m(){
-		f++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test1/out/A.java
deleted file mode 100644
index 62565c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test1/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	private int g;
-	void m(){
-		g++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test2/in/A.java
deleted file mode 100644
index 9b8f37b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test2/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//no ref update
-package p;
-class A{
-	private int f;
-	void m(){
-		f++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test2/out/A.java
deleted file mode 100644
index e243fcd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test2/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//no ref update
-package p;
-class A{
-	private int g;
-	void m(){
-		f++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test3/in/A.java
deleted file mode 100644
index 992a58e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test3/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A{
-	private int f;
-	/**
-	 * f f
-	 * @see #f
-	 * fgd 
-	 */
-	void m(){
-		/**
-		 * f f
-		 * @see #f
-		 * fgd 
-		 */
-		f++;//inc f
-		String g= "f";
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test3/out/A.java
deleted file mode 100644
index 001599c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test3/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A{
-	private int gg;
-	/**
-	 * gg gg
-	 * @see #gg
-	 * fgd 
-	 */
-	void m(){
-		/**
-		 * gg gg
-		 * @see #gg
-		 * fgd 
-		 */
-		gg++;//inc gg
-		String g= "gg";
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test4/in/A.java
deleted file mode 100644
index 4e9361f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test4/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-class A{
-	/**
-	 * @see #getMe()
-	 * @see #setMe(int)
-	 */
-	private int fMe; //use getMe and setMe to update fMe
-	
-	public int getMe() {
-		return fMe;
-	}
-	
-	/** @param me stored into {@link #fMe}*/
-	public void setMe(int me) {
-		fMe= me;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test4/out/A.java
deleted file mode 100644
index 224e8ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test4/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-class A{
-	/**
-	 * @see #getYou()
-	 * @see #setYou(int)
-	 */
-	private int fYou; //use getMe and setMe to update fMe
-	
-	public int getYou() {
-		return fYou;
-	}
-	
-	/** @param me stored into {@link #fYou}*/
-	public void setYou(int me) {
-		fYou= me;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test5/in/A.java
deleted file mode 100644
index 4bf4b08..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test5/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	private int fMe;
-	
-	public int getMe() {
-		return fMe;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test5/out/A.java
deleted file mode 100644
index 852acc2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test5/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	private int fYou;
-	
-	public int getYou() {
-		return fYou;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test6/in/A.java
deleted file mode 100644
index 947a233..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test6/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	private int fMe;
-	
-	public void setMe(int me) {
-		fMe= me;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test6/out/A.java
deleted file mode 100644
index 00f75d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test6/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	private int fYou;
-	
-	public void setYou(int me) {
-		fYou= me;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test7/in/A.java
deleted file mode 100644
index ddb5e06..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test7/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	private boolean fBig;
-	
-	public void setBig(boolean big) {
-		fBig= big;
-	}
-
-	public boolean isBig() {
-		return fBig;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test7/out/A.java
deleted file mode 100644
index ce85b2d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test7/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	private boolean fSmall;
-	
-	public void setSmall(boolean big) {
-		fSmall= big;
-	}
-
-	public boolean isSmall() {
-		return fSmall;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test8/in/A.java
deleted file mode 100644
index 78fbddd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test8/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	static int f;
-	public static int getF() {
-		return f;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test8/out/A.java
deleted file mode 100644
index ceaf43c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test8/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	static int g;
-	public static int getG() {
-		return g;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test9/in/A.java
deleted file mode 100644
index d53e88f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test9/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	private boolean fBig;
-	
-	public void setBig(boolean big) {
-		fBig= big;
-	}
-
-	public boolean getBig() {
-		return fBig;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test9/out/A.java
deleted file mode 100644
index 9f4462a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/test9/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-	private boolean fSmall;
-	
-	public void setSmall(boolean big) {
-		fSmall= big;
-	}
-
-	public boolean getSmall() {
-		return fSmall;
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail0/in/A.java
deleted file mode 100644
index 331b5e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private int f;
-	private int g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail1/in/A.java
deleted file mode 100644
index 4400551..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail1/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private int f;
-	private String g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail10/in/A.java
deleted file mode 100644
index 186e8f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail10/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class setE{
-	int y;
-	public int getY() {
-		return y;
-	}
-	public void setY(int y) {
-		this.y = y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail2/in/A.java
deleted file mode 100644
index 0797e05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail2/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private int f;
-	private static int g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail3/in/A.java
deleted file mode 100644
index e1abbc3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private int f;
-	public static int g;	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail4/in/A.java
deleted file mode 100644
index 86f7550..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail4/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	private int f;
-	public Object g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail5/in/A.java
deleted file mode 100644
index 96e2633..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail5/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class B {
-	int g;
-	class A {
-		private int f;
-	}
-}	
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail6/in/A.java
deleted file mode 100644
index d688226..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail6/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	private int f;
-	class B {
-		private int g;
-	}
-}	
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail7/in/A.java
deleted file mode 100644
index a09bd64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail7/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	private int f;
-	void m(){
-		try{
-			f++;
-		} catch (Exception g){
-			f++;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail8/in/A.java
deleted file mode 100644
index dc2e17d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail8/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A{
-	int gg;
-	class C{
-		int f;
-		void m(){
-			gg++;
-		}	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail9/in/A.java
deleted file mode 100644
index d1005b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateField/testFail9/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class getE{
-	int y;
-	public int getY() {
-		return y;
-	}
-	public void setY(int y) {
-		this.y = y;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test0/in/A.java
deleted file mode 100644
index bbcc717..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test0/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	private void m(){}
-	class B{
-		void f(){
-			m();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test0/out/A.java
deleted file mode 100644
index c4e4056..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test0/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	private void k(){}
-	class B{
-		void f(){
-			k();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test10/in/A.java
deleted file mode 100644
index 855db73..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test10/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	private void m(){}
-}
-class B {
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test10/out/A.java
deleted file mode 100644
index 8040304..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test10/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	private void k(){}
-}
-class B {
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test11/in/A.java
deleted file mode 100644
index 41938b9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test11/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	private void m(){}
-}
-class B extends A{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test11/out/A.java
deleted file mode 100644
index 4fb51dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test11/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	private void k(){}
-}
-class B extends A{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test12/in/A.java
deleted file mode 100644
index 1bfd88f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test12/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	private void m(){}
-}
-class B extends A{
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test12/out/A.java
deleted file mode 100644
index ae12fdb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test12/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	private void k(){}
-}
-class B extends A{
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test13/in/A.java
deleted file mode 100644
index 2b3e68b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test13/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void m(){
-	}
-	void f(){
-		m();
-	}
-}
-class A extends B{
-	private void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test13/out/A.java
deleted file mode 100644
index 900894d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test13/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void m(){
-	}
-	void f(){
-		m();
-	}
-}
-class A extends B{
-	private void k(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test14/in/A.java
deleted file mode 100644
index d189f8a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test14/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void k(){
-	}
-	void f(){
-		k();
-	}
-}
-class A extends B{
-	private void m(){
-	}
-	void f(){
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test14/out/A.java
deleted file mode 100644
index 2919161..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test14/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void k(){
-	}
-	void f(){
-		k();
-	}
-}
-class A extends B{
-	private void k(){
-	}
-	void f(){
-		k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test15/in/A.java
deleted file mode 100644
index 489be30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test15/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	private int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test15/out/A.java
deleted file mode 100644
index 1eb3f1e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test15/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	private int k(int m){
-		return k(k(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test16/in/A.java
deleted file mode 100644
index 130501a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test16/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to fred
-class A{
-	private int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test16/out/A.java
deleted file mode 100644
index 03bab78..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test16/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to fred
-class A{
-	private int fred(int m){
-		return fred(fred(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test17/in/A.java
deleted file mode 100644
index 7ddf22d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test17/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming A.m to kk
-package p;
-public class A {
-	private void m(int m){}
-}
-class B extends A{
-	void m(boolean m){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test17/out/A.java
deleted file mode 100644
index 6d4f71c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test17/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming A.m to kk
-package p;
-public class A {
-	private void kk(int m){}
-}
-class B extends A{
-	void m(boolean m){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/in/A.java
deleted file mode 100644
index 588b82d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming B.m to kk
-package p;
-class B {
-	private void m(int m) {
-	}
-
-}
-public class A extends B {
-	void m(int m) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/in/C.java
deleted file mode 100644
index 4794cc8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/in/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class C{
-	void k(){
-		new A().m(4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/out/A.java
deleted file mode 100644
index af4db05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming B.m to kk
-package p;
-class B {
-	private void kk(int m) {
-	}
-
-}
-public class A extends B {
-	void m(int m) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/out/C.java
deleted file mode 100644
index 4794cc8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test18/out/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class C{
-	void k(){
-		new A().m(4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test2/in/A.java
deleted file mode 100644
index 36ded4c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test2/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	private void m() {
-	}
-	void k(){
-		A a= new A();
-		a
-		.
-		m ();
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test2/out/A.java
deleted file mode 100644
index a8cd235..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test2/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	private void fred() {
-	}
-	void k(){
-		A a= new A();
-		a
-		.
-		fred ();
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test20/in/A.java
deleted file mode 100644
index 357e768..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test20/in/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	private int m(int m) {
-		return m	(	m	)	;
-	}
-		void k(){
-		A a= new A();
-		a
-	.
-		m 
-			(
-			a
-				.
-	m	
-				(
-					6
-			)	
-			
-		);
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test20/out/A.java
deleted file mode 100644
index 47a8800..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test20/out/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	private int fred(int m) {
-		return fred	(	m	)	;
-	}
-		void k(){
-		A a= new A();
-		a
-	.
-		fred 
-			(
-			a
-				.
-	fred	
-				(
-					6
-			)	
-			
-		);
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test23/in/A.java
deleted file mode 100644
index e19f4ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test23/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	private void m(){
-	}
-}
-class test{
-	void m(){
-		class X extends A{
-			void m(){
-		}
-	}
-}}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test23/out/A.java
deleted file mode 100644
index 572f93c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test23/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	private void k(){
-	}
-}
-class test{
-	void m(){
-		class X extends A{
-			void m(){
-		}
-	}
-}}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test24/in/A.java
deleted file mode 100644
index eb9c053..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test24/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	private void m(String s){
-	}
-}
-class B extends A{
-	void m(java.lang.String s){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test24/out/A.java
deleted file mode 100644
index cf5dc6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test24/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	private void k(String s){
-	}
-}
-class B extends A{
-	void m(java.lang.String s){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test25/in/A.java
deleted file mode 100644
index 433c5a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test25/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	private void m(String[] s){
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test25/out/A.java
deleted file mode 100644
index 1e65a26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test25/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	private void k(String[] s){
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test26/in/A.java
deleted file mode 100644
index 913e471..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test26/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	private void m(){
-		this.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test26/out/A.java
deleted file mode 100644
index 950b977..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test26/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	private void k(){
-		this.k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test27/in/A.java
deleted file mode 100644
index bb7ad49..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test27/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//no ref update
-//renaming A.m to k 
-package p;
-
-class A{
-	private void m(){
-		this.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test27/out/A.java
deleted file mode 100644
index f4deb45..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/test27/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//no ref update
-//renaming A.m to k 
-package p;
-
-class A{
-	private void k(){
-		this.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testAnon0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testAnon0/in/A.java
deleted file mode 100644
index 2526bba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testAnon0/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-public class A {
-	private void m(){}
-}
-class B{
-	void f(){
-		A a= new A(){
-			void m(){
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testAnon0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testAnon0/out/A.java
deleted file mode 100644
index 730610f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testAnon0/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-public class A {
-	private void k(){}
-}
-class B{
-	void f(){
-		A a= new A(){
-			void m(){
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail0/in/A.java
deleted file mode 100644
index 946d84c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//can't rename native methods
-class A{
- 	private native void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail1/in/A.java
deleted file mode 100644
index ef9f460..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail1/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//can't rename m to k
-class A{
- 	private void m(){}
- 	private void k(){}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail2/in/A.java
deleted file mode 100644
index 72a3339..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail2/in/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-//can't rename A.m to k
-package p;
-
-class X {
-	void k(){
-	}
-}
-class A {
-	private void m(){
-		System.out.println("a");
-	}
-	class B extends X{
-		void f(){
-			m();
-		}
-		public void foo() {
-			
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail5/in/A.java
deleted file mode 100644
index 36269e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenamePrivateMethod/testFail5/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A {
-	private void m(){}
-	class B{
-		void k(){
-			m();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test0/in/A.java
deleted file mode 100644
index 408f8be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test0/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	static void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test0/out/A.java
deleted file mode 100644
index a8ca53b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test0/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	static void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test1/in/A.java
deleted file mode 100644
index e48131f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test1/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A{
-	static void m(){
-	}
-	void f(){
-		m();
-	}
-	static int fred(){
-		m();
-		return 0;
-	}
-}
-class B{
-	static void m(){
-		A.m();
-		new A().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test1/out/A.java
deleted file mode 100644
index e645c03..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test1/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A{
-	static void k(){
-	}
-	void f(){
-		k();
-	}
-	static int fred(){
-		k();
-		return 0;
-	}
-}
-class B{
-	static void m(){
-		A.k();
-		new A().k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/in/A.java
deleted file mode 100644
index f269555..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A {
-
-	public static void method() {
-		System.out.println("TestA.method");
-		B.method();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/in/B.java
deleted file mode 100644
index 2cf7ae4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class B {
-
-	public static void method() {
-		System.out.println("TestB.method");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/out/A.java
deleted file mode 100644
index 8456765..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A {
-
-	public static void method() {
-		System.out.println("TestA.method");
-		B.newmethod();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/out/B.java
deleted file mode 100644
index ac1e13a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test10/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class B {
-
-	public static void newmethod() {
-		System.out.println("TestB.method");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/in/A.java
deleted file mode 100644
index 297b360..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package a;
-
-public class A
-{
-   public static void method2() //<--- refactor rename this method
-   {
-   }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/in/B.java
deleted file mode 100644
index 9d7c071..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/in/B.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package b;
-
-import a.A;
-
-public class B
-{
-   I i = new I()
-   {
-	  public void method()
-	  {
-		 A.method2();
-	  }
-   };
-}
-
-interface I
-{
-   void method();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/out/A.java
deleted file mode 100644
index 01510e3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package a;
-
-public class A
-{
-   public static void fred() //<--- refactor rename this method
-   {
-   }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/out/B.java
deleted file mode 100644
index 8d40db8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test11/out/B.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package b;
-
-import a.A;
-
-public class B
-{
-   I i = new I()
-   {
-	  public void method()
-	  {
-		 A.fred();
-	  }
-   };
-}
-
-interface I
-{
-   void method();
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test2/in/A.java
deleted file mode 100644
index 9f1d3b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test2/in/A.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package p;
-class A{
-	static void m(){
-	}
-	void f(){
-		m();
-	}
-	static int fred(){
-		m();
-		return 1;
-	}
-	{
-		A.m();
-		m();
-		new A().m();
-	}
-	static {
-		A.m();
-		m();
-		new A().m();
-	}
-}
-class D{
-	static void m(){
-		A.m();
-		new A().m();
-		m();
-	}
-	static {
-		A.m();
-		new A().m();
-		m();
-	}
-	{
-		A.m();
-		new A().m();
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test2/out/A.java
deleted file mode 100644
index 81351b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test2/out/A.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package p;
-class A{
-	static void k(){
-	}
-	void f(){
-		k();
-	}
-	static int fred(){
-		k();
-		return 1;
-	}
-	{
-		A.k();
-		k();
-		new A().k();
-	}
-	static {
-		A.k();
-		k();
-		new A().k();
-	}
-}
-class D{
-	static void m(){
-		A.k();
-		new A().k();
-		m();
-	}
-	static {
-		A.k();
-		new A().k();
-		m();
-	}
-	{
-		A.k();
-		new A().k();
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test3/in/A.java
deleted file mode 100644
index ede5a5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test3/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A{
-static void m(){}
-}
-class B extends A{
-
-}
-class Test{
-void f(){
-	new A().m();
-	A.m();
-	new B().m();
-	B.m();
-}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test3/out/A.java
deleted file mode 100644
index d010dcb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test3/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A{
-static void k(){}
-}
-class B extends A{
-
-}
-class Test{
-void f(){
-	new A().k();
-	A.k();
-	new B().k();
-	B.k();
-}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test4/in/A.java
deleted file mode 100644
index 9284825..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test4/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A{
-static void m(){}
-}
-class B extends A{
-static void m(){};
-}
-class Test{
-void f(){
-	new A().m();
-	A.m();
-	new B().m();
-	B.m();
-}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test4/out/A.java
deleted file mode 100644
index c86867f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test4/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A{
-static void k(){}
-}
-class B extends A{
-static void m(){};
-}
-class Test{
-void f(){
-	new A().k();
-	A.k();
-	new B().m();
-	B.m();
-}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test5/in/A.java
deleted file mode 100644
index 676e688..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test5/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	static void m(){}
-	class B{
-		void f(){
-			m();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test5/out/A.java
deleted file mode 100644
index d961d76..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test5/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	static void k(){}
-	class B{
-		void f(){
-			k();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test6/in/A.java
deleted file mode 100644
index d1cea87..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test6/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	static void m(){
-	}
-}
-class test1{
-	void m(){
-		class X extends A{
-			void mm(){
-		}
-	}
-}}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test6/out/A.java
deleted file mode 100644
index f1bbca3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test6/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	static void k(){
-	}
-}
-class test1{
-	void m(){
-		class X extends A{
-			void mm(){
-		}
-	}
-}}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test7/in/A.java
deleted file mode 100644
index 13de2de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test7/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	static int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test7/out/A.java
deleted file mode 100644
index f8d3899..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test7/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	static int k(int m){
-		return k(k(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test8/in/A.java
deleted file mode 100644
index b1f304f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test8/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	static int m(int m){
-		return m(m(m));
-	}
-}
-
-class B extends A{
-	static int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test8/out/A.java
deleted file mode 100644
index 3dd2377..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test8/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	static int k(int m){
-		return k(k(m));
-	}
-}
-
-class B extends A{
-	static int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test9/in/A.java
deleted file mode 100644
index 3e09fbc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test9/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//no ref update
-package p;
-//renaming A.m to k
-class A{
-	static int m(int m){
-		return m(m(m));
-	}
-}
-
-class B extends A{
-	static int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test9/out/A.java
deleted file mode 100644
index 4f11385..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/test9/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//no ref update
-package p;
-//renaming A.m to k
-class A{
-	static int k(int m){
-		return m(m(m));
-	}
-}
-
-class B extends A{
-	static int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail0/in/A.java
deleted file mode 100644
index 515cf69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//can't rename native methods
-class A{
- 	static private native void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail1/in/A.java
deleted file mode 100644
index 64520ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail1/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//can't rename m to k
-class A{
- 	static private void m(){}
- 	static private void k(){}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail2/in/A.java
deleted file mode 100644
index 2560341..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail2/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k
-class B{
- 	void k(){}	
-}
-class A extends B{
- 	static public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail4/in/A.java
deleted file mode 100644
index 32fda7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail4/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//can't rename m to k
-class A{
- 	static public void m(){}
- 	void k(){}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail5/in/A.java
deleted file mode 100644
index 43d650a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail5/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//can't rename native methods
-class A{
- 	static native void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail6/in/A.java
deleted file mode 100644
index 2cedaae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail6/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//can't rename m to k
-class A{
- 	static public void m(){}
- 	static public void k(){}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail7/in/A.java
deleted file mode 100644
index 9bacef7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail7/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//can't rename m to k
-class A{
- 	static public void m(){}
- 	static private void k(){}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail8/in/A.java
deleted file mode 100644
index d0d9225..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameStaticMethod/testFail8/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//can't rename m to k
-class A{
- 	static public void m(){}
- 	private void k(){}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_in.java
deleted file mode 100644
index 0519ecb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_in.java
+++ /dev/null

@@ -1 +0,0 @@
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_out.java
deleted file mode 100644
index 0519ecb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_out.java
+++ /dev/null

@@ -1 +0,0 @@
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test0_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test0_in.java
deleted file mode 100644
index ee3dd90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test0_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//rename to: j
-package p;
-class A{
-	/**
-	 * @param i this is I
-	 * @param x invalid
-	 */
-	void m(int i){
-		/*[*/int x;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test0_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test0_out.java
deleted file mode 100644
index 6ab7d21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test0_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//rename to: j
-package p;
-class A{
-	/**
-	 * @param i this is I
-	 * @param x invalid
-	 */
-	void m(int i){
-		/*[*/int j;/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test11_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test11_in.java
deleted file mode 100644
index 67a8cd6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test11_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//rename to j
-package p;
-class A{
-	int k;
-	void m(){
-		/*[*/int i= 0;/*]*/
-		A a= new A(){
-			void m(int i){
-				i++;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test11_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test11_out.java
deleted file mode 100644
index 4978fef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test11_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//rename to j
-package p;
-class A{
-	int k;
-	void m(){
-		/*[*/int j= 0;/*]*/
-		A a= new A(){
-			void m(int i){
-				i++;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test12_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test12_in.java
deleted file mode 100644
index c16fcfb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test12_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//rename to j
-package p;
-class A{
-	void m(){
-		/*[*/final int i= 0;/*]*/
-		A a= new A(){
-			void m(int k){
-				k= i;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test12_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test12_out.java
deleted file mode 100644
index e4695ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test12_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//rename to j
-package p;
-class A{
-	void m(){
-		/*[*/final int j= 0;/*]*/
-		A a= new A(){
-			void m(int k){
-				k= j;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test13_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test13_in.java
deleted file mode 100644
index 4e72d66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test13_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(){
-		/*[*/int i= 0;/*]*/
-	}
-	void n(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test13_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test13_out.java
deleted file mode 100644
index 584acd5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test13_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(){
-		/*[*/int j= 0;/*]*/
-	}
-	void n(){
-		int i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test14_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test14_in.java
deleted file mode 100644
index 116a06b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test14_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: j
-package p;
-class A{
-	A i;
-	A m(A k){
-		/*[*/A i= k;/*]*/
-		return i.m(i.m(this.i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test14_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test14_out.java
deleted file mode 100644
index a3aa71f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test14_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: j
-package p;
-class A{
-	A i;
-	A m(A k){
-		/*[*/A j= k;/*]*/
-		return j.m(j.m(this.i));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test15_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test15_in.java
deleted file mode 100644
index 0f40090..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test15_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: j, i
-package p;
-class A{
-	int m(){
-		int i= 0;
-		int j= 0;
-		return i + j;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test15_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test15_out.java
deleted file mode 100644
index 8e32cee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test15_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: j, i
-package p;
-class A{
-	int m(){
-		int j= 0;
-		int i= 0;
-		return j + i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test16_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test16_in.java
deleted file mode 100644
index 9b7f390..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test16_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	void m(){
-		/*[*/int i= 0;/*]*/
-		class X{
-			int j;
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test16_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test16_out.java
deleted file mode 100644
index 191ba70..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test16_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	void m(){
-		/*[*/int j= 0;/*]*/
-		class X{
-			int j;
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test17_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test17_in.java
deleted file mode 100644
index fd51317..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test17_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming to: j, i, k
-package p;
-class A{
-	int l;
-	int m(){
-		int i= 0; int j= 0; int k= 0;
-		int m= 0;
-		return i + j + k + l + m;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test17_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test17_out.java
deleted file mode 100644
index 5f45c44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test17_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming to: j, i, k
-package p;
-class A{
-	int l;
-	int m(){
-		int j= 0; int i= 0; int k= 0;
-		int m= 0;
-		return j + i + k + l + m;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test18_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test18_in.java
deleted file mode 100644
index 9e77ec5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test18_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	void m(){
-		/*[*/Object i= null;/*]*/
-		class j{}
-		i= new j();
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test18_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test18_out.java
deleted file mode 100644
index 64d3656..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test18_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	void m(){
-		/*[*/Object j= null;/*]*/
-		class j{}
-		j= new j();
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test19_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test19_in.java
deleted file mode 100644
index 4c3e81b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test19_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	A i;

-	void m(){

-		/*[*/A i= null;/*]*/

-		i.toString();

-		i.equals(i.toString());

-		i.i.i= i;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test19_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test19_out.java
deleted file mode 100644
index f17c07e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test19_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	A i;

-	void m(){

-		/*[*/A j= null;/*]*/

-		j.toString();

-		j.equals(j.toString());

-		j.i.i= j;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test1_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test1_in.java
deleted file mode 100644
index 4b9b7f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test1_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(int i){
-		/*[*/int x= 0;/*]*/
-		x++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test1_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test1_out.java
deleted file mode 100644
index 9ccc2fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test1_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void m(int i){
-		/*[*/int j= 0;/*]*/
-		j++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test20_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test20_in.java
deleted file mode 100644
index 93cfd79..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test20_in.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	Object m(){

-		/*[*/i i= new i();/*]*/

-		i.i.i= i.i;

-		i:{

-			while(true){

-				break i;

-				return i;

-			}

-		}

-	};

-}

-class i{

-	i i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test20_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test20_out.java
deleted file mode 100644
index f25454f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test20_out.java
+++ /dev/null

@@ -1,17 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	Object m(){

-		/*[*/i j= new i();/*]*/

-		j.i.i= j.i;

-		i:{

-			while(true){

-				break i;

-				return j;

-			}

-		}

-	};

-}

-class i{

-	i i;

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test21_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test21_in.java
deleted file mode 100644
index 92bbaa8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test21_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	void m(){

-		/*[*/int i= 0;/*]*/

-		int[] o= new int[8];

-		for (; i == i;){

-			i++;

-			o[++i]= i ==7 ? i: i + i;

-		}

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test21_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test21_out.java
deleted file mode 100644
index b71303d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test21_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	void m(){

-		/*[*/int j= 0;/*]*/

-		int[] o= new int[8];

-		for (; j == j;){

-			j++;

-			o[++j]= j ==7 ? j: j + j;

-		}

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test22_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test22_in.java
deleted file mode 100644
index 1fb8ffb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test22_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int i;

-	void m(){

-		/*[*/int i=0;/*]*/

-		int u= i + this.i;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test22_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test22_out.java
deleted file mode 100644
index d48a637..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test22_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int i;

-	void m(){

-		/*[*/int j=0;/*]*/

-		int u= j + this.i;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test23_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test23_in.java
deleted file mode 100644
index 52db869..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test23_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming to: j, i

-package p;

-class A{

-	int j;

-	int m(){

-		final int i= 0;

-		int j=0;

-		return i + j;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test23_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test23_out.java
deleted file mode 100644
index fcd2d7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test23_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming to: j, i

-package p;

-class A{

-	int j;

-	int m(){

-		final int j= 0;

-		int i=0;

-		return j + i;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test24_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test24_in.java
deleted file mode 100644
index 2d12d0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test24_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int i;

-	void m(){

-		/*[*/int i= 0;/*]*/

-		this.i= i;

-	};

-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test24_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test24_out.java
deleted file mode 100644
index fe8bce5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test24_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int i;

-	void m(){

-		/*[*/int j= 0;/*]*/

-		this.i= j;

-	};

-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test25_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test25_in.java
deleted file mode 100644
index e3b0e33..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test25_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(int k){

-		/*[*/int i= 0;/*]*/

-		return i + m(m(i));

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test25_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test25_out.java
deleted file mode 100644
index 49876d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test25_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(int k){

-		/*[*/int j= 0;/*]*/

-		return j + m(m(j));

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test26_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test26_in.java
deleted file mode 100644
index 94012bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test26_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(int k){

-		/*[*/int i= 0;/*]*/

-		new A(){

-			int m(int i){

-				return i;

-			}

-		};

-		return i + m(m(i));

-	};

-}   
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test26_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test26_out.java
deleted file mode 100644
index 74f7290..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test26_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(int k){

-		/*[*/int j= 0;/*]*/

-		new A(){

-			int m(int i){

-				return i;

-			}

-		};

-		return j + m(m(j));

-	};

-}   
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test27_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test27_in.java
deleted file mode 100644
index e6ab7b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test27_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(final int k){

-		/*[*/final int i= 0;/*]*/

-		new A(){

-			int m(int o){

-				return i;

-			}

-		};

-		return i + m(m(i));

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test27_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test27_out.java
deleted file mode 100644
index d78371c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test27_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int j;

-	int m(final int k){

-		/*[*/final int j= 0;/*]*/

-		new A(){

-			int m(int o){

-				return j;

-			}

-		};

-		return j + m(m(j));

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test28_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test28_in.java
deleted file mode 100644
index 9feda86..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test28_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int m(){

-		/*[*/int[] i= null;/*]*/

-		i[0]= 0;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test28_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test28_out.java
deleted file mode 100644
index f7165bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test28_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming to: j

-package p;

-class A{

-	int m(){

-		/*[*/int[] j= null;/*]*/

-		j[0]= 0;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test29_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test29_in.java
deleted file mode 100644
index d41c025..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test29_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to b

-package p;

-class A{

-   A A;

-   A m(A y){

-	/*[*/A A= new A();/*]*/

-     A:

-        for (;;){

-          if (A.m(A)==A)

-             break A;

-        }

-      return A;

-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test29_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test29_out.java
deleted file mode 100644
index c444420..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test29_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to b

-package p;

-class A{

-   A A;

-   A m(A y){

-	/*[*/A b= new A();/*]*/

-     A:

-        for (;;){

-          if (b.m(b)==b)

-             break A;

-        }

-      return b;

-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test2_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test2_in.java
deleted file mode 100644
index 9c0a760..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test2_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: j, k
-package p;
-class A{
-	void m(){
-		int x;
-		int y;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test2_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test2_out.java
deleted file mode 100644
index 2c78ee7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test2_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to: j, k
-package p;
-class A{
-	void m(){
-		int j;
-		int k;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test30_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test30_in.java
deleted file mode 100644
index 87c8411..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test30_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to i, k

-package p;

-class A{

-	private void m(){

-		final int i= 0;

-		/*[*/int j= 0;/*]*/

-		class J{

-			int k;

-			void k(){

-				k= k;

-			}

-		}

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test30_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test30_out.java
deleted file mode 100644
index cdf72b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test30_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to i, k

-package p;

-class A{

-	private void m(){

-		final int i= 0;

-		/*[*/int k= 0;/*]*/

-		class J{

-			int k;

-			void k(){

-				k= k;

-			}

-		}

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test31_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test31_in.java
deleted file mode 100644
index a511df2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test31_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to kk, j

-package p;

-class A{

-	private void m(){

-		/*[*/final int i= 0;/*]*/

-		int j= 0;

-		new Object(){

-			int kk;

-			void fred(){

-				kk= 0;

-			}

-		};

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test31_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test31_out.java
deleted file mode 100644
index 214ad2e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test31_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to kk, j

-package p;

-class A{

-	private void m(){

-		/*[*/final int kk= 0;/*]*/

-		int j= 0;

-		new Object(){

-			int kk;

-			void fred(){

-				kk= 0;

-			}

-		};

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test32_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test32_in.java
deleted file mode 100644
index cae4075..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test32_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	A(){/*[*/int i= 0;/*]*/}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test32_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test32_out.java
deleted file mode 100644
index 9d6544f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test32_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	A(){/*[*/int j= 0;/*]*/}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test33_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test33_in.java
deleted file mode 100644
index 2b9907e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test33_in.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to b, no ref update

-package p;

-class A{

-   A A;

-   A m(A a){

-   	/*[*/A A= null;/*]*/

-     A:

-        for (;;){

-          if (A.m(A)==A)

-             break A;

-        }

-      return A;

-   };

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test33_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test33_out.java
deleted file mode 100644
index efcb193..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test33_out.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to b, no ref update

-package p;

-class A{

-   A A;

-   A m(A a){

-   	/*[*/A b= null;/*]*/

-     A:

-        for (;;){

-          if (A.m(A)==A)

-             break A;

-        }

-      return A;

-   };

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test34_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test34_in.java
deleted file mode 100644
index bbac062..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test34_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-class A{

-	int j;

-   void m(){

-   	j= 0;

-   	/*[*/int i= 0;/*]*/

-   	i++;

-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test34_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test34_out.java
deleted file mode 100644
index ddf5fb7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test34_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-class A{

-	int j;

-   void m(){

-   	j= 0;

-   	/*[*/int j= 0;/*]*/

-   	j++;

-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test35_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test35_in.java
deleted file mode 100644
index 6880fe7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test35_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class A{

-	public void testRLV() {

-	        /*[*/boolean test = true;/*]*/

-	        boolean t= (test);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test35_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test35_out.java
deleted file mode 100644
index 0ca07bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test35_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;

-class A{

-	public void testRLV() {

-	        /*[*/boolean test2 = true;/*]*/

-	        boolean t= (test2);

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test36_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test36_in.java
deleted file mode 100644
index 61a3030..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test36_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void f(){
-		int y, i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test36_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test36_out.java
deleted file mode 100644
index 02465d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test36_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void f(){
-		int j, i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test37_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test37_in.java
deleted file mode 100644
index 61a3030..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test37_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void f(){
-		int y, i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test37_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test37_out.java
deleted file mode 100644
index de555ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test37_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//rename to: j
-package p;
-class A{
-	void f(){
-		int y, j;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test38_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test38_in.java
deleted file mode 100644
index 594d3eb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test38_in.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//rename to: i
-package p;
-class A{
-void m(){
-   for(int i= 0; i < 1; i++){
-   }
-   for(int j= 0; j < 1; j++){
-   }
-}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test38_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test38_out.java
deleted file mode 100644
index 12f77ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test38_out.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//rename to: i
-package p;
-class A{
-void m(){
-   for(int i= 0; i < 1; i++){
-   }
-   for(int i= 0; i < 1; i++){
-   }
-}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test39_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test39_in.java
deleted file mode 100644
index 3f76b65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test39_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class Test {
-	private static final String G= I.GR;
-	
-	public static void c(){
-		Object cp= null;
-	}
-}
-interface I {
-	String GR= "l";
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test39_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test39_out.java
deleted file mode 100644
index 684a8c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test39_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class Test {
-	private static final String G= I.GR;
-	
-	public static void c(){
-		Object j= null;
-	}
-}
-interface I {
-	String GR= "l";
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test3_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test3_in.java
deleted file mode 100644
index 5bdf06c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test3_in.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//rename to: j1
-package p;
-class A{
-	int m(){
-		{
-				int i= 0;
-		 /*[*/int k= 0;/*]*/
-			
-			return i + k;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test3_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test3_out.java
deleted file mode 100644
index 8322129..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test3_out.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//rename to: j1
-package p;
-class A{
-	int m(){
-		{
-				int i= 0;
-		 /*[*/int j1= 0;/*]*/
-			
-			return i + j1;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test40_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test40_in.java
deleted file mode 100644
index 0fb399a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test40_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	/** @param i it's I. */
-	void m(int i, int i2){
-		int temp= i + i2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test40_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test40_out.java
deleted file mode 100644
index a31bfc8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test40_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	/** @param j it's I. */
-	void m(int j, int i2){
-		int temp= j + i2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test41_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test41_in.java
deleted file mode 100644
index 1e4c907..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test41_in.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A{
-	 void m(int i, int k);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test41_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test41_out.java
deleted file mode 100644
index ef61197..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test41_out.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A{
-	 void m(int j, int k);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test42_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test42_in.java
deleted file mode 100644
index cb503c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test42_in.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-abstract class A{
-	abstract void m(int i);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test42_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test42_out.java
deleted file mode 100644
index cae5db3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test42_out.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-abstract class A{
-	abstract void m(int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test43_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test43_in.java
deleted file mode 100644
index 35d3439..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test43_in.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	native void m(int i);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test43_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test43_out.java
deleted file mode 100644
index 58f2f20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test43_out.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	native void m(int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test44_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test44_in.java
deleted file mode 100644
index d9a29f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test44_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename var to: j
-package p;
-abstract class Test {
-  public static final Test FOO = new Test() {
-    public void foo() {
-      int var = 1;
-    }
-  };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test44_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test44_out.java
deleted file mode 100644
index cf0ec5a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test44_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename var to: j
-package p;
-abstract class Test {
-  public static final Test FOO = new Test() {
-    public void foo() {
-      int j = 1;
-    }
-  };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test45_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test45_in.java
deleted file mode 100644
index ae5e101..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test45_in.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		int xx;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test45_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test45_out.java
deleted file mode 100644
index 84a8dd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test45_out.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		int j;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test46_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test46_in.java
deleted file mode 100644
index 652e982..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test46_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(){
-		int xx= 1;
-		int yy= xx;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test46_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test46_out.java
deleted file mode 100644
index 5258afa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test46_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void m(){
-		int j= 1;
-		int yy= j;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test47_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test47_in.java
deleted file mode 100644
index 46d7a51..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test47_in.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	Bar.B[] field= new Bar.B[]{
-		new Bar.B()
-	};
-	void f(){
-		int temp;
-	}
-}
-
-class Bar{
-	static class B{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test47_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test47_out.java
deleted file mode 100644
index 0293a22..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test47_out.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A {
-	Bar.B[] field= new Bar.B[]{
-		new Bar.B()
-	};
-	void f(){
-		int newname;
-	}
-}
-
-class Bar{
-	static class B{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test48_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test48_in.java
deleted file mode 100644
index 39272a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test48_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	void f(){
-		String xxxx= "xx";
-		String y= ( xxxx );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test48_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test48_out.java
deleted file mode 100644
index 2815166..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test48_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	void f(){
-		String newname= "xx";
-		String y= ( newname );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test49_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test49_in.java
deleted file mode 100644
index 16cd146..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test49_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	{
-		String xxxx= "xx";
-		String y= ( xxxx );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test49_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test49_out.java
deleted file mode 100644
index de0ec4a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test49_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	{
-		String newname= "xx";
-		String y= ( newname );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test4_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test4_in.java
deleted file mode 100644
index b61b8be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test4_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: k
-package p;
-class A{
-	int k;
-	void m(){
-		/*[*/A i= new A();/*]*/
-		i.k= i.k;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test4_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test4_out.java
deleted file mode 100644
index 8498999..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test4_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: k
-package p;
-class A{
-	int k;
-	void m(){
-		/*[*/A k= new A();/*]*/
-		k.k= k.k;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test50_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test50_in.java
deleted file mode 100644
index 0962b7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test50_in.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	static {
-		String xxxx= "xx";
-		String y= ( xxxx );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test50_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test50_out.java
deleted file mode 100644
index 73341fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test50_out.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-	static {
-		String newname= "xx";
-		String y= ( newname );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test51_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test51_in.java
deleted file mode 100644
index 7a99079..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test51_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	void m() {
-		final int a = 3;
-		final int b = 3;      
-		final int b = 3;
-		final int b = 3;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test51_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test51_out.java
deleted file mode 100644
index f8e3ca6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test51_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	void m() {
-		final int a = 3;
-		final int qwerty = 3;      
-		final int b = 3;
-		final int b = 3;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test5_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test5_in.java
deleted file mode 100644
index c31e46e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test5_in.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: k
-package p;
-class A{
-	int i;
-	void m(){
-		/*[*/int i= 0;/*]*/
-		this.i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test5_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test5_out.java
deleted file mode 100644
index 9d1eb2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test5_out.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//rename to: k
-package p;
-class A{
-	int i;
-	void m(){
-		/*[*/int k= 0;/*]*/
-		this.i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test6_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test6_in.java
deleted file mode 100644
index c8fd8a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test6_in.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to k
-package p;
-class A{
-	void m(int j){
-		/*[*/int i= 0;/*]*/
-		m(i);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test6_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test6_out.java
deleted file mode 100644
index 793677a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test6_out.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//rename to k
-package p;
-class A{
-	void m(int j){
-		/*[*/int k= 0;/*]*/
-		m(k);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test7_in.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test7_in.java
deleted file mode 100644
index 7dca340..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test7_in.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//rename to k
-package p;
-class B{
-	int i;
-}
-class A extends B{
-	void m(){
-		/*[*/A i= null;/*]*/
-		super.i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test7_out.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test7_out.java
deleted file mode 100644
index 5053c50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/canRename/A_test7_out.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//rename to k
-package p;
-class B{
-	int i;
-}
-class A extends B{
-	void m(){
-		/*[*/A k= null;/*]*/
-		super.i= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail0.java
deleted file mode 100644
index b2ff9fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail0.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	void m(){
-		/*[*/final int i= 0;/*]*/
-		class X{
-			int j;
-			void m(){
-				j= i;
-			}
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail1.java
deleted file mode 100644
index 2ee470f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//nothing to rename
-package p;
-class A{
-	void m(){
-		/*[*//*]*/
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail10.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail10.java
deleted file mode 100644
index 9926ebf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail10.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//nothing to rename
-package p;
-abstract class A{
-	/*[*/abstract void m(int i, int j);/*]*/
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail11.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail11.java
deleted file mode 100644
index ded75c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail11.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//not on interfaces
-package p;
-interface A{
-	 void m(/*[*/int i/*]*/, int j);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail12.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail12.java
deleted file mode 100644
index 9bce703..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail12.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//cannot rename to j
-package p;
-class A{
-	void m(){
-		/*[*/final int i= 0;/*]*/
-		A a= new A(){
-			void m(int j){
-				int u= i;
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail13.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail13.java
deleted file mode 100644
index aa4a36d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail13.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//cannot rename to j
-package p;
-class A{
-	int j;
-	void m(){
-		/*[*/int i;/*]*/
-		j= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail14.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail14.java
deleted file mode 100644
index 90f9301..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail14.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//cannot rename to j
-package p;
-class A{
-	int k;
-	static class j{
-		static int k;
-	}
-	void m(){
-		/*[*/A i;/*]*/
-		j.k= 0;
-	}
-}	
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail15.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail15.java
deleted file mode 100644
index f803564..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail15.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	void m(){
-		/*[*/int i;/*]*/
-		for (int j= 0; j < 10; j++){
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail16.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail16.java
deleted file mode 100644
index 5c2aab4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail16.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	void m(){
-		/*[*/int i;/*]*/
-		for (int k= 0, j= 0;;) {
-		}
-		
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail17.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail17.java
deleted file mode 100644
index be33c50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail17.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	void m(){
-		/*[*/int i;/*]*/
-		try{
-			m(1);
-		}
-		catch (Throwable j){
-		}
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail18.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail18.java
deleted file mode 100644
index 3f3745d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail18.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//cannot rename to: j
-package p;
-class A{

-	String j;
-	void m(){
-		/*[*/int i=0;/*]*/
-		j.toString();	
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail19.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail19.java
deleted file mode 100644
index 93f39bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail19.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//cannot rename to: j
-package p;

-class B{

-	int j;

-}
-class A extends B{
-	void m(){
-		/*[*/int i;/*]*/
-		j= 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail2.java
deleted file mode 100644
index cf88a29..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail2.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//cannot rename to i, i
-package p;
-class A{
-	int m(){
-		int i, /*[*/int j/*]*/;
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail20.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail20.java
deleted file mode 100644
index 8a21750..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail20.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//cannot rename to: j

-package p;

-interface B{

-	int j= 0;

-}

-class A implements B{

-	void m(){

-		/*[*/int i=0;/*]*/

-		int y= j;

-	};

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail21.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail21.java
deleted file mode 100644
index f469912..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail21.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-abstract class A{
-	abstract void m(/*[*/int i/*]*/);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail22.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail22.java
deleted file mode 100644
index 82c2fed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail22.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface A{
-	/*[*/void m(int i);/*]*/
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail23.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail23.java
deleted file mode 100644
index 8c1d23a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail23.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//rename to j
-package p;
-class A{
-	native void m(/*[*/int i/*]*/);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail24.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail24.java
deleted file mode 100644
index b1310b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail24.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//compile error
-package p;
-class A{
-	void m(int f){
-		/*[*/final int i= 0;/*]*/
-		m(t);
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail25.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail25.java
deleted file mode 100644
index 46baa16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail25.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//cannot rename i to j
-package p;
-class A{
-	void m(){
-		/*[*/final int i= 0;/*]*/
-		new A(){
-			void f(){
-				int j= 0;
-				int i2= i;
-			}
-		};
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail26.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail26.java
deleted file mode 100644
index a1fe88a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail26.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming to: j
-package p;
-class A{
-	int j;
-	int m(final int k){
-		/*[*/final int i= 0;/*]*/
-		new A(){
-			int m(int o){
-				return i;
-			}
-		};
-		return i + m(m(i));
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail27.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail27.java
deleted file mode 100644
index c0e6953..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail27.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	void m(/*[*/int i/*]*/, int j){
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail28.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail28.java
deleted file mode 100644
index 1b770bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail28.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(/*[*/int i/*]*/){
-		int j;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail29.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail29.java
deleted file mode 100644
index 50fdd58..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail29.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	{
-		Object /*[*/a/*]*/= null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail3.java
deleted file mode 100644
index 9aeaa26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail3.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//cannot rename to: i, 9
-package p;
-class A{
-	int m(){
-		int i;
-		/*[*/int j;/*]*/
-			return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail30.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail30.java
deleted file mode 100644
index ea69d4d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail30.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	int f;
-	protected void primExecute(int t) {
-		this.toString();
-	}
-
-	if (image != null) {
-		Object /*[*/loc/*]*/ = null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail31.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail31.java
deleted file mode 100644
index a81d07e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail31.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	int temp; //ha! not really
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail32.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail32.java
deleted file mode 100644
index 233fd93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail32.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-	void m() {
-		final int a = 3;
-		final int b = 3;
-		final int b = 3;      
-		final int b = 3;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail4.java
deleted file mode 100644
index 02dd74c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail4.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	int m(int j){
-		/*[*/int i;/*]*/
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail5.java
deleted file mode 100644
index 42c82c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail5.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	int m(){
-		/*[*/int i;/*]*/
-		{
-			int j;
-		}
-				return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail6.java
deleted file mode 100644
index 9c7e995..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail6.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//cannot rename to: j
-package p;
-class A{
-	int m(){
-		/*[*/final int i=0;/*]*/
-		class X{
-			int j;
-			void m(){
-				j= i;
-			}
-		}
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail7.java
deleted file mode 100644
index fbe1711..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail7.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//cannot rename to: j
-package p;
-class B{
-	int j;
-}
-class A extends B{
-	int m(){
-		/*[*/int i=0;/*]*/
-		j= 0;
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail8.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail8.java
deleted file mode 100644
index 4dbd094..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail8.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//cannot rename to: j
-package p;
-interface B{
-	int j= 0;
-}
-class A implements B{
-	int m(){
-		/*[*/int i=0;/*]*/
-		i= j;
-		return 0;
-	};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail9.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail9.java
deleted file mode 100644
index fce6fd7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTemp/cannotRename/A_testFail9.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//cannot rename to: j
-package p;
-
-class B{
-	int j;
-	class A {
-		int m(){
-			/*[*/int i=0;/*]*/
-			i= j;
-			return 0;
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test0/in/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test0/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test0/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test0/out/B.java
deleted file mode 100644
index d110d65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test0/out/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test1/in/A.java
deleted file mode 100644
index bddabc6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test1/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-  A a;
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test1/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test1/out/B.java
deleted file mode 100644
index 7cad311..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test1/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-  B a;
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test10/in/A.java
deleted file mode 100644
index 8d59977..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test10/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-   A A;
-   A A(A A){
-     A:
-        for (;;){
-          if (A.A(A)==A)
-             break A;
-        }
-      return A;
-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test10/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test10/out/B.java
deleted file mode 100644
index 2eafbb8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test10/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class B{
-   B A;
-   B A(B A){
-     A:
-        for (;;){
-          if (A.A(A)==A)
-             break A;
-        }
-      return A;
-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/in/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/in/AA.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/in/AA.java
deleted file mode 100644
index 480ae03..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/in/AA.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class AA extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/out/AA.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/out/AA.java
deleted file mode 100644
index 20face0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/out/AA.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class AA extends B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/out/B.java
deleted file mode 100644
index d110d65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test11/out/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test12/in/A.java
deleted file mode 100644
index 6c84ebf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test12/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-  void m(){
-    A a = (A)new Object();
-  };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test12/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test12/out/B.java
deleted file mode 100644
index 1cb62a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test12/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class B{
-  void m(){
-    B a = (B)new Object();
-  };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test13/in/A.java
deleted file mode 100644
index cd57777..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test13/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-  void m(){
-    boolean b = (new A()) instanceof A;
-  };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test13/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test13/out/B.java
deleted file mode 100644
index 5925007..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test13/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class B{
-  void m(){
-    boolean b = (new B()) instanceof B;
-  };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test14/in/A.java
deleted file mode 100644
index 1a3912e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test14/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-  A a = new A();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test14/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test14/out/B.java
deleted file mode 100644
index 926aaed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test14/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-  B a = new B();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test15/in/A.java
deleted file mode 100644
index cd26dd8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test15/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-   static void s(){};
-}
-class AA{
-   AA(){ 
-     A.s();
-   };   
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test15/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test15/out/B.java
deleted file mode 100644
index 6fc6056..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test15/out/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class B{
-   static void s(){};
-}
-class AA{
-   AA(){ 
-     B.s();
-   };   
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test16/in/A.java
deleted file mode 100644
index 65fdbac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test16/in/A.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-class A{
-   boolean A = new A() instanceof A;
-   A A(A A){
-     A:
-        for (;;){
-          if (A.A(A)==A)
-             break A;
-        }
-      return A;
-   };
-}
-class AA extends A{
-   A A = (A) new A();
-   A A(A A){
-     A:
-        for (;;){
-          if (A.A(A)==A)
-             break A;
-        }
-      return A;
-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test16/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test16/out/B.java
deleted file mode 100644
index e2d8732..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test16/out/B.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package p;
-class B{
-   boolean A = new B() instanceof B;
-   B A(B A){
-     A:
-        for (;;){
-          if (A.A(A)==A)
-             break A;
-        }
-      return A;
-   };
-}
-class AA extends B{
-   B A = (B) new B();
-   B A(B A){
-     A:
-        for (;;){
-          if (A.A(A)==A)
-             break A;
-        }
-      return A;
-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test17/in/A.java
deleted file mode 100644
index dd850ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test17/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-interface I{
-  int A = 0;
-}
-class A{
-  int A = I.A; 
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test17/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test17/out/B.java
deleted file mode 100644
index 77da929..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test17/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-interface I{
-  int A = 0;
-}
-class B{
-  int A = I.A; 
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test18/in/A.java
deleted file mode 100644
index 791c40d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test18/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A extends Exception{
-}
-class AA{
-  void m(){
-    try {
-      throw new A();
-    }
-    catch(A a){}
-  }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test18/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test18/out/B.java
deleted file mode 100644
index f7ee99a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test18/out/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class B extends Exception{
-}
-class AA{
-  void m(){
-    try {
-      throw new B();
-    }
-    catch(B a){}
-  }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test19/in/A.java
deleted file mode 100644
index e9efa72..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test19/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A extends Exception{
-  void m(){
-    try {
-      throw new A();
-    }
-    catch(A A){}
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test19/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test19/out/B.java
deleted file mode 100644
index 3d493fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test19/out/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class B extends Exception{
-  void m(){
-    try {
-      throw new B();
-    }
-    catch(B A){}
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test2/in/A.java
deleted file mode 100644
index efd6ca8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test2/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-  int A;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test2/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test2/out/B.java
deleted file mode 100644
index 96d20fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test2/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-  int A;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test20/in/A.java
deleted file mode 100644
index 42c0104..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test20/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package A;
-class A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test20/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test20/out/B.java
deleted file mode 100644
index f585c27..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test20/out/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package A;
-class B{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test21/in/A.java
deleted file mode 100644
index 9674a71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test21/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-  void m(){
-    for (A A=new A();;) continue;
-  };
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test21/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test21/out/B.java
deleted file mode 100644
index e7079e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test21/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class B{
-  void m(){
-    for (B A=new B();;) continue;
-  };
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test22/in/A.java
deleted file mode 100644
index efd0589..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test22/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-  A(){};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test22/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test22/out/B.java
deleted file mode 100644
index 0154750..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test22/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-  B(){};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test23/in/A.java
deleted file mode 100644
index 200fbc9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test23/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-  A[] a = new A[5];
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test23/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test23/out/B.java
deleted file mode 100644
index e13f8d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test23/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-  B[] a = new B[5];
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test24/in/A.java
deleted file mode 100644
index b258bf2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test24/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A extends Exception{
-  void m() throws A
-  {};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test24/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test24/out/B.java
deleted file mode 100644
index 6bb1219..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test24/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class B extends Exception{
-  void m() throws B
-  {};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test25/in/A.java
deleted file mode 100644
index 91b863c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test25/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-  Class c = A.class;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test25/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test25/out/B.java
deleted file mode 100644
index 5e58762..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test25/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-  Class c = B.class;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test26/in/A.java
deleted file mode 100644
index 36252a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test26/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-  int x;
-  class Inner{
-    void m(){
-      A.this.x++;
-    }
-  }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test26/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test26/out/B.java
deleted file mode 100644
index 23e2e05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test26/out/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class B{
-  int x;
-  class Inner{
-    void m(){
-      B.this.x++;
-    }
-  }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test27/in/A.java
deleted file mode 100644
index ea5823b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test27/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class Super{
-  int x;
-}
-class A extends Super{
-  String x;
-  class Inner{
-    void m(){
-      A.super.x++;
-    }
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test27/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test27/out/B.java
deleted file mode 100644
index e65f694..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test27/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class Super{
-  int x;
-}
-class B extends Super{
-  String x;
-  class Inner{
-    void m(){
-      B.super.x++;
-    }
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test28/in/A.java
deleted file mode 100644
index c56d8e4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test28/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class Super{
-  void m1(){};
-}
-class A extends Super{
-  class Inner{
-    void m(){
-      A.super.m1();
-    }
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test28/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test28/out/B.java
deleted file mode 100644
index fbb2b02..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test28/out/B.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class Super{
-  void m1(){};
-}
-class B extends Super{
-  class Inner{
-    void m(){
-      B.super.m1();
-    }
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/in/A.java
deleted file mode 100644
index b047e01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-public class A{};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/in/C.java
deleted file mode 100644
index ffcf8fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/in/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-import p.A;
-class C{}; 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/out/B.java
deleted file mode 100644
index 9840770..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/out/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-public class B{};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/out/C.java
deleted file mode 100644
index 3e07200..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test29/out/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-import p.B;
-class C{}; 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test3/in/A.java
deleted file mode 100644
index 6857903..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class AA extends A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test3/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test3/out/B.java
deleted file mode 100644
index 72a47fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test3/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class B{
-}
-class AA extends B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/in/A.java
deleted file mode 100644
index 9bbb4ae..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-   static int f;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/in/AA.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/in/AA.java
deleted file mode 100644
index 47f9fc0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/in/AA.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class AA{
-   AA(){ A.f=0; };   
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/out/AA.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/out/AA.java
deleted file mode 100644
index aaf251b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/out/AA.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class AA{
-   AA(){ B.f=0; };   
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/out/B.java
deleted file mode 100644
index ab72f87..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test30/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-   static int f;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/in/A.java
deleted file mode 100644
index 061be77..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-class A{};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/in/AA.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/in/AA.java
deleted file mode 100644
index 0bd204c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/in/AA.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class AA{
-   Object a = new A(){
-              };
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/out/AA.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/out/AA.java
deleted file mode 100644
index 4cc1669..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/out/AA.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class AA{
-   Object a = new B(){
-              };
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/out/B.java
deleted file mode 100644
index 4c03080..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test31/out/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-class B{};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test32/in/A.java
deleted file mode 100644
index 3486407..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test32/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-}
-class C{
-  C(A a){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test32/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test32/out/B.java
deleted file mode 100644
index a7c1128..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test32/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class B{
-}
-class C{
-  C(B a){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test33/in/A.java
deleted file mode 100644
index de8a1e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test33/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A extends Exception{
-}
-class C{
-  C() throws A {};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test33/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test33/out/B.java
deleted file mode 100644
index 730a0ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test33/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class B extends Exception{
-}
-class C{
-  C() throws B {};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test34/in/A.java
deleted file mode 100644
index 7fe39a7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test34/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-// 2 occurences
-package p;
-public class A {
-	{A a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test34/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test34/out/B.java
deleted file mode 100644
index cedeb23..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test34/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-// 2 occurences
-package p;
-public class B {
-	{B a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test35/in/A.java
deleted file mode 100644
index d3969f2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test35/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//2 occurences
-package p;
-public class A {
-	static {A a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test35/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test35/out/B.java
deleted file mode 100644
index 161b651..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test35/out/B.java
+++ /dev/null

@@ -1,5 +0,0 @@
-//2 occurences
-package p;
-public class B {
-	static {B a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test36/in/A.java
deleted file mode 100644
index 80671d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test36/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//3 occurences
-package p;
-public class A {
-	static {A a;}
-	static {A a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test36/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test36/out/B.java
deleted file mode 100644
index d99b282..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test36/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//3 occurences
-package p;
-public class B {
-	static {B a;}
-	static {B a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test37/in/A.java
deleted file mode 100644
index a5cf5ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test37/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//3 occurences
-package p;
-public class A {
-	static {A a;}
-	{A a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test37/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test37/out/B.java
deleted file mode 100644
index 0a55f97..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test37/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-//3 occurences
-package p;
-public class B {
-	static {B a;}
-	{B a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test38/in/A.java
deleted file mode 100644
index 9b76ec0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test38/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//2 occurences
-package p;
-public class A {
-}
-
-class C{
-	{A a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test38/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test38/out/B.java
deleted file mode 100644
index 9084847..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test38/out/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//2 occurences
-package p;
-public class B {
-}
-
-class C{
-	{B a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test39/in/A.java
deleted file mode 100644
index 806e5a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test39/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//2 occurences
-package p;
-public class A {
-}
-
-class C{
-	static {A a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test39/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test39/out/B.java
deleted file mode 100644
index f7855ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test39/out/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//2 occurences
-package p;
-public class B {
-}
-
-class C{
-	static {B a;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test4/in/A.java
deleted file mode 100644
index 1091280..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test4/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-   void A(){};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test4/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test4/out/B.java
deleted file mode 100644
index 4f70464..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test4/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-   void A(){};
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test40/in/A.java
deleted file mode 100644
index ad31dc6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test40/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//1 occurence
-public class A {
-}
-
-class C {
-	void m() {
-		class A{
-		}
-		new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test40/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test40/out/B.java
deleted file mode 100644
index 3e19bb4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test40/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//1 occurence
-public class B {
-}
-
-class C {
-	void m() {
-		class A{
-		}
-		new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test41/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test41/in/A.java
deleted file mode 100644
index 04f17fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test41/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A {
-	A(A A){}
-	A A(A A){
-		A= new A(new A(A));
-		return A;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test41/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test41/out/B.java
deleted file mode 100644
index dddd152..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test41/out/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class B {
-	B(B A){}
-	B A(B A){
-		A= new B(new B(A));
-		return A;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test42/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test42/in/A.java
deleted file mode 100644
index 5418dd9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test42/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {
-	A(A A){}
-	A A(A A){
-		A= new A(new A(A));
-		return A;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test42/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test42/out/B.java
deleted file mode 100644
index 744edb4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test42/out/B.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class B {
-	B(B A){}
-	B A(B A){
-		A= new B(new B(A));
-		return A;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test43/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test43/in/A.java
deleted file mode 100644
index d187f54..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test43/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming A to B
-package p;
-public class A {
-	static A A;
-}
-class X extends p.A{
-	void x(){
-		p.A.A= A.A;//fields come first
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test43/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test43/out/B.java
deleted file mode 100644
index 20e2727..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test43/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming A to B
-package p;
-public class B {
-	static B A;
-}
-class X extends p.B{
-	void x(){
-		p.B.A= A.A;//fields come first
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test44/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test44/in/A.java
deleted file mode 100644
index 04c067d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test44/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//renaming A to B
-package p;
-interface A {
-}
-class K implements A{
-}
-interface C extends A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test44/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test44/out/B.java
deleted file mode 100644
index f9d3d92..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test44/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//renaming A to B
-package p;
-interface B {
-}
-class K implements B{
-}
-interface C extends B{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test45/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test45/in/A.java
deleted file mode 100644
index 18d05b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test45/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming A to B
-package p;
- class A {
-	static A A;
-}
-class X extends p.A{
-	void x(){
-		p.A.A= A.A;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test45/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test45/out/B.java
deleted file mode 100644
index 61d6943..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test45/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming A to B
-package p;
- class B {
-	static B A;
-}
-class X extends p.B{
-	void x(){
-		p.B.A= A.A;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/in/A.java
deleted file mode 100644
index b047e01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-public class A{};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/in/C.java
deleted file mode 100644
index ffcf8fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/in/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-import p.A;
-class C{}; 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/out/B.java
deleted file mode 100644
index 9840770..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/out/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-public class B{};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/out/C.java
deleted file mode 100644
index 3e07200..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test46/out/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-import p.B;
-class C{}; 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test47/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test47/in/A.java
deleted file mode 100644
index 6ae44a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test47/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming A to B
-package p;
-class A{
-	A	( ){};
-};
-class C{
-	void s(){
-	new A ( );
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test47/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test47/out/B.java
deleted file mode 100644
index 6d95d4f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test47/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming A to B
-package p;
-class B{
-	B	( ){};
-};
-class C{
-	void s(){
-	new B ( );
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test48/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test48/in/A.java
deleted file mode 100644
index 92da31a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test48/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming A to B
-package p;
-class A{
-	A	( ){};
-};
-class C{
-	void s(){
-	new p . A ( );
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test48/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test48/out/B.java
deleted file mode 100644
index 6fc2e7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test48/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-//renaming A to B
-package p;
-class B{
-	B	( ){};
-};
-class C{
-	void s(){
-	new p . B ( );
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test49/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test49/in/A.java
deleted file mode 100644
index dc7c33d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test49/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//renaming A to B
-package p;
-class A{
-	A	( ){};
-	static int fgT;
-};
-class C{
-	void s(){
-	new p . A ( );
-	p
-	.
-	A
-	.
-	fgT
-	=
-	6;
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test49/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test49/out/B.java
deleted file mode 100644
index 9c92c70..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test49/out/B.java
+++ /dev/null

@@ -1,18 +0,0 @@
-//renaming A to B
-package p;
-class B{
-	B	( ){};
-	static int fgT;
-};
-class C{
-	void s(){
-	new p . B ( );
-	p
-	.
-	B
-	.
-	fgT
-	=
-	6;
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test5/in/A.java
deleted file mode 100644
index efce98d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test5/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-   void m(A a){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test5/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test5/out/B.java
deleted file mode 100644
index bfca111..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test5/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-   void m(B a){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test50/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test50/in/A.java
deleted file mode 100644
index 6cd6718..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test50/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming A to B
-package p;
-/**
- * Extends {@linkplain A A}.
- * @see A#A()
- */
-class A{
-	A( ){};
-};
-class C extends A{
-	C(){
-		super();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test50/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test50/out/B.java
deleted file mode 100644
index 33ff76e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test50/out/B.java
+++ /dev/null

@@ -1,14 +0,0 @@
-//renaming A to B
-package p;
-/**
- * Extends {@linkplain B A}.
- * @see B#B()
- */
-class B{
-	B( ){};
-};
-class C extends B{
-	C(){
-		super();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/in/A.java
deleted file mode 100644
index c57bddf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A{
- public class X{}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/in/C.java
deleted file mode 100644
index a10bebd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/in/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-import p.A.*;
-class C{}; 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/out/B.java
deleted file mode 100644
index dfa16de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class B{
- public class X{}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/out/C.java
deleted file mode 100644
index 149a043..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test51/out/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-import p.B.*;
-class C{}; 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test52/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test52/in/A.java
deleted file mode 100644
index 5e98305..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test52/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class A{
-	A[] m(){
-		return (A[])new A[3];
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test52/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test52/out/B.java
deleted file mode 100644
index 28cefd2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test52/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class B{
-	B[] m(){
-		return (B[])new B[3];
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test53/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test53/in/A.java
deleted file mode 100644
index 8237dbe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test53/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//no ref update
-package p;
-public class A{
-	A(){}
-	A(A A){}
-	A m(){
-		return (A)new A();
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test53/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test53/out/B.java
deleted file mode 100644
index 9afa2e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test53/out/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//no ref update
-package p;
-public class B{
-	B(){}
-	B(A A){}
-	A m(){
-		return (A)new A();
-	}
-};
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test54/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test54/in/A.java
deleted file mode 100644
index 67a5e75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test54/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//rename X to XYZ
-package p;
-public class A{
-	class X{
-		X(X X){new X(null);}
-	}
-	A(){}
-	A(A A){}
-	A m(){
-		new X(null);
-		return (A)new A();
-	}
-};
-class B{
-	A.X ax= new A().new X(null);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test54/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test54/out/A.java
deleted file mode 100644
index efea233..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test54/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//rename X to XYZ
-package p;
-public class A{
-	class XYZ{
-		XYZ(XYZ X){new XYZ(null);}
-	}
-	A(){}
-	A(A A){}
-	A m(){
-		new XYZ(null);
-		return (A)new A();
-	}
-};
-class B{
-	A.XYZ ax= new A().new XYZ(null);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test55/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test55/in/A.java
deleted file mode 100644
index 5abee52..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test55/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//rename X to XYZ - no ref update
-package p;
-public class A{
-	class X{
-		X(X X){new X(null);}
-	}
-	A(){}
-	A(A A){}
-	A m(){
-		new X(null);
-		return (A)new A();
-	}
-};
-class B{
-	A.X ax= new A().new X(null);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test55/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test55/out/A.java
deleted file mode 100644
index 3a6a288..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test55/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-//rename X to XYZ - no ref update
-package p;
-public class A{
-	class XYZ{
-		XYZ(X X){new X(null);}
-	}
-	A(){}
-	A(A A){}
-	A m(){
-		new X(null);
-		return (A)new A();
-	}
-};
-class B{
-	A.X ax= new A().new X(null);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/A.java
deleted file mode 100644
index 92da053..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package a.a;
-class A {
-    A() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/B.java
deleted file mode 100644
index 66b8fb2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package a.a;
-class B {
-public A theA;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/default/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/default/A.java
deleted file mode 100644
index c3f152c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/in/default/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-class A {
-    A() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/A.java
deleted file mode 100644
index 92da053..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package a.a;
-class A {
-    A() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/B.java
deleted file mode 100644
index 66b8fb2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package a.a;
-class B {
-public A theA;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/default/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/default/B.java
deleted file mode 100644
index c21ade7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test56/out/default/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-class B {
-    B() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test57/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test57/in/A.java
deleted file mode 100644
index 52cf640..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test57/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-/**
- * p.A 
- * AA A {@link p.A#a}, {@link p.A#b}
- * @see p.A
- */
-public class A{
-	A a;//A
-	String aa= "A";
-};

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test57/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test57/out/B.java
deleted file mode 100644
index 714e2bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test57/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-/**
- * p.B 
- * AA B {@link p.B#a}, {@link p.B#b}
- * @see p.B
- */
-public class B{
-	B a;//B
-	String aa= "B";
-};

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test58/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test58/in/A.java
deleted file mode 100644
index 0b139ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test58/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class Sup{
-	static int CONSTANT= 0;
-}
-class A extends Sup {
-}
-
-class Test {
-  public static void main(String[] arguments) {
-    System.out.println(A.CONSTANT);
-  }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test58/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test58/out/B.java
deleted file mode 100644
index d6da1b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test58/out/B.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class Sup{
-	static int CONSTANT= 0;
-}
-class B extends Sup {
-}
-
-class Test {
-  public static void main(String[] arguments) {
-    System.out.println(B.CONSTANT);
-  }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test59/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test59/in/A.java
deleted file mode 100644
index 3faabb5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test59/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void f(){
-		A a= ( A )this;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test59/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test59/out/B.java
deleted file mode 100644
index f8e4430..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test59/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class B {
-	void f(){
-		B a= ( B )this;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test6/in/A.java
deleted file mode 100644
index c96f5c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test6/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-   void m(A A){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test6/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test6/out/B.java
deleted file mode 100644
index e32d1a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test6/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-   void m(B A){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test60/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test60/in/A.java
deleted file mode 100644
index 05032ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test60/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-/**
- * p.A 
- * AA A
- */
-public class A{
-	A a;//A
-	String aa= "C:\\A.java";
-};

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test60/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test60/out/B.java
deleted file mode 100644
index 965f4b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test60/out/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-/**
- * p.B 
- * AA B
- */
-public class B{
-	B a;//B
-	String aa= "C:\\B.java";
-};

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test61/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test61/in/A.java
deleted file mode 100644
index d53e16e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test61/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-   class Inner{
-   }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test61/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test61/out/A.java
deleted file mode 100644
index eb1966f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test61/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-   class InnerB{
-   }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test62/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test62/in/A.java
deleted file mode 100644
index 05032ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test62/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-/**
- * p.A 
- * AA A
- */
-public class A{
-	A a;//A
-	String aa= "C:\\A.java";
-};

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test62/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test62/out/B.java
deleted file mode 100644
index f81f8ce..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test62/out/B.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-/**
- * p.B 
- * AA B
- */
-public class B{
-	A a;//B
-	String aa= "C:\\B.java";
-};

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test7/in/A.java
deleted file mode 100644
index ff50450..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test7/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-   A m(){return null;};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test7/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test7/out/B.java
deleted file mode 100644
index 38e8cf2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test7/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-   B m(){return null;};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test8/in/A.java
deleted file mode 100644
index 8d3c292..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test8/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-   void m(){
-     A: return;
-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test8/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test8/out/B.java
deleted file mode 100644
index 62858b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test8/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class B{
-   void m(){
-     A: return;
-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test9/in/A.java
deleted file mode 100644
index 5d48bdf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test9/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-   void m(){
-     A A; 
-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test9/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test9/out/B.java
deleted file mode 100644
index 3f6c10b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/test9/out/B.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class B{
-   void m(){
-     B A; 
-   };
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail0/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail00/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail00/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail00/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail01/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail01/in/A.java
deleted file mode 100644
index f6daf1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail01/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-}
-class C extends A{
-}
-class B extends C{
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail02/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail02/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail02/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail03/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail03/in/A.java
deleted file mode 100644
index f6daf1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail03/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-}
-class C extends A{
-}
-class B extends C{
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail04/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail04/in/A.java
deleted file mode 100644
index f6daf1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail04/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-}
-class C extends A{
-}
-class B extends C{
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail1/in/A.java
deleted file mode 100644
index f6daf1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail1/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-}
-class C extends A{
-}
-class B extends C{
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail10/in/A.java
deleted file mode 100644
index a7cbe67..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail10/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-  class AA{
-     class AAA{
-        class B{
-        }
-     }
-  }
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail11/in/A.java
deleted file mode 100644
index b376073..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail11/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-  class A{}
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail12/in/A.java
deleted file mode 100644
index 179edb2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail12/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-  interface B{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail16/in/A.java
deleted file mode 100644
index e325f6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail16/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class Outer{
-  class A{}
-  class B{}
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail17/in/A.java
deleted file mode 100644
index ae12ea2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail17/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class Outer{
-  class A{}
-  interface B{}
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail18/in/A.java
deleted file mode 100644
index ad30f07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail18/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class Outer{
-  class Inner{
-    class A{}
-    class B{}
-  }
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail19/in/A.java
deleted file mode 100644
index ad30f07..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail19/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class Outer{
-  class Inner{
-    class A{}
-    class B{}
-  }
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail2/in/A.java
deleted file mode 100644
index 304ff48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail2/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A extends B{
-}
-class B{
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail20/in/A.java
deleted file mode 100644
index 7ca9bbb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail20/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-public class A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail20/in/AA.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail20/in/AA.java
deleted file mode 100644
index 74916a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail20/in/AA.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p2;
-import p1.*;
-class AA extends A{}
-class B extends AA{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail21/in/A.java
deleted file mode 100644
index 77c8e44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail21/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;
-class A{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail21/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail21/in/C.java
deleted file mode 100644
index 3681e46..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail21/in/C.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1.B;
-class C{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail22/in/A.java
deleted file mode 100644
index 32ba7d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail22/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-class A{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail22/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail22/in/B.java
deleted file mode 100644
index 7c55812..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail22/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-interface B{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/A.java
deleted file mode 100644
index 25ac9bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;
-public class A{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/B.java
deleted file mode 100644
index 1e8902b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p3;
-public class B{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/Bogus.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/Bogus.java
deleted file mode 100644
index c10e59b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail23/in/Bogus.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p2;
-import p1.A;
-import p3.B;
-class Bogus{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail24/in/A.java
deleted file mode 100644
index 25ac9bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail24/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;
-public class A{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail24/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail24/in/B.java
deleted file mode 100644
index 3945a49..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail24/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p2;
-import p1.A;
-class B{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail25/in/A.java
deleted file mode 100644
index 25ac9bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail25/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;
-public class A{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail25/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail25/in/B.java
deleted file mode 100644
index 042c455..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail25/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p2;
-import p1.A;
-interface B{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail26/in/A.java
deleted file mode 100644
index 61b6e6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail26/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-import p2.B;
-public class A{} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail26/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail26/in/B.java
deleted file mode 100644
index 8a3f9bf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail26/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p2;
-public interface B{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail27/in/A.java
deleted file mode 100644
index 8071f64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail27/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p1;
-import p2.B;
-public class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail27/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail27/in/B.java
deleted file mode 100644
index 16d5100..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail27/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p2;
-public class B{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail28/in/A.java
deleted file mode 100644
index 056876b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail28/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-   static int length = 17;
-   int m(){
-     int[] B = new int[1];
-     return A.length;
-   }
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail29/in/A.java
deleted file mode 100644
index 61d3566..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail29/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-   static int length = 17;
-   int m(int[] B){
-     return A.length;
-   }
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail3/in/A.java
deleted file mode 100644
index ad40c78..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail3/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A extends C{
-}
-class B{
-}
-class C extends B{
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail30/in/A.java
deleted file mode 100644
index 4ab0bf3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail30/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-   static int length = 17;
-   int[] B = new int[1];
-   int m(){
-     return A.length;
-   }
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/A.java
deleted file mode 100644
index 4edb6e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;
-public class A{}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/B.java
deleted file mode 100644
index c16f798..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p2;
-public class B{}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/C.java
deleted file mode 100644
index 1b13cad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail31/in/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p3;
-import p1.*;
-import p2.B;
-class C{
-   Object o = new A();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail32/in/A.java
deleted file mode 100644
index 7b5d176..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail32/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-import p1.*;
-public class A{
-   Object o = new B();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail32/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail32/in/B.java
deleted file mode 100644
index 568eb40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail32/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;
-public class B{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail33/in/A.java
deleted file mode 100644
index cc55de5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail33/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//2 occurences
-//disallow - shadowing
-public class A {
-}
-
-class C {
-	void m() {
-		class B {
-		}
-		new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail34/in/A.java
deleted file mode 100644
index 6462581..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail34/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//2 occurences
-//disallow - obscuring
-public class A {
-	static int length= 1;
-}
-
-class C {
-	void m() {
-		int[] B= {42};
-		A.length= 0;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail35/in/A.java
deleted file mode 100644
index 7dad132..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail35/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//2 occurences
-//disallow - obscuring
-public class A {
-	static int length= 1;
-}
-
-class C {
-	void m(int[] B) {
-		A.length= 0;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail36/in/A.java
deleted file mode 100644
index 00a75d1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail36/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//2 occurences
-//disallow - obscuring
-public class A {
-	static int length= 1;
-}
-
-class C {
-	int[] B= {4};
-	void m() {
-		A.length= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail37/in/A.java
deleted file mode 100644
index 71df552..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail37/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A{
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail37/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail37/in/B.java
deleted file mode 100644
index 6cb383e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail37/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-class B{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail38/in/A.java
deleted file mode 100644
index b7438c3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail38/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A{
-	private static interface I{
-		class C{
-		native void j();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail39/in/A.java
deleted file mode 100644
index 94de0d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail39/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class A{
-	native void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail4/in/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail4/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail4/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail4/in/B.java
deleted file mode 100644
index 3613892..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail4/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B extends A{
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail40/in/A.java
deleted file mode 100644
index 71e4836..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail40/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class A{
-	class C{
-		native void m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail41/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail41/in/A.java
deleted file mode 100644
index 1172b81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail41/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class A{
-	public static int length(){ return 0;};
-}
-class F{
-	int m(){
-		String B= null;
-		return A.length();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail42/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail42/in/A.java
deleted file mode 100644
index 81eaf64..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail42/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-public class A{
-	public static int length(){ return 0;};
-}
-class F{
-	int m(String B){
-		return A.length();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail43/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail43/in/A.java
deleted file mode 100644
index 65fb284..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail43/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class A{
-	public static int length(){ return 0;};
-}
-class F{
-	String B;
-	int m(){
-		return A.length();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail44/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail44/in/A.java
deleted file mode 100644
index f65c292..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail44/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-public class A{
-	public static int length(){ return 0;};
-}
-class F{
-	String B;
-}
-class FF extends F{
-	int m(){
-		return A.length();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail45/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail45/in/A.java
deleted file mode 100644
index 5554553..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail45/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-public class A{
-	public static int length(){ return 0;};
-}
-interface I{
-	String B= "fred";
-}
-class FF implements I{
-	int m(){
-		return A.length();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail46/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail46/in/A.java
deleted file mode 100644
index 2c0539c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail46/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class A{
-	static int MAX_VALUE = 2;
-}
-class S{
-	int m(){
-		Integer B= null;
-		return A.MAX_VALUE;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail47/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail47/in/A.java
deleted file mode 100644
index a6af04d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail47/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-public class A{
-	static int MAX_VALUE = 2;
-}
-class S{
-	int m(Integer B){
-		return A.MAX_VALUE;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail48/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail48/in/A.java
deleted file mode 100644
index 730681c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail48/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	A a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail49/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail49/in/A.java
deleted file mode 100644
index 6e5046d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail49/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	A m(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/A.java
deleted file mode 100644
index 6291b80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/B.java
deleted file mode 100644
index 3d18e87..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B extends C{
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/C.java
deleted file mode 100644
index 293a290..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail5/in/C.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class C extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail50/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail50/in/A.java
deleted file mode 100644
index ce74207..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail50/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	void m(A a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail51/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail51/in/A.java
deleted file mode 100644
index 223883f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail51/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	X(A a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail52/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail52/in/A.java
deleted file mode 100644
index 7129fc6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail52/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A extends Exception{
-}
-class X{
-	class B extends Exception{
-	}
-	void m() throws A{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail53/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail53/in/A.java
deleted file mode 100644
index 917fe91..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail53/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A extends Exception{
-}
-class X{
-	class B extends Exception{
-	}
-	X() throws A{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail54/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail54/in/A.java
deleted file mode 100644
index de4ae47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail54/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	void m(){
-		A a;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail55/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail55/in/A.java
deleted file mode 100644
index 45a7007..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail55/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A extends Exception{
-}
-class X{
-	class B extends Exception{
-	}
-	void m() throws A{
-	}
-	void k(){
-		try {
-			m();
-		} catch (A a){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail56/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail56/in/A.java
deleted file mode 100644
index 927609b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail56/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A extends Exception{
-}
-class X{
-	class B extends Exception{
-	}
-	Object o= A.class;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail57/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail57/in/A.java
deleted file mode 100644
index 222d305..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail57/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	Object o= new A();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail58/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail58/in/A.java
deleted file mode 100644
index eaab62a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail58/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	Object o= new A(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail59/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail59/in/A.java
deleted file mode 100644
index 5b3be05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail59/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	Object o= new A[0];
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/A.java
deleted file mode 100644
index 07a2149..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A extends C{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/B.java
deleted file mode 100644
index d110d65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/C.java
deleted file mode 100644
index b2c3c43..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail6/in/C.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class C extends B{
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail60/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail60/in/A.java
deleted file mode 100644
index 2b19f3b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail60/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	Object m(Object o){
-		return (A)o;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail61/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail61/in/A.java
deleted file mode 100644
index 33ee468..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail61/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	boolean m(Object o){
-		return o instanceof A;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail62/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail62/in/A.java
deleted file mode 100644
index d6c2750..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail62/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	static int x;
-}
-class X{
-	static class B{
-		static int x;
-	}
-	int m(Object o){
-		return A.x;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail63/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail63/in/A.java
deleted file mode 100644
index 78f81e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail63/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-	static int x(){return 42;};
-}
-class X{
-	static class B{
-		static int x(){return 42;};
-	}
-	int m(Object o){
-		return A.x();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail64/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail64/in/A.java
deleted file mode 100644
index aca1914..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail64/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class X{
-	class B{
-	}
-	class Fred extends A{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail65/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail65/in/A.java
deleted file mode 100644
index 773ea1e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail65/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{}
-		A a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail66/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail66/in/A.java
deleted file mode 100644
index cbd2947..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail66/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{};
-		class C{
-			A m(){
-				return null;
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail67/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail67/in/A.java
deleted file mode 100644
index 1bd4502..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail67/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{};
-		class C{
-			void m(A b){
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail68/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail68/in/A.java
deleted file mode 100644
index 9f6c653..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail68/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{
-		};
-		class C{
-			C(A b){
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail69/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail69/in/A.java
deleted file mode 100644
index 4109948..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail69/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A extends Exception{
-}
-class X{
-	void m(){
-		class B extends Exception{}
-		class C{
-			void m() throws A{
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail7/in/A.java
deleted file mode 100644
index dd7b3a0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail7/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-}
-class B{}
-
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail70/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail70/in/A.java
deleted file mode 100644
index 0f3f1b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail70/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A extends Exception{
-}
-class X{
-	void m(){
-		class B extends Exception{}
-		class C{
-			C() throws A{
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail71/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail71/in/A.java
deleted file mode 100644
index f26e1b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail71/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-}
-class X{
-	void m(){
-		class B{}
-		class C{
-			A a;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail72/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail72/in/A.java
deleted file mode 100644
index 3e9e83e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail72/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-class A extends Exception {
-}
-class X {
-	void f() {
-		class B extends Exception {
-		};
-		class C {
-			void m() throws A {
-			}
-			void k() {
-				try {
-					m();
-				} catch (A a) {
-				}
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail73/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail73/in/A.java
deleted file mode 100644
index 98430b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail73/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A {}
-class X{
-	void m(){
-		class B	{}
-		Object o= A.class;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail74/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail74/in/A.java
deleted file mode 100644
index 10d8bfe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail74/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{}
-		Object o= new A();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail75/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail75/in/A.java
deleted file mode 100644
index f6cdea7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail75/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{}
-		Object o= new A(){};
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail76/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail76/in/A.java
deleted file mode 100644
index 48f65c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail76/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{}
-		Object o= new A[0];
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail77/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail77/in/A.java
deleted file mode 100644
index a4d5354..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail77/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{}
-		class C{
-			Object m(Object o){
-				return (A)o;
-			}
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail78/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail78/in/A.java
deleted file mode 100644
index b2d42cb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail78/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{	}
-		class C{
-			boolean m(Object o){
-				return o instanceof A;
-			}
-		}	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail79/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail79/in/A.java
deleted file mode 100644
index 8eb9ad9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail79/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-}
-class X{
-	void m(){
-		class B{}
-		class Fred extends A{
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail8/in/A.java
deleted file mode 100644
index 4a3f223..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail8/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail8/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail8/in/B.java
deleted file mode 100644
index d5d34df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail8/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B{}
- 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail80/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail80/in/A.java
deleted file mode 100644
index 8e56da5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail80/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		class B{}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail81/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail81/in/A.java
deleted file mode 100644
index d2dc781..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail81/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	class C{
-		void m(){
-			class B{}
-		}
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail82/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail82/in/A.java
deleted file mode 100644
index 96d072c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail82/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{}
-class X{
-	class B extends A{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail83/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail83/in/A.java
deleted file mode 100644
index ffe08d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail83/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//can't rename A to Cloneable
-package p;
-interface A{}
-class X{
-	void m(){
-		class C implements A, Cloneable{}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail84/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail84/in/A.java
deleted file mode 100644
index 236e5c2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail84/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-//can't rename A to List
-package p;
-import java.util.List;
-class A{}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail85/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail85/in/A.java
deleted file mode 100644
index 7e9bfb1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail85/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	class C{
-		class D{
-			native void n();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail86/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail86/in/A.java
deleted file mode 100644
index fef1289..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail86/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{}
-class C{
-	native void n(A a);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail87/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail87/in/A.java
deleted file mode 100644
index 9c0c81c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail87/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{}
-class C{
-	class D{
-		native void n(A a);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail88/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail88/in/A.java
deleted file mode 100644
index 2c1bc51..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail88/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	void m(){
-		class C{
-			native void m();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail89/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail89/in/A.java
deleted file mode 100644
index da0e6dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail89/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	class Inner{
-		void m(){
-			class C{
-				native void m();
-			}
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail9/in/A.java
deleted file mode 100644
index 8c0da8d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail9/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-class A{
-  class B{}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail90/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail90/in/A.java
deleted file mode 100644
index 51cffbb6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail90/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-public class A{
-	public static int length(){ return 0;};
-}
-class F{
-	static class B{
-		public static int length(){ return 42;};
-	};
-}
-class FF extends F{
-	int m(){
-		return A.length();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail91/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail91/in/A.java
deleted file mode 100644
index a830c1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail91/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-public class A{
-	public static int length(){ return 0;};
-}
-interface I{
-	static class B{
-		public static int length(){ return 0;};
-	}
-}
-class FF implements I{
-	int m(){
-		return A.length();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail92/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail92/in/A.java
deleted file mode 100644
index 639b145..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail92/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-public class A{
-	void f(){
-		class X{
-			class B{}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail93/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail93/in/A.java
deleted file mode 100644
index 40039ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail93/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class A{
-	void f(){
-		class X{
-			class B{
-				native void m();
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail94/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail94/in/A.java
deleted file mode 100644
index ff0cb15..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail94/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{}
-class B{
-	native void m(A a);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail95/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail95/in/A.java
deleted file mode 100644
index ac49ce4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFail95/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A {
-	class Z {
-		void o() {
-			{
-				class F {
-					{
-						class B {
-							void hj() {
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java
deleted file mode 100644
index 4140567..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java
+++ /dev/null

@@ -1,9 +0,0 @@
-import java.util.*; 
-import java.io.File;
-
-public class Blinky{
-
-	public static void main(String[] args) {
-	}
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalInnerClass/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalInnerClass/in/A.java
deleted file mode 100644
index b376073..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalInnerClass/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-  class A{}
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName1/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName1/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName2/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName2/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName3/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName4/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName4/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName5/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName5/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName6/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName6/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName7/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName7/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName8/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName8/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName9/in/A.java
deleted file mode 100644
index 2ffd296..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testIllegalTypeName9/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A {
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testNoOp/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testNoOp/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testNoOp/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/in/A.java
deleted file mode 100644
index 23fae3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class A {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/in/build.xml b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/in/build.xml
deleted file mode 100644
index 20d736e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/in/build.xml
+++ /dev/null

@@ -1 +0,0 @@
-p.A
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/out/B.java
deleted file mode 100644
index 4059e22..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-
-class B {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/out/build.xml b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/out/build.xml
deleted file mode 100644
index efbc725..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testQualifiedName1/out/build.xml
+++ /dev/null

@@ -1 +0,0 @@
-p.B
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg1/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg1/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg2/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg2/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg3/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg4/in/A.java
deleted file mode 100644
index 6f63ab9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameType/testWrongArg4/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A {
-}
-class B extends A{
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test0/in/A.java
deleted file mode 100644
index 85166d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test0/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A<T>{
-	private int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test0/out/A.java
deleted file mode 100644
index 4016d53..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test0/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A<S>{
-	private int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test1/in/A.java
deleted file mode 100644
index e1f3b89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test1/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<T>{
-	private T f;
-	void m(){
-		T g= f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test1/out/A.java
deleted file mode 100644
index 2267609..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test1/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<S>{
-	private S f;
-	void m(){
-		S g= f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test10/in/A.java
deleted file mode 100644
index 1be1f59..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test10/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<T>{
-	private T f;
-	class B<T>{
-		static <T> T f(T t) {
-			T s=t;
-			return null;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test10/out/A.java
deleted file mode 100644
index 7a415b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test10/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<T>{
-	private T f;
-	class B<T>{
-		static <S> S f(S t) {
-			T s=t;
-			return null;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test11/in/A.java
deleted file mode 100644
index c8e154f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test11/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T>{
-	private int f;
-	static <T> T f(T t) {return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test11/out/A.java
deleted file mode 100644
index 09beebd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test11/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T>{
-	private int f;
-	static <S> T f(T t) {return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test12/in/A.java
deleted file mode 100644
index 1be1f59..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test12/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<T>{
-	private T f;
-	class B<T>{
-		static <T> T f(T t) {
-			T s=t;
-			return null;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test12/out/A.java
deleted file mode 100644
index 60d7555..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test12/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A<T>{
-	private T f;
-	class B<T>{
-		static <S> T f(T t) {
-			T s=t;
-			return null;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test2/in/A.java
deleted file mode 100644
index e1f3b89..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test2/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<T>{
-	private T f;
-	void m(){
-		T g= f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test2/out/A.java
deleted file mode 100644
index f300dc7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test2/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A<S>{
-	private T f;
-	void m(){
-		T g= f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test3/in/A.java
deleted file mode 100644
index 714c3e9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test3/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A<R,T>{
-	private T f;
-	T m(R r, T t){
-		T g= f;
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test3/out/A.java
deleted file mode 100644
index 59c53f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test3/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A<R,S>{
-	private S f;
-	S m(R r, S t){
-		S g= f;
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test4/in/A.java
deleted file mode 100644
index 714c3e9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test4/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A<R,T>{
-	private T f;
-	T m(R r, T t){
-		T g= f;
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test4/out/A.java
deleted file mode 100644
index 7e31116..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test4/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A<R,S>{
-	private T f;
-	T m(R r, T t){
-		T g= f;
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test5/in/A.java
deleted file mode 100644
index 81f2604..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test5/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{
-	private int f;
-	class B<T>{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test5/out/A.java
deleted file mode 100644
index 00518e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test5/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<S>{
-	private int f;
-	class B<T>{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test6/in/A.java
deleted file mode 100644
index 86dee3a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test6/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<R,S>{
-	private int f;
-	class B<T,R>{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test6/out/A.java
deleted file mode 100644
index 6b0a8af..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test6/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<R,T>{
-	private int f;
-	class B<T,R>{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test7/in/A.java
deleted file mode 100644
index 81f2604..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test7/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{
-	private int f;
-	class B<T>{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test7/out/A.java
deleted file mode 100644
index 00518e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test7/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<S>{
-	private int f;
-	class B<T>{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test8/in/A.java
deleted file mode 100644
index 86dee3a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test8/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<R,S>{
-	private int f;
-	class B<T,R>{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test8/out/A.java
deleted file mode 100644
index 6b0a8af..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test8/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<R,T>{
-	private int f;
-	class B<T,R>{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test9/in/A.java
deleted file mode 100644
index c8e154f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test9/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T>{
-	private int f;
-	static <T> T f(T t) {return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test9/out/A.java
deleted file mode 100644
index 483f335..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/test9/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T>{
-	private int f;
-	static <S> S f(S t) {return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail0/in/A.java
deleted file mode 100644
index b9f960f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail0/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{
-	class S {}
-	private int f;
-	private int g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail1/in/A.java
deleted file mode 100644
index fefcd3c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail1/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T,R>{
-	class S{}
-	private int f;
-	private String g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail2/in/A.java
deleted file mode 100644
index 0c2e8dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail2/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T>{
-	static class S {}
-	private int f;
-	private int g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail3/in/A.java
deleted file mode 100644
index 29db22f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail3/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A<T,S>{
-	private int f;
-	private String g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail4/in/A.java
deleted file mode 100644
index 9b790ed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail4/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A<T,R>{
-	static class S{}
-	private int f;
-	private String g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail5/in/A.java
deleted file mode 100644
index 37599f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameTypeParameter/testFail5/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A<T>{
-	static class B {
-		static <T> T f(T t) {
-			class S {}
-			return null;
-		} 
-	}
-	private T f;
-	private B g;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test1/in/A.java
deleted file mode 100644
index b390b33..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test1/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//renaming A.m to k
-abstract class A {
-	abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test1/out/A.java
deleted file mode 100644
index 1c62c61..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test1/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//renaming A.m to k
-abstract class A {
-	abstract void k();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test10/in/A.java
deleted file mode 100644
index 189c1ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test10/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	void m(){}
-}
-class B {
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test10/out/A.java
deleted file mode 100644
index 39cbee9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test10/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	void k(){}
-}
-class B {
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test11/in/A.java
deleted file mode 100644
index 73b0420f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test11/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	void m(){}
-}
-class B extends A{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test11/out/A.java
deleted file mode 100644
index 43cb647..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test11/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	void k(){}
-}
-class B extends A{
-	void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test12/in/A.java
deleted file mode 100644
index eba14d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test12/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	void m(){}
-}
-class B extends A{
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test12/out/A.java
deleted file mode 100644
index dff6414..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test12/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m to k
-class A {
-	void k(){}
-}
-class B extends A{
-	public void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test13/in/A.java
deleted file mode 100644
index 0e114b1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test13/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void m(){
-	}
-	void f(){
-		m();
-	}
-}
-class A extends B{
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test13/out/A.java
deleted file mode 100644
index aa8b9db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test13/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void m(){
-	}
-	void f(){
-		m();
-	}
-}
-class A extends B{
-	void k(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test14/in/A.java
deleted file mode 100644
index 962ae44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test14/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void k(){
-	}
-	void f(){
-		k();
-	}
-}
-class A extends B{
-	void m(){
-	}
-	void f(){
-		m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test14/out/A.java
deleted file mode 100644
index 978ee42..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test14/out/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void k(){
-	}
-	void f(){
-		k();
-	}
-}
-class A extends B{
-	void k(){
-	}
-	void f(){
-		k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test15/in/A.java
deleted file mode 100644
index 0dc48af..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test15/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test15/out/A.java
deleted file mode 100644
index 1459a9a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test15/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	int k(int m){
-		return k(k(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test16/in/A.java
deleted file mode 100644
index ab6d0b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test16/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to fred
-class A{
-	int m(int m){
-		return m(m(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test16/out/A.java
deleted file mode 100644
index f701b63..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test16/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//renaming A.m to fred
-class A{
-	int fred(int m){
-		return fred(fred(m));
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test17/in/A.java
deleted file mode 100644
index 9e7294f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test17/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming A.m to kk
-package p;
-public class A {
-	void m(int m){}
-}
-class B extends A{
-	void m(boolean m){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test17/out/A.java
deleted file mode 100644
index 4c21116..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test17/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming A.m to kk
-package p;
-public class A {
-	void kk(int m){}
-}
-class B extends A{
-	void m(boolean m){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/in/A.java
deleted file mode 100644
index 6208aa1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming B.m to kk
-package p;
-class B {
-	void m(int m) {
-	}
-
-}
-public class A extends B {
-	void m(int m) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/in/C.java
deleted file mode 100644
index 4794cc8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/in/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class C{
-	void k(){
-		new A().m(4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/out/A.java
deleted file mode 100644
index 763c416..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming B.m to kk
-package p;
-class B {
-	void kk(int m) {
-	}
-
-}
-public class A extends B {
-	void kk(int m) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/out/C.java
deleted file mode 100644
index 493535e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test18/out/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class C{
-	void k(){
-		new A().kk(4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test19/in/A.java
deleted file mode 100644
index 00408da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test19/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	void m() {
-	}
-}
-
-class B{
-	void k(){
-		A a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test19/out/A.java
deleted file mode 100644
index ce31818..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test19/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	void fred() {
-	}
-}
-
-class B{
-	void k(){
-		A a= new A();
-		a.fred();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test2/in/A.java
deleted file mode 100644
index 34ca89c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test2/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	void m() {
-	}
-}
-
-class B{
-	void k(){
-		A a= new A();
-		a
-		.
-		m ();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test2/out/A.java
deleted file mode 100644
index d7ddb59..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test2/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	void fred() {
-	}
-}
-
-class B{
-	void k(){
-		A a= new A();
-		a
-		.
-		fred ();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test20/in/A.java
deleted file mode 100644
index 726d3fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test20/in/A.java
+++ /dev/null

@@ -1,25 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	int m(int m) {
-		return m	(	m	)	;
-	}
-}
-
-class B{
-	void k(){
-		A a= new A();
-		a
-	.
-		m 
-			(
-			a
-				.
-	m	
-				(
-					6
-			)	
-			
-		);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test20/out/A.java
deleted file mode 100644
index 0750d28..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test20/out/A.java
+++ /dev/null

@@ -1,25 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	int fred(int m) {
-		return fred	(	m	)	;
-	}
-}
-
-class B{
-	void k(){
-		A a= new A();
-		a
-	.
-		fred 
-			(
-			a
-				.
-	fred	
-				(
-					6
-			)	
-			
-		);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test21/in/A.java
deleted file mode 100644
index 4d69649..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test21/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	int m(int m) {
-		return m	(	m	)	;
-	}
-}
-class B extends A{
-	void f(){
-		super .
-		m (4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test21/out/A.java
deleted file mode 100644
index e16a39c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test21/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-//renaming A.m to fred
-package p;
-public class A{
-	int fred(int m) {
-		return fred	(	m	)	;
-	}
-}
-class B extends A{
-	void f(){
-		super .
-		fred (4);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test22/in/A.java
deleted file mode 100644
index 56d0efa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test22/in/A.java
+++ /dev/null

@@ -1,40 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void m(){
-		System.out.println("B.m");	
-	}
-	void fred(){
-		m();
-		B b= new B();
-		b.m();	
-		B b1= new A();
-		b1.m();
-		B bc= new C();
-		bc.m();
-		
-		A ba= new A();
-		ba.m();
-		A ac= new C();
-		ac.m();
-		C c= new C();
-		c.m();
-		
-	}
-}
-class A extends B{
-	void m(){
-		System.out.println("A.m");	
-	}
-}
-class C extends A{
-	void m(){
-		System.out.println("C.m");	
-	}
-}
-
-class test{
-	public static void main(String[] args){
-		new B().fred();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test22/out/A.java
deleted file mode 100644
index c09b947..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test22/out/A.java
+++ /dev/null

@@ -1,40 +0,0 @@
-package p;
-//renaming A.m to k
-class B{
-	private void m(){
-		System.out.println("B.m");	
-	}
-	void fred(){
-		m();
-		B b= new B();
-		b.m();	
-		B b1= new A();
-		b1.m();
-		B bc= new C();
-		bc.m();
-		
-		A ba= new A();
-		ba.k();
-		A ac= new C();
-		ac.k();
-		C c= new C();
-		c.k();
-		
-	}
-}
-class A extends B{
-	void k(){
-		System.out.println("A.m");	
-	}
-}
-class C extends A{
-	void k(){
-		System.out.println("C.m");	
-	}
-}
-
-class test{
-	public static void main(String[] args){
-		new B().fred();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test23/in/A.java
deleted file mode 100644
index 34da048..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test23/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	void m(){
-	}
-}
-class test{
-	void m(){
-		class X extends A{
-			void m(){}
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test23/out/A.java
deleted file mode 100644
index ad18f1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test23/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	void k(){
-	}
-}
-class test{
-	void k(){
-		class X extends A{
-			void k(){}
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test24/in/A.java
deleted file mode 100644
index 751eff5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test24/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	void m(String s){
-	}
-}
-class B extends A{
-	void m(java.lang.String s){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test24/out/A.java
deleted file mode 100644
index 692f888..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test24/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//renaming A.m to k
-class A{
-	void k(String s){
-	}
-}
-class B extends A{
-	void k(java.lang.String s){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test25/in/A.java
deleted file mode 100644
index b7498e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test25/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void m(){
-		System.out.println("a");
-	}
-	class B{
-		class C {
-			void f(){
-				m();
-			}
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test25/out/A.java
deleted file mode 100644
index a0ccb4d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test25/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void k(){
-		System.out.println("a");
-	}
-	class B{
-		class C {
-			void f(){
-				k();
-			}
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test26/in/A.java
deleted file mode 100644
index a89eb28..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test26/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void m(){}
-}
-class B{
-	static {
-		new A().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test26/out/A.java
deleted file mode 100644
index 0f715d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test26/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void k(){}
-}
-class B{
-	static {
-		new A().k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test27/in/A.java
deleted file mode 100644
index 23de065..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test27/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void m(){}
-}
-class B{
-	{
-		new A().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test27/out/A.java
deleted file mode 100644
index 6b618dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test27/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void k(){}
-}
-class B{
-	{
-		new A().k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test28/in/A.java
deleted file mode 100644
index 4a44acd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test28/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void m(){}
-	{
-		new A().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test28/out/A.java
deleted file mode 100644
index 73719a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test28/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void k(){}
-	{
-		new A().k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test29/in/A.java
deleted file mode 100644
index d3cb7ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test29/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void m(){}
-	static {
-		new A().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test29/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test29/out/A.java
deleted file mode 100644
index 833cebf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test29/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void k(){}
-	static {
-		new A().k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test30/in/A.java
deleted file mode 100644
index 1fdbd9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test30/in/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class B{
-	A f(){
-		return null;
-	}
-}
-
-class A{
-	B m(){
-		return null;
-	}
-}
-
-class C{
-	void f(B b){
-		b.f().m().f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test30/out/A.java
deleted file mode 100644
index cf5f404..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test30/out/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class B{
-	A f(){
-		return null;
-	}
-}
-
-class A{
-	B k(){
-		return null;
-	}
-}
-
-class C{
-	void f(B b){
-		b.f().k().f().k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test31/in/A.java
deleted file mode 100644
index 60f4b48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test31/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void m(){
-		this.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test31/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test31/out/A.java
deleted file mode 100644
index 5325623..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test31/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-//renaming A.m to k 
-package p;
-
-class A{
-	void k(){
-		this.k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test32/in/A.java
deleted file mode 100644
index db159df..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test32/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//no ref update
-//renaming A.m to k 
-package p;
-
-class A{
-	void m(){
-		this.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test32/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test32/out/A.java
deleted file mode 100644
index d129128..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test32/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-//no ref update
-//renaming A.m to k 
-package p;
-
-class A{
-	void k(){
-		this.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test33/in/A.java
deleted file mode 100644
index e955c8b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test33/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming A.m to k 
-package p;
-class A{
-	public void m(){}
-}
-
-class AQE extends A{
-	public void m(){
-		super.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test33/out/A.java
deleted file mode 100644
index 7eafaed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test33/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-//renaming A.m to k 
-package p;
-class A{
-	public void k(){}
-}
-
-class AQE extends A{
-	public void k(){
-		super.k();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test34/in/A.java
deleted file mode 100644
index 3a6c8d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test34/in/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A {
-/**
-*  Comment section
-*
-**/
-  public A() {
-  }
-
-  protected void A() {
-  }
-}
-
-class B extends A {
-  public B() {
-     super(); 
-  }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test34/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test34/out/A.java
deleted file mode 100644
index 3a6c8d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test34/out/A.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package p;
-class A {
-/**
-*  Comment section
-*
-**/
-  public A() {
-  }
-
-  protected void A() {
-  }
-}
-
-class B extends A {
-  public B() {
-     super(); 
-  }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test35/in/A.java
deleted file mode 100644
index 7f8b386..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test35/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-  protected void foo(Object o){}
-  protected void foo(String s){}
-}
-class B extends A{
-	protected void foo(Object o){}
-	protected void foo(String s){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test35/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test35/out/A.java
deleted file mode 100644
index f76e88f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test35/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A {
-  protected void bar(Object o){}
-  protected void foo(String s){}
-}
-class B extends A{
-	protected void bar(Object o){}
-	protected void foo(String s){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test36/in/A.java
deleted file mode 100644
index 065d28b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test36/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A extends F {
-  void foo(String s){}
-}
-class F {
-  void foo(F b){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test36/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test36/out/A.java
deleted file mode 100644
index de317ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test36/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A extends F {
-  void bar(String s){}
-}
-class F {
-  void foo(F b){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test37/in/A.java
deleted file mode 100644
index ccb0786..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test37/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-  void foo(A b){}
-}
-class F extends A {
-  void foo(String s){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test37/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test37/out/A.java
deleted file mode 100644
index 85b0a81..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test37/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A {
-  void bar(A b){}
-}
-class F extends A {
-  void foo(String s){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test38/in/A.java
deleted file mode 100644
index da2eabb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test38/in/A.java
+++ /dev/null

@@ -1,25 +0,0 @@
-//rename A#m() to k() -> must rename all m()
-package p;
-abstract class Abstract {
-	public abstract void m();
-	void caller(Abstract abstr, A a, Interface inter, Impl2 impl2) {
-		abstr.m();
-		a.m();
-		inter.m();
-		impl2.m();
-	}
-}
-
-class A extends Abstract {
-	public void m() { // from Abstract
-	}
-}
-
-interface Interface { //independent of Abstract
-	void m();
-}
-
-class Impl2 extends Abstract implements Interface {
-	public void m() { // from Abstract AND from Interface
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test38/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test38/out/A.java
deleted file mode 100644
index 6fb8dfe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test38/out/A.java
+++ /dev/null

@@ -1,25 +0,0 @@
-//rename A#m() to k() -> must rename all m()
-package p;
-abstract class Abstract {
-	public abstract void k();
-	void caller(Abstract abstr, A a, Interface inter, Impl2 impl2) {
-		abstr.k();
-		a.k();
-		inter.k();
-		impl2.k();
-	}
-}
-
-class A extends Abstract {
-	public void k() { // from Abstract
-	}
-}
-
-interface Interface { //independent of Abstract
-	void k();
-}
-
-class Impl2 extends Abstract implements Interface {
-	public void k() { // from Abstract AND from Interface
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test39/in/A.java
deleted file mode 100644
index 9b11821..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test39/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-//can rename A.m to k
-package p;
-class A{
-	void m(){
-	}
-}
-class X{
-	void k(){
-	}
-	class B{
-		void k(){
-		}
-		class C extends A{
-			void f(){
-				m();
-			}
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test39/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test39/out/A.java
deleted file mode 100644
index 3e2b855..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test39/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-//can rename A.m to k
-package p;
-class A{
-	void k(){
-	}
-}
-class X{
-	void k(){
-	}
-	class B{
-		void k(){
-		}
-		class C extends A{
-			void f(){
-				k();
-			}
-		}	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test40/in/A.java
deleted file mode 100644
index 73ac3c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test40/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-public class A {
-	void doit() {
-		class LocalClass {
-			public void method(int i) {} //rename to "method2"
-		}
-	}
-	void method2(int i) {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test40/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test40/out/A.java
deleted file mode 100644
index ca0d87b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/test40/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-public class A {
-	void doit() {
-		class LocalClass {
-			public void method2(int i) {} //rename to "method2"
-		}
-	}
-	void method2(int i) {}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testAnon0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testAnon0/in/A.java
deleted file mode 100644
index 09ece35..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testAnon0/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-public class A {
-	void m(){}
-}
-class B{
-	void f(){
-		A a= new A(){
-			void m(){
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testAnon0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testAnon0/out/A.java
deleted file mode 100644
index 3ebde2a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testAnon0/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//renaming A.m to k
-public class A {
-	void k(){}
-}
-class B{
-	void f(){
-		A a= new A(){
-			void k(){
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail0/in/A.java
deleted file mode 100644
index e6c4867..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail0/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//can't rename native methods
-class A{
- 	native m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail1/in/A.java
deleted file mode 100644
index 630221d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail1/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//toString can't be renamed - it's a special case (it's called implicitly)
- class A{
-	public String toString(){
-		return null;
-	}; 	
- }

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail10/in/A.java
deleted file mode 100644
index f7b9bb4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail10/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k
-class B{
-	void k(){}
-}
-class A extends B{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail11/in/A.java
deleted file mode 100644
index 5f055ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail11/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k
-class B{
-	static void k(){}
-}
-class A extends B{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail12/in/A.java
deleted file mode 100644
index 9c02f0c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail12/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k
-class B{
-	void k(){}
-}
-abstract class A extends B{
-	abstract void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail13/in/A.java
deleted file mode 100644
index 4333b65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail13/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k
-abstract class B{
-	abstract void k();
-}
-class A extends B{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail14/in/A.java
deleted file mode 100644
index e835268..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail14/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k
-class B{
-	void k(int x){}
-}
-class A extends B{
-	void m(int f){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail15/in/A.java
deleted file mode 100644
index c1f7d7b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail15/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename m to k
-class C {
-	void k(){}
-}
-class B extends C{
-}
-class A extends B{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail17/in/A.java
deleted file mode 100644
index 9eb829a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail17/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//renaming A.m would require renaming a native method
-class A {
-	void m(){}
-}
-class B extends A{
-	native void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail18/in/A.java
deleted file mode 100644
index a1da779..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail18/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k - defined in subclass
-class A {
-	void m(){}
-}
-class B extends A{
-	private void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail19/in/A.java
deleted file mode 100644
index 8b3a74e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail19/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k - defined in subclass
-class A {
-	void m(){}
-}
-class B extends A{
-	public void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail2/in/A.java
deleted file mode 100644
index 6ef68c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail2/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m in A  - must do it in B
-class B{
-	void m(){}
-}
-class A extends B{
-	void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail20/in/A.java
deleted file mode 100644
index 90c07d1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail20/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename m to k - defined in subclass
-class A {
-	void m(){
-	}
-}
-class B extends A{
-	public void k(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail21/in/A.java
deleted file mode 100644
index a16713b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail21/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename m to k - defined in subclass
-class A {
-	void m(){
-	}
-}
-class B extends A{
-	static void k(){
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail22/in/A.java
deleted file mode 100644
index 5a15474..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail22/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename m to k - defined in subclass
-class A {
-	void m(){
-	}
-}
-class B extends A{
-	private static void k(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail23/in/A.java
deleted file mode 100644
index 3d07a65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail23/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename A.m to k - defined in superclass
-class B {
-	void k(){
-	}
-}
-class A extends B{
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail24/in/A.java
deleted file mode 100644
index a53fdd9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail24/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename A.m to k - defined in superclass
-class B {
-	static void k(){
-	}
-}
-class A extends B{
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail25/in/A.java
deleted file mode 100644
index 3d07a65..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail25/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename A.m to k - defined in superclass
-class B {
-	void k(){
-	}
-}
-class A extends B{
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail26/in/A.java
deleted file mode 100644
index 6b4353a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail26/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//can't rename A.m to k - duplicate
-class A {
-	void k(){}
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail27/in/A.java
deleted file mode 100644
index aba458a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail27/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//can't rename A.m to k - duplicate
-class A {
-	private void k(){}
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail28/in/A.java
deleted file mode 100644
index bf6ed6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail28/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//can't rename A.m to k - duplicate
-class A {
-	static void k(){}
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail29/in/A.java
deleted file mode 100644
index 3af831e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail29/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename A.m - defined in superclass
-class B{
-	void m(){
-	}
-}
-class A extends B{
-	void m(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail3/in/A.java
deleted file mode 100644
index 102bf12..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail3/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename m in A - must do it in B
-class B{
-	int m(){}
-}
-class C extends B{
-}
-class A extends C{
-	int m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail30/in/A.java
deleted file mode 100644
index d467ff8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail30/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename A.m - declared in superclass
-class B {
-	native void m();
-}
-class A extends B{
-	void m(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail31/in/A.java
deleted file mode 100644
index d756bca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail31/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//can't rename A.m to k
-package p;
-public class A {
-	void m(String m){
-		System.out.println("A");
-	}
-}
-class B extends A{
-	void k(Object m){
-		System.out.println("B");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail32/in/A.java
deleted file mode 100644
index 8fcdbd8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail32/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-//can't rename A.m to k
-package p;
-public class A {
-	void m(Object m){
-		System.out.println("A");
-	}
-}
-class B extends A{
-	void k(String m){
-		System.out.println("B");
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail33/in/A.java
deleted file mode 100644
index c917be1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail33/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-//can't rename A.toString
-package p;
-class A{
-	public java.lang.String toString(){
-		return "fred";
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail34/in/A.java
deleted file mode 100644
index 1c72cc2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail34/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename A.m to k
-class A{
-	void m(String s){
-	}
-}
-class B extends A{
-	void k(java.lang.String s){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail36/in/A.java
deleted file mode 100644
index 98e2eed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail36/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename A.m to k
-class B{
-	static void k(){}	
-}
-class A extends B{
- 	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail37/in/A.java
deleted file mode 100644
index d4c4e40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail37/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename A.m to k
-class A{
-	void m(){};
-}
-class B extends A{
- 	static public void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail38/in/A.java
deleted file mode 100644
index 524f740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail38/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//can't rename A.m to k
-class A{
-	void m(){};
-	class B {
-		void k(){
-			m();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail39/in/A.java
deleted file mode 100644
index 89b748f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail39/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-//can't rename A.m to k
-package p;
-
-class A {
-	void m(){ }
-}
-
-class B {
-	void k(){ }
-	class I extends A {
-		void f(){
-			k(); //binds to A#k() iff that exists
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail4/in/A.java
deleted file mode 100644
index 3fc227b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail4/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-//renaming m in A would require renaming it in I
-class A{
- public void m(){}
-}
-
-class B extends A implements I{
-}
-
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail5/in/A.java
deleted file mode 100644
index ff8d75e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail5/in/A.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-//renaming m in A would require renaming it in I
-class A{
- 	public void m(){}
-}
-
-class B extends A implements I2{
-}
-
-
-interface I {
-	void m();
-}
-
-interface I2 extends I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail6/in/A.java
deleted file mode 100644
index 7d0529c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail6/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//renaming m in A would require renaming it in I
-class A implements I{
-	void m(){}
-}
-
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail7/in/A.java
deleted file mode 100644
index 64b78f3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail7/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//can't rename m to k
-class A{
-	void m(){}
-	void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail8/in/A.java
deleted file mode 100644
index b3f4cac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail8/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//can't rename m to k
-class A{
-	void m(){}
-}
-class B extends A{
-	void k(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail9/in/A.java
deleted file mode 100644
index fe8816e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testFail9/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//can't rename m to k
-class A{
-	int m(int i){}
-}
-class B extends A{
-	
-}
-class C extends B{
-	int k(int i){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testLocal0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testLocal0/in/A.java
deleted file mode 100644
index ed6caf7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testLocal0/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A {
-  void m() {
-  }
-  void baz() {
-  	class B extends A {
-  		void m() {
-  		}
-  		
-  	}
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testLocal0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testLocal0/out/A.java
deleted file mode 100644
index 8dfe74b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameVirtualMethodInClass/testLocal0/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-class A {
-  void k() {
-  }
-  void baz() {
-  	class B extends A {
-  		void k() {
-  		}
-  		
-  	}
-  }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/A.java
deleted file mode 100644
index 10b23af..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;

-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/B.java
deleted file mode 100644
index 8a349d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;

-class B{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/launcher.gif b/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/launcher.gif
deleted file mode 100644
index 961894a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/launcher.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/p1/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/p1/A.java
deleted file mode 100644
index fd8eb8c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ReorgTests/p1/A.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p1;

-class A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail0/in/A.java
deleted file mode 100644
index 3b19265..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail0/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A{}
-class B extends A{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail1/in/A.java
deleted file mode 100644
index 9d71109..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail1/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{}
-class B 
-{
-	void v(){
-	new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail10/in/A.java
deleted file mode 100644
index ecd28f7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail10/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-static int x(){
-	A.x();
-};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail11/in/A.java
deleted file mode 100644
index 4389790..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail11/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-class B{
-	void d(){
-		new A();
-	}
-}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail12/in/A.java
deleted file mode 100644
index c19b365..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail12/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{}
-class B{
-	void f(){
-		new A(){
-			void k(){}
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail13/in/A.java
deleted file mode 100644
index 1a3a47f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail13/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-}
-class B{
-	void x(){
-		class X extends A(){
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail14/in/A.java
deleted file mode 100644
index f13d2a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail14/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	class B{
-	}
-}
-class C{
-	void b(){
-		A.B g;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail15/in/A.java
deleted file mode 100644
index 6fdf183..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail15/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{}
-class B 
-{
-	void v(A a){
-	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail16/in/A.java
deleted file mode 100644
index 56fb44c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail16/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-}
-class B{
-	void f(){
-		Object d= A.class;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail17/in/A.java
deleted file mode 100644
index 15dc856..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail17/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-static int x(){};
-}
-class B{
-	void f(){
-		Object f= (A)new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail18/in/A.java
deleted file mode 100644
index 4092371..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail18/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	class B{}
-}
-class C{
-	void f(){
-		new A().new B();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail19/in/A.java
deleted file mode 100644
index b9f3830..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail19/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface I{}
-class B implements A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail2/in/A.java
deleted file mode 100644
index eb9849f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail2/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-}
-class B{
-	A f(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail20/in/A.java
deleted file mode 100644
index 6f946e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail20/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A extends Exception{
-}
-class B{
- void m() throws A{
- }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail21/in/A.java
deleted file mode 100644
index 75dbf31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail21/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-class A extends Exception{
- void m() throws A{
- }
-	void j(){
- 	try{
- 		m();
- 	}
- 	catch (A a){
- 	}
- }
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail3/in/A.java
deleted file mode 100644
index 85e031d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail3/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-static int x(){};
-}
-class B{
-	void g(){A.x();}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail4/in/A.java
deleted file mode 100644
index 1362380..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail4/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{}
-class B{
- {
-  new A();
- }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail5/in/A.java
deleted file mode 100644
index 780bc11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail5/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{}
-class B{
- static {
-  new A();
- }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail6/in/A.java
deleted file mode 100644
index 47efdd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail6/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-static int x(){};
-}
-class B{
-	class C{
-		void f(){
-		new A();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail7/in/A.java
deleted file mode 100644
index 1c6765e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail7/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-static int x(){};
-}
-class B{
-	class C extends A{
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail8/in/A.java
deleted file mode 100644
index 08b5afd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail8/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		new A();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail9/in/A.java
deleted file mode 100644
index 4b7553a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SafeDeleteType/testFail9/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-static int x;
-	void a(){
-	A.x= A.x;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/.cvsignore
deleted file mode 100644
index f59f514..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-.metadata

-bin
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/.cvsignore
deleted file mode 100644
index 4fdcfd7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin

-.classpath

-*.class
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/.project b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/.project
deleted file mode 100644
index 3605d74..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>SefTests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/A.java
deleted file mode 100644
index 287ef37..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-public class A {

-	public int field;

-	

-	public void foo() {

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/X.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/X.java
deleted file mode 100644
index 2f8058f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/X.java
+++ /dev/null

@@ -1,11 +0,0 @@
-public class X {

-	private String fField;

-

-	protected void setField(String field) {

-		fField = field;

-	}

-

-	protected String getField() {

-		return fField;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/Y.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/Y.java
deleted file mode 100644
index 5a675a8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/Y.java
+++ /dev/null

@@ -1,5 +0,0 @@
-public class Y extends X {

-	void foo() {

-		setField("d");

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestFinal.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestFinal.java
deleted file mode 100644
index 25a186b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestFinal.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package base_in;
-
-public class TestFinal {
-	final int field= 0;
-	
-	public void foo() {
-		int i= field;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPostfixInt.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPostfixInt.java
deleted file mode 100644
index ec1e90b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPostfixInt.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package base_in;

-

-public class TestPostfixInt {

-	int field;

-	

-	public void foo() {

-		field++;

-		field--;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPrefixBoolean.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPrefixBoolean.java
deleted file mode 100644
index a4a6fd0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPrefixBoolean.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package base_in;

-

-public class TestPrefixBoolean {

-	boolean field;

-	

-	public void foo() {

-		boolean b;

-		b= !field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPrefixInt.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPrefixInt.java
deleted file mode 100644
index dadb237..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestPrefixInt.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package base_in;

-

-public class TestPrefixInt {

-	int field;

-	

-	public void foo() {

-		++field;

-		--field;

-		int i;

-		i= +field;

-		i= - field;

-		i= ~field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestThisExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestThisExpression.java
deleted file mode 100644
index 633d90f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestThisExpression.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package base_in;
-
-public class TestThisExpression {
-	int field;
-	
-	public void foo() {
-		this.field= 10;
-		new TestThisExpression().field= 11;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestThisExpressionInner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestThisExpressionInner.java
deleted file mode 100644
index 9e3c546..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestThisExpressionInner.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package base_in;
-
-public class TestThisExpressionInner {
-	int field;
-
-	class Inner {
-		int field;
-		public void foo() {
-			field= 10;
-			TestThisExpressionInner.this.field= 11;
-		}
-	}
-	
-	public void foo() {
-		field= 10;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestTwoFragments.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestTwoFragments.java
deleted file mode 100644
index f5d75cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_in/TestTwoFragments.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package base_in;
-
-public class TestTwoFragments {
-	int anotherField, field;
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestFinal.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestFinal.java
deleted file mode 100644
index 1ee5640..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestFinal.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package base_out;
-
-public class TestFinal {
-	private final int field= 0;
-	
-	public void foo() {
-		int i= getField();
-	}
-
-	int getField() {
-		return field;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPostfixInt.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPostfixInt.java
deleted file mode 100644
index edeae91..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPostfixInt.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package base_out;

-

-public class TestPostfixInt {

-	private int field;

-	

-	public void foo() {

-		setField(getField() + 1);

-		setField(getField() - 1);

-	}

-

-	void setField(int field) {

-		this.field = field;

-	}

-

-	int getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPrefixBoolean.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPrefixBoolean.java
deleted file mode 100644
index df465c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPrefixBoolean.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package base_out;

-

-public class TestPrefixBoolean {

-	private boolean field;

-	

-	public void foo() {

-		boolean b;

-		b= !isField();

-	}

-

-	void setField(boolean field) {

-		this.field = field;

-	}

-

-	boolean isField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPrefixInt.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPrefixInt.java
deleted file mode 100644
index 0423ebf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestPrefixInt.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package base_out;

-

-public class TestPrefixInt {

-	private int field;

-	

-	public void foo() {

-		setField(getField() + 1);

-		setField(getField() - 1);

-		int i;

-		i= +getField();

-		i= - getField();

-		i= ~getField();

-	}

-

-	void setField(int field) {

-		this.field = field;

-	}

-

-	int getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestThisExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestThisExpression.java
deleted file mode 100644
index a8f8679..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestThisExpression.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package base_out;
-
-public class TestThisExpression {
-	private int field;
-	
-	public void foo() {
-		this.setField(10);
-		new TestThisExpression().setField(11);
-	}
-
-	void setField(int field) {
-		this.field = field;
-	}
-
-	int getField() {
-		return field;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestThisExpressionInner.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestThisExpressionInner.java
deleted file mode 100644
index ca4b78a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestThisExpressionInner.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package base_out;
-
-public class TestThisExpressionInner {
-	private int field;
-
-	class Inner {
-		int field;
-		public void foo() {
-			field= 10;
-			TestThisExpressionInner.this.setField(11);
-		}
-	}
-	
-	public void foo() {
-		setField(10);
-	}
-
-	void setField(int field) {
-		this.field = field;
-	}
-
-	int getField() {
-		return field;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestTwoFragments.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestTwoFragments.java
deleted file mode 100644
index 319cc31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/base_out/TestTwoFragments.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package base_out;
-
-public class TestTwoFragments {
-	int anotherField;
-	private int field;
-
-	void setField(int field) {
-		this.field = field;
-	}
-
-	int getField() {
-		return field;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/bb.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/bb.java
deleted file mode 100644
index 9738665..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/bb.java
+++ /dev/null

@@ -1,3 +0,0 @@
-public class bb {

-	public static Object bb;

-}	


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/invalid/TestInvalidOverwrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/invalid/TestInvalidOverwrite.java
deleted file mode 100644
index e8bed86..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/invalid/TestInvalidOverwrite.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalid;
-
-public class TestInvalidOverwrite extends A {
-	public int field;
-}
-
-class A {
-	public Class getField() {
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/invalid/TestPostfixExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/invalid/TestPostfixExpression.java
deleted file mode 100644
index 196adc4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/invalid/TestPostfixExpression.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalid;

-

-public class TestPostfixExpression {

-	int field;

-	

-	public void foo() {

-		int i;

-		i= field++;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestArrayRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestArrayRead.java
deleted file mode 100644
index d34a01b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestArrayRead.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package object_in;

-

-public class TestArrayRead {

-	private Object[] field;

-

-	public TestArrayRead() {

-		field= new Object[0];

-	}

-	public void basicRun() {

-		System.err.println(field.length);

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite.java
deleted file mode 100644
index 6c33a90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package object_in;

-

-public class TestCompoundWrite {

-	String field;

-	

-	public void foo() {

-		field+= "d";

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite2.java
deleted file mode 100644
index a472092..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite2.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package object_in;

-

-public class TestCompoundWrite2 {

-	String field;

-	

-	public void foo() {

-		field+= "d" + "e";

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite3.java
deleted file mode 100644
index 1705e30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestCompoundWrite3.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package object_in;

-

-public class TestCompoundWrite3 {

-	TestCompoundWrite3 a;

-	String field;

-	

-	public void foo() {

-		a.a.field+= "d";

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestFinalField.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestFinalField.java
deleted file mode 100644
index df16e5d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestFinalField.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package object_in;
-
-public class TestFinalField {
-	private final Object field;
-	TestFinalField(Object y) {
-		field = y;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestNestedRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestNestedRead.java
deleted file mode 100644
index 4787ec9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestNestedRead.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package object_in;

-

-public class TestNestedRead {

-	public TestNestedRead field;

-	public int i;

-	

-	public int foo() {

-		return field.field.field.field.i;

-	}

-}

-


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterAsReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterAsReceiver.java
deleted file mode 100644
index 84a383e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterAsReceiver.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package object_in;

-

-public class TestSetterAsReceiver {

-	String field;

-	

-	public void foo() {

-		TestSetterAsReceiver a= null;

-		(a.field= "d").length();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInAssignment.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInAssignment.java
deleted file mode 100644
index 3e49e76..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInAssignment.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package object_in;

-

-public class TestSetterInAssignment {

-	String field;

-	

-	public void foo() {

-		TestSetterInAssignment a= null;

-		String t= null;

-		t= a.field= "d";

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInExpression.java
deleted file mode 100644
index 9d21604..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInExpression.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package object_in;

-

-public class TestSetterInExpression {

-	String field;

-	

-	public void foo() {

-		TestSetterInExpression a= null;

-		if ((a.field= "d") == "d")

-			foo();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInInitialization.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInInitialization.java
deleted file mode 100644
index 26ca7ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSetterInInitialization.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package object_in;

-

-public class TestSetterInInitialization {

-	String field;

-	

-	public void foo() {

-		TestSetterInInitialization a= null;

-		String t= a.field= "d";

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleRead.java
deleted file mode 100644
index 88fd832..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleRead.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package object_in;

-

-public class TestSimpleRead {

-	public String field;

-	

-	public void foo() {

-		String s= field;

-	}

-}

-


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleReadWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleReadWrite.java
deleted file mode 100644
index 32e4d92..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleReadWrite.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package object_in;

-

-public class TestSimpleReadWrite {

-	public String field;

-	

-	public void foo() {

-		field= field + "field";

-	}

-}

-


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleWrite.java
deleted file mode 100644
index cda6ebc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_in/TestSimpleWrite.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package object_in;

-

-public class TestSimpleWrite {

-	public String field;

-	

-	public void foo() {

-		field= "field";

-	}

-}

-


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestArrayRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestArrayRead.java
deleted file mode 100644
index ff5fbaf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestArrayRead.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package object_out;

-

-public class TestArrayRead {

-	private Object[] field;

-

-	public TestArrayRead() {

-		setField(new Object[0]);

-	}

-	private void setField(Object[] field) {

-		this.field = field;

-	}

-	private Object[] getField() {

-		return field;

-	}

-	public void basicRun() {

-		System.err.println(getField().length);

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite.java
deleted file mode 100644
index adea2cc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package object_out;

-

-public class TestCompoundWrite {

-	private String field;

-	

-	public void foo() {

-		setField(getField() + "d");

-	}

-

-	void setField(String field) {

-		this.field = field;

-	}

-

-	String getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite2.java
deleted file mode 100644
index 3510e95..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite2.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package object_out;

-

-public class TestCompoundWrite2 {

-	private String field;

-	

-	public void foo() {

-		setField(getField() + ("d" + "e"));

-	}

-

-	void setField(String field) {

-		this.field = field;

-	}

-

-	String getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite3.java
deleted file mode 100644
index 0386cf4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestCompoundWrite3.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package object_out;

-

-public class TestCompoundWrite3 {

-	TestCompoundWrite3 a;

-	private String field;

-	

-	public void foo() {

-		a.a.setField(a.a.getField() + "d");

-	}

-

-	void setField(String field) {

-		this.field = field;

-	}

-

-	String getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestFinalField.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestFinalField.java
deleted file mode 100644
index ea472dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestFinalField.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package object_out;
-
-public class TestFinalField {
-	private final Object field;
-	TestFinalField(Object y) {
-		field = y;
-	}
-	private Object getField() {
-		return field;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestNestedRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestNestedRead.java
deleted file mode 100644
index 89d89b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestNestedRead.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package object_out;

-

-public class TestNestedRead {

-	private TestNestedRead field;

-	public int i;

-	

-	public int foo() {

-		return getField().getField().getField().getField().i;

-	}

-

-	public void setField(TestNestedRead field) {

-		this.field = field;

-	}

-

-	public TestNestedRead getField() {

-		return field;

-	}

-}

-


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterAsReceiver.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterAsReceiver.java
deleted file mode 100644
index 73af17e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterAsReceiver.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package object_out;

-

-public class TestSetterAsReceiver {

-	private String field;

-	

-	public void foo() {

-		TestSetterAsReceiver a= null;

-		(a.setField("d")).length();

-	}

-

-	String setField(String field) {

-		return this.field = field;

-	}

-

-	String getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInAssignment.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInAssignment.java
deleted file mode 100644
index e2fc0ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInAssignment.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package object_out;

-

-public class TestSetterInAssignment {

-	private String field;

-	

-	public void foo() {

-		TestSetterInAssignment a= null;

-		String t= null;

-		t= a.setField("d");

-	}

-

-	String setField(String field) {

-		return this.field = field;

-	}

-

-	String getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInExpression.java
deleted file mode 100644
index 4928121..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInExpression.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package object_out;

-

-public class TestSetterInExpression {

-	private String field;

-	

-	public void foo() {

-		TestSetterInExpression a= null;

-		if ((a.setField("d")) == "d")

-			foo();

-	}

-

-	String setField(String field) {

-		return this.field = field;

-	}

-

-	String getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInInitialization.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInInitialization.java
deleted file mode 100644
index ad359ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSetterInInitialization.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package object_out;

-

-public class TestSetterInInitialization {

-	private String field;

-	

-	public void foo() {

-		TestSetterInInitialization a= null;

-		String t= a.setField("d");

-	}

-

-	String setField(String field) {

-		return this.field = field;

-	}

-

-	String getField() {

-		return field;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleRead.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleRead.java
deleted file mode 100644
index 43d9fe4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleRead.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package object_out;

-

-public class TestSimpleRead {

-	private String field;

-	

-	public void foo() {

-		String s= getField();

-	}

-

-	public void setField(String field) {

-		this.field = field;

-	}

-

-	public String getField() {

-		return field;

-	}

-}

-


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleReadWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleReadWrite.java
deleted file mode 100644
index 5a6a56a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleReadWrite.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package object_out;

-

-public class TestSimpleReadWrite {

-	private String field;

-	

-	public void foo() {

-		setField(getField() + "field");

-	}

-

-	public void setField(String field) {

-		this.field = field;

-	}

-

-	public String getField() {

-		return field;

-	}

-}

-


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleWrite.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleWrite.java
deleted file mode 100644
index e94c499..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SefWorkSpace/SefTests/object_out/TestSimpleWrite.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package object_out;

-

-public class TestSimpleWrite {

-	private String field;

-	

-	public void foo() {

-		setField("field");

-	}

-

-	public void setField(String field) {

-		this.field = field;

-	}

-

-	public String getField() {

-		return field;

-	}

-}

-


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/.cvsignore
deleted file mode 100644
index 48dd041..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-.metadata
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/.cvsignore
deleted file mode 100644
index 4fdcfd7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin

-.classpath

-*.class
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test010.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test010.java
deleted file mode 100644
index 880e1b6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test010.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test010 {
-	public void /*]*/foo() {
-		foo();
-	}/*[*/
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test011.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test011.java
deleted file mode 100644
index 1adf115..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test011.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test011 {
-	public void foo() {
-		/*]*/foo(/*[*/);
-	}
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test012.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test012.java
deleted file mode 100644
index c89c75f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test012.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test012 {
-	public void foo() {
-		/*]*/f();
-		g(/*[*/);
-	}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test013.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test013.java
deleted file mode 100644
index b92d74d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test013.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test013 {
-	public void foo() {/*[*/
-		f();
-		g();
-	}/*[*/
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test014.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test014.java
deleted file mode 100644
index de28005..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test014.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test014 {
-	public void foo() /*]*/{
-		foo();
-	}/*[*/
-	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test015.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test015.java
deleted file mode 100644
index 32e0e13..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test015.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package invalidSelection;
-
-public class A_test015 {
-	public void foo() /*]*/{
-		f();
-		g();
-	/*]*/}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test020.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test020.java
deleted file mode 100644
index d99ed0f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test020.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package invalidSelection;
-
-public class A_test020 {
-	public void foo(int x) {
-		switch(x) {
-			/*]*/case 10:
-				f();
-				break;/*[*/
-			case 11:
-				g();
-				break;
-			default:
-				f();
-				g();		
-		}
-	}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test021.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test021.java
deleted file mode 100644
index a104c30..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test021.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package invalidSelection;
-
-public class A_test021 {
-	public void foo(int x) {
-		/*]*/switch(x) {
-			case 10:
-				f();
-				break;/*[*/
-			case 11:
-				g();
-				break;
-			default:
-				f();
-				g();		
-		}
-	}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test022.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test022.java
deleted file mode 100644
index e256a20..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test022.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package invalidSelection;
-
-public class A_test022 {
-	public void foo(int x) {
-		switch(x) {
-			/*]*/case 10:
-				f();
-				break;
-			case 11:
-				g();
-				break;
-			default:
-				f();
-				g();		
-		/*]*/}
-	}
-	
-	public void f() {
-	}
-	public void g() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test030.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test030.java
deleted file mode 100644
index 79812d7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test030.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test030 {
-	public void foo(int x) {
-		{/*[*/
-			f();
-		}/*[*/
-	}	
-	public void f() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test031.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test031.java
deleted file mode 100644
index b8fc35b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test031.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test031 {
-	public void foo(int x) {
-		/*]*/{
-			f();
-		/*]*/}
-	}	
-	public void f() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test040.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test040.java
deleted file mode 100644
index f7a17c4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test040.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test040 {
-	public void foo() {
-		for (int i= 0; i /*]*/</*[*/ 10; i++)
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test042.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test042.java
deleted file mode 100644
index 87baa6f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test042.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test042 {
-	public void foo() {
-		for (int i= 0; i < 10; /*]*/i++/*[*/)
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test043.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test043.java
deleted file mode 100644
index 6782f44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test043.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test043 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)/*[*/
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test044.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test044.java
deleted file mode 100644
index eba8d19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test044.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test044 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)
-			foo(/*[*/);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test045.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test045.java
deleted file mode 100644
index 8553338..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test045.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test045 {
-	public void foo() {
-		for /*]*/(int i= 0; i < 10; i++)
-			foo();/*[*/
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test046.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test046.java
deleted file mode 100644
index ad867fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test046.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test046 {
-	public void foo() {
-		for (int i= 10; i < 10; i++)
-			for (int z= 10; z < 10; z++)
-				/*]*/foo();
-		foo()/*[*/;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test047.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test047.java
deleted file mode 100644
index a84e445..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test047.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package invalidSelection;
-
-public class A_test047 {
-	public void foo() {
-		for (int i= 10; i < 10; i++)
-			/*]*/for (int z= 10; z < 10; z++)
-				foo();
-		foo()/*[*/;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test050.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test050.java
deleted file mode 100644
index 1321a16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test050.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test050 {
-	public void foo() {
-		while(1 /*]*/</*[*/ 10)
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test051.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test051.java
deleted file mode 100644
index e91b2d4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test051.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test051 {
-	public void foo() {
-		/*]*/while(1 < 10)/*[*/
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test052.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test052.java
deleted file mode 100644
index b374911..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test052.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package invalidSelection;
-
-public class A_test052 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		while(b())/*[*/
-			while(b())
-				foo();
-		foo()/*[*/;		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test060.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test060.java
deleted file mode 100644
index e1b6bdd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test060.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test060 {
-	public void foo() {
-		do 
-			foo();
-		while(100 /*]*/>/*[*/  10);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test061.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test061.java
deleted file mode 100644
index a1e56d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test061.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test061 {
-	public void foo() {
-		do 
-			/*]*/foo();
-		while(1 < 10);/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test062.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test062.java
deleted file mode 100644
index 4913526..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test062.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package invalidSelection;
-
-public class A_test062 {
-	public void foo() {
-		/*]*/do 
-			foo();/*[*/
-		while(1 < 10);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test063.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test063.java
deleted file mode 100644
index f5105cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test063.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-import invalidSelection.*;
-
-public class A_test063 {
-	public void foo() {
-		do/*[*/
-			foo();
-		/*]*/while(1 < 10);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test070.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test070.java
deleted file mode 100644
index f2b6365..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test070.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package invalidSelection;
-
-public class A_test070 {
-	public int foo() {
-		int i= foo();
-		switch/*[*/ (i) {
-			case 1:
-				foo();
-			case 2:
-				foo();
-				foo();
-			case 3:
-				foo();
-			default:
-				foo();	
-		}/*[*/
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test071.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test071.java
deleted file mode 100644
index 1e29c19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test071.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package invalidSelection;
-
-public class A_test071 {
-	public int foo() {
-		int i= foo();
-		/*]*/switch (i) {
-			case 1:
-				foo();
-			case 2:
-				foo();
-				foo();
-			case 3:
-				foo();
-			default:
-				foo();	
-		/*]*/}
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test072.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test072.java
deleted file mode 100644
index 786a188..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test072.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package invalidSelection;
-
-public class A_test072 {
-	public int foo() {
-		int i= foo();
-		switch (i) {
-			case 1/*]*/:
-				foo()/*[*/;
-			case 2:
-				foo();
-				foo();
-			case 3:
-				foo();
-			default:
-				foo();	
-		}
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test073.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test073.java
deleted file mode 100644
index 921196e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test073.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package invalidSelection;
-
-public class A_test073 {
-	public int foo() {
-		int i= foo();
-		switch (i) {
-			case 1:/*[*/
-				foo();
-			case/*[*/2:
-				foo();
-				foo();
-			case 3:
-				foo();
-			default:
-				foo();	
-		}
-		return i;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test081.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test081.java
deleted file mode 100644
index 088e444..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test081.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test081 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();
-		else
-			/*]*/foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test082.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test082.java
deleted file mode 100644
index 8e1e3bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test082.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test082 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();/*[*/
-		else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test083.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test083.java
deleted file mode 100644
index 05af41d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test083.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test083 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();
-		/*]*/else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test084.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test084.java
deleted file mode 100644
index 42cf868..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test084.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test084 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();
-		else/*[*/
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test085.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test085.java
deleted file mode 100644
index 7969c16..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test085.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test085 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)
-			foo();
-		/*]*/else
-			foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test100.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test100.java
deleted file mode 100644
index 8113e0b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test100.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test100 {
-	public void foo() {
-		try /*]*/{
-			foo();
-		}/*[*/ catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test101.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test101.java
deleted file mode 100644
index 26e171f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test101.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test101 {
-	public void foo() {
-		try /*]*/{
-			foo();
-		/*]*/} catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test102.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test102.java
deleted file mode 100644
index 39fd3ff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test102.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test102 {
-	public void foo() {
-		try {/*[*/
-			foo();
-		}/*[*/ catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test103.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test103.java
deleted file mode 100644
index ffe0310..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test103.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test103 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) /*]*/{
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test104.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test104.java
deleted file mode 100644
index 6bb367b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test104.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test104 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {/*[*/
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test105.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test105.java
deleted file mode 100644
index d8f6c1f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test105.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test105 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) /*]*/{
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test106.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test106.java
deleted file mode 100644
index d5c166f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test106.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test106 {
-	public void foo() {
-		try {
-			foo();
-		} finally /*]*/{
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test107.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test107.java
deleted file mode 100644
index 4d8f1bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test107.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test107 {
-	public void foo() {
-		try {
-			foo();
-		} finally {/*[*/
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test108.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test108.java
deleted file mode 100644
index 4c79c88..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test108.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test108 {
-	public void foo() {
-		try {
-			foo();
-		} finally /*]*/{
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test109.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test109.java
deleted file mode 100644
index fa68c05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test109.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test109 {
-	public void foo() {
-		/*]*/try {
-			foo();
-		} finally {
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test110.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test110.java
deleted file mode 100644
index 6ecade3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test110.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test110 {
-	public void foo() {
-		try/*[*/{
-			foo();
-		} finally {
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test111.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test111.java
deleted file mode 100644
index c9903ff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test111.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test111 {
-	public void foo() {
-		try {
-			foo();
-		} catch (/*]*/Exception e/*[*/) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test112.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test112.java
deleted file mode 100644
index 689f857..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test112.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test112 {
-	public void foo() {
-		try {
-			foo();
-		} /*]*/catch (Exception e) {
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test113.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test113.java
deleted file mode 100644
index 2c2db9b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test113.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test113 {
-	public void foo() {
-		/*]*/try {
-			foo();
-		}/*[*/ catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test114.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test114.java
deleted file mode 100644
index 1cfce05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test114.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test114 {
-	public void foo() {
-		try {
-			foo();
-		} /*]*/finally {
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test115.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test115.java
deleted file mode 100644
index 37a6af2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test115.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test115 {
-	public void foo() {
-		try {
-			foo();
-		} catch /*]*/(Exception e)/*[*/ {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test120.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test120.java
deleted file mode 100644
index a5fad98..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test120.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test120 {
-	public boolean foo() {
-		/*]*/return/*[*/ false;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test131.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test131.java
deleted file mode 100644
index 81471a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test131.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package invalidSelection;

-

-public class A_test131 {

-	public void foo() {

-		

-		/*]*/class Inner {

-		}

-		foo();/*[*/

-		

-		Inner inner= new Inner();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test150.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test150.java
deleted file mode 100644
index 942d696..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test150.java
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test151.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test151.java
deleted file mode 100644
index aa41b19..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test151.java
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test152.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test152.java
deleted file mode 100644
index 91d26c6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test152.java
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test153.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test153.java
deleted file mode 100644
index eedcc24..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test153.java
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test160.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test160.java
deleted file mode 100644
index 965967c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test160.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package invalidSelection;
-
-public class A_test160 {
-	/*]*/public static class Inner {
-	}/*[*/
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test161.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test161.java
deleted file mode 100644
index ee94548..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test161.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package invalidSelection;
-
-public class A_test161 {
-	public void foo() {
-		class /*]*/Inner {
-		}/*]*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test170.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test170.java
deleted file mode 100644
index bda6db9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test170.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test170 {
-	public void foo() {
-		String tab[] = /*]*/{"hello", "world" } /*[*/;       
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test171.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test171.java
deleted file mode 100644
index cac9b44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test171.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test171 {
-	public void foo() {
-		String /*]*/str = "ggg"/*[*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test172.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test172.java
deleted file mode 100644
index eca6057..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test172.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package invalidSelection;
-
-public class A_test172 {
-	public void foo() {
-		/*]*/int i= 10/*[*/, j= 20;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test173.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test173.java
deleted file mode 100644
index e9364fc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/invalidSelection/A_test173.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package invalidSelection;
-
-public class A_test173 {
-	public void foo() {
-		/*]*/int i= 10, j= 20;/*[*/
-		g(j);
-		g(i);
-	}
-	public void g(int i) {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test1.java
deleted file mode 100644
index c12b372..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package selection;
-
-public class A_test1 {
-	public void foo() {
-		/*[*/foo()/*]*/;
-	}
-} 
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test2.java
deleted file mode 100644
index 06787fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package selection;
-
-public class A_test2 {
-	public void foo() {
-		/*[*/foo()/*[*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test3.java
deleted file mode 100644
index b8e0567..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test3.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package selection;
-
-public class A_test3 {
-	public void foo() {
-		/*]*/foo()/*]*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test4.java
deleted file mode 100644
index 5f984e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/selection/A_test4.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package selection;
-
-public class A_test4 {
-	public void foo() {
-		/*]*/foo()/*[*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test041_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test041_.java
deleted file mode 100644
index cf01258..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test041_.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test041_ {
-	public void foo() {
-		for (/*]*/int i= 0/*[*/; i < 10; i++)
-			foo();
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test048_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test048_.java
deleted file mode 100644
index c5b966c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test048_.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package validSelection;
-
-import java.util.Enumeration;
-
-public class A_test048_ {
-	public boolean flag;
-	public void foo() {
-		for (/*]*/Enumeration e= tests()/*[*/; e.hasMoreElements(); ) {
-			if (flag)
-				break;
-		}
-	}	
-	public Enumeration tests() {
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test080_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test080_.java
deleted file mode 100644
index 3e0390b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test080_.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test080_ {
-	public boolean fBoolean;
-	public void foo() {
-		if (/*]*/fBoolean/*[*/)
-			foo();
-		else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test090_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test090_.java
deleted file mode 100644
index 57f8a41..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test090_.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test090_ {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			/*]*/break/*[*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test091_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test091_.java
deleted file mode 100644
index b79bc12..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test091_.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test091_ {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			/*]*/continue/*[*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test092_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test092_.java
deleted file mode 100644
index feddadd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test092_.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test092_ {
-	public void foo() {
-		while (true)
-			/*]*/break/*[*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test093_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test093_.java
deleted file mode 100644
index 62a2331..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test093_.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test093_ {
-	public void foo() {
-		while (true)
-			/*]*/continue/*[*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test094_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test094_.java
deleted file mode 100644
index 922cb1f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test094_.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test094_ {
-	public void foo() {
-		do
-			/*]*/break/*[*/;
-		while(true);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test095_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test095_.java
deleted file mode 100644
index fe52406..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test095_.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test095_ {
-	public void foo() {
-		do
-			/*]*/continue/*[*/;
-		while(true);
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test096_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test096_.java
deleted file mode 100644
index 2b3bce0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test096_.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test096_ {
-	public void foo() {
-		int i= 10;
-		switch(i) {
-			case 10:
-				foo();
-				/*]*/break/*[*/;
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test121_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test121_.java
deleted file mode 100644
index 3461ad9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test121_.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test121_ {
-	public void foo() {

-		int x= 1;

-		int y= 2;

-		

-		/*]*/x= y + x;

-		y= x + y;/*[*/

-		

-		x++;

-		y++;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test122_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test122_.java
deleted file mode 100644
index 20e6fba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test122_.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test122_ {
-	public void foo() {

-		int x= 1;

-

-		/*]*/x= x + 2;

-		int y= 10;/*[*/

-		

-		x+= y + 20;

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test130_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test130_.java
deleted file mode 100644
index b6c4fcf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test130_.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;

-

-public class A_test130_ {

-	public void foo() {

-		class Inner {

-		}

-		

-		/*]*/Inner inner= new Inner();

-		foo();/*[*/

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test140_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test140_.java
deleted file mode 100644
index 988f958..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test140_.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package validSelection;

-

-public class A_test140_ {

-	public boolean flag;

-	public int foo() {

-		int i= 10;

-		/*]*/switch(i) {

-			case 1:

-				if (flag)

-					break;

-				foo();	

-			case 2:

-				return 10;

-			default:

-				throw new NullPointerException();

-		}/*[*/

-			

-		return 10;	

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test141_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test141_.java
deleted file mode 100644
index 9a3f1c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test141_.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;

-

-public class A_test141_ {

-	private boolean flag;

-	public int foo() {

-		/*]*/while(flag)

-			return 20;/*[*/

-		return 10;	

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test142_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test142_.java
deleted file mode 100644
index a7b870f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test142_.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;

-

-public class A_test142_ {

-	private boolean flag;

-	public int foo() {

-		int i= 10;

-		/*]*/if (flag) {

-			i++;

-			return i;

-		}/*[*/

-		int y= i + 10;

-		return y;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test143_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test143_.java
deleted file mode 100644
index a0e6c9c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test143_.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;

-

-public class A_test143_ {

-	public boolean foo() {

-		/*]*/try {

-			return true;

-		} catch (Exception e) {

-		}/*[*/

-		return false;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test144_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test144_.java
deleted file mode 100644
index 1b7c327..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test144_.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;

-

-public class A_test144_ {

-	public boolean foo() {

-		/*]*/try {

-		} catch (Exception e) {

-			return true;

-		}/*[*/

-		return false;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test145_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test145_.java
deleted file mode 100644
index 2dbb584..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test145_.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package validSelection;

-

-public class A_test145_ {

-	boolean flag;

-	public boolean foo() {

-		/*]*/do {

-			if (flag)

-				break;

-			return false;

-		} while (flag);/*[*/

-		return true;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test146_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test146_.java
deleted file mode 100644
index b471104..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test146_.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package validSelection;

-

-public class A_test146_ {

-	boolean flag;

-	public boolean foo() {

-		while (flag) {

-			/*]*/for (int i= 0; i < 10; i++) {

-				if (flag)

-					break;

-			}

-			if (flag)

-				break;

-			return false;/*[*/

-		}

-		return true;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test147_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test147_.java
deleted file mode 100644
index 5583b6d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test147_.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package validSelection;

-

-public class A_test147_ {

-	boolean flag;

-	public boolean foo() {

-		/*]*/target: {

-			for (int i= 0; i < 10; i++) {

-				if (flag)

-					break;

-				else

-					break target;

-			}

-			return false;

-		}/*[*/

-		return true;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test148_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test148_.java
deleted file mode 100644
index 12f40f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test148_.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package validSelection;

-

-public class A_test148_ {

-	boolean flag;

-	public boolean foo() {

-		int i= 0;

-		/*]*/switch (i) {

-			case 1:

-				return false;

-			case 2:

-				return true;

-		}/*[*/

-		return false;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test149_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test149_.java
deleted file mode 100644
index 65fe830..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test149_.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package validSelection;

-

-public class A_test149_ {

-	boolean flag;

-	public boolean foo() {

-		int i= 0;

-		/*]*/switch (i) {

-			case 1:

-				break;

-			case 2:

-				return true;

-			default:

-				return false;

-		}/*[*/

-		return false;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test180_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test180_.java
deleted file mode 100644
index 5bdc94c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test180_.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package validSelection;
-
-public class A_test180_ {
-	public A_test180_() {
-		/*]*/this(10);
-		foo();/*[*/
-	}
-	public A_test180_(int i) {
-		super();
-	}
-	public void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test181_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test181_.java
deleted file mode 100644
index 6fb4e50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test181_.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test181_ {
-	public A_test181_() {
-		/*]*/super();
-		foo();/*[*/
-	}
-	public void foo() {
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test190_.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test190_.java
deleted file mode 100644
index 8c098d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test190_.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package validSelection;

-

-public class A_test190_ {

-	public int foo() {

-		int i= 10;

-		/*]*/switch(i) {

-			case 1:

-				foo();

-				break;

-			case 2:

-				foo();

-			default:

-				return 10;

-		}/*[*/

-		

-		return 20;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test200.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test200.java
deleted file mode 100644
index 8d570be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test200.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package validSelection;
-
-public class A_test200 {
-	public void foo() {
-		/*]*/foo();/*[*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test201.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test201.java
deleted file mode 100644
index 62c304e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test201.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package validSelection;
-
-public class A_test201 {
-	public void foo() {/*[*/
-		foo();
-	/*]*/} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test202.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test202.java
deleted file mode 100644
index d8733ef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test202.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test202 {
-	public void foo() {
-		/*]*/foo();
-		foo();/*[*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test203.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test203.java
deleted file mode 100644
index 2edb220..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test203.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test203 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)
-			foo();
-		foo();/*[*/
-	} 
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test230.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test230.java
deleted file mode 100644
index 3035340..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test230.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test230 {
-	public void foo() {
-		{/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test231.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test231.java
deleted file mode 100644
index 3d61594..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test231.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test231 {
-	public void foo() {
-		{
-			/*]*/foo()/*[*/;
-		}
-		{
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test232.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test232.java
deleted file mode 100644
index a3b5456..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test232.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test232 {
-	public void foo() {
-		/*]*/{
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test233.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test233.java
deleted file mode 100644
index 75b3868..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test233.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test233 {
-	public void foo() {
-		{
-			foo();
-		}
-		{
-			/*]*/foo()/*[*/;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test234.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test234.java
deleted file mode 100644
index 265b903..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test234.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test234 {
-	public void foo() {
-		{
-			foo();
-		}
-		{/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test235.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test235.java
deleted file mode 100644
index 876b188..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test235.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test235 {
-	public void foo() {
-		{/*[*/
-			foo();
-		/*]*/}
-		{
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test240.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test240.java
deleted file mode 100644
index 00c0091..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test240.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test240 {
-	public void foo() {/*[*/
-		for (int i= 0; i < 10; i++)
-			foo();
-	/*]*/}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test241.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test241.java
deleted file mode 100644
index b3bb0e2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test241.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test241 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)
-			foo();/*[*/
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test242.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test242.java
deleted file mode 100644
index 29518a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test242.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test242 {
-	public void foo() {
-		/*]*/for (int i= 0; i < 10; i++)
-			foo()/*]*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test243.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test243.java
deleted file mode 100644
index 082e61c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test243.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test243 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)/*[*/
-			foo()/*]*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test244.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test244.java
deleted file mode 100644
index 897ade3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test244.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test244 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			/*]*/foo()/*]*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test245.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test245.java
deleted file mode 100644
index af752d2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test245.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test245 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)
-			/*]*/foo();/*[*/
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test246.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test246.java
deleted file mode 100644
index 40a1cd1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test246.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test246 {
-	public void foo() {
-		for (int i= 0; i < 10; i++) {
-			/*]*/foo();/*[*/
-		}
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test247.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test247.java
deleted file mode 100644
index 4d5b6aa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test247.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test247 {
-	public void foo() {
-		for (int i= 10; i < 10; i++)/*[*/
-			for (int z= 10; z < 10; z++)
-				foo();
-		/*]*/foo();	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test248.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test248.java
deleted file mode 100644
index 5509aa2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test248.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test248 {
-	public void foo() {
-		for (int i= 0; i < 10; i++)

-			foo();

-			

-		/*]*/foo();/*[*/

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test249.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test249.java
deleted file mode 100644
index 9315dc8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test249.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test249 {
-	public void foo() {
-		/*]*/foo();/*[*/

-		

-		for (int i= 0; i < 10; i++)

-			foo();	

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test250.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test250.java
deleted file mode 100644
index 18755cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test250.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test250 {
-	public void foo() {
-		while(1 < 10)/*[*/
-			foo();
-	/*]*/}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test251.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test251.java
deleted file mode 100644
index c82df32..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test251.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package validSelection;
-
-public class A_test251 {
-	public void foo() {
-		/*]*/while(1 < 10)
-			foo()/*]*/;
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test252.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test252.java
deleted file mode 100644
index 7358876..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test252.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test252 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		while(b())
-			while(b())/*[*/
-				foo();
-		/*]*/foo();		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test253.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test253.java
deleted file mode 100644
index dffc377..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test253.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test253 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		while(b())
-			/*]*/while(b())
-				foo();
-		/*]*/foo();		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test254.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test254.java
deleted file mode 100644
index 5eb1cc7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test254.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test254 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		while(b())

-			foo();

-			
-		/*]*/foo();/*[*/		
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test255.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test255.java
deleted file mode 100644
index af3ef80..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test255.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test255 {
-	public boolean b() {
-		return true;
-	}
-	
-	public void foo() {
-		/*]*/foo();/*[*/

-		

-		while(b())

-			foo();	
-	}	
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test260.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test260.java
deleted file mode 100644
index 31a00b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test260.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test260 {
-	public void foo() {
-		/*]*/do
-			foo();
-		while(1 < 10);/*[*/	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test261.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test261.java
deleted file mode 100644
index 1ce96b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test261.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package validSelection;
-
-public class A_test261 {
-	public void foo() {
-		do /*[*/
-			foo();
-		/*]*/while(1 < 10);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test262.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test262.java
deleted file mode 100644
index d6942a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test262.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test262 {

-	public boolean fBoolean;
-	public void foo() {
-		do 
-			foo();
-		while(fBoolean);

-		

-		/*]*/foo()/*[*/;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test263.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test263.java
deleted file mode 100644
index b628328..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test263.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test263 {

-	public boolean fBoolean;
-	public void foo() {
-		/*]*/foo()/*[*/;

-		

-		do 
-			foo();
-		while(fBoolean);		

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test270.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test270.java
deleted file mode 100644
index f9446bb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test270.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test270 {
-	public void foo() {
-		/*]*/switch(1) {
-			case 1:
-				foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test271.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test271.java
deleted file mode 100644
index d99c995..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test271.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test271 {
-	public void foo() {
-		switch(1) {
-			case 1:/*[*/
-				foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test272.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test272.java
deleted file mode 100644
index 0648fc5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test272.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test272 {
-	public void foo() {
-		switch(1) {
-			case 1:
-				foo();
-				/*]*/foo()/*[*/;
-				foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test273.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test273.java
deleted file mode 100644
index 191695b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test273.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test273 {
-	public void foo() {
-		switch(1) {
-			case 1:/*[*/
-				foo();
-			/*]*/case 2:
-				foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test274.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test274.java
deleted file mode 100644
index 93749cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test274.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test274 {
-	public void foo() {
-		switch(1) {
-			case 1:
-				foo();
-			case 2:
-				foo();
-		}

-		

-		/*]*/foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test275.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test275.java
deleted file mode 100644
index 3e5c359..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test275.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test275 {
-	public void foo() {
-		/*]*/foo();/*[*/

-		

-		switch(1) {
-			case 1:
-				foo();
-			case 2:
-				foo();
-		}		

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test280.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test280.java
deleted file mode 100644
index 33d1996..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test280.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test280 {
-	public boolean fBoolean;
-	public void foo() {
-		/*]*/if (fBoolean)
-			foo();
-		else
-			foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test281.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test281.java
deleted file mode 100644
index 7048e9e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test281.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test281 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)
-			/*]*/foo()/*[*/;
-		else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test282.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test282.java
deleted file mode 100644
index 4bd8856..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test282.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test282 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean)/*[*/
-			foo();
-		/*]*/else
-			foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test283.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test283.java
deleted file mode 100644
index 262306e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test283.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test283 {
-	public boolean fBoolean;
-	public void foo() {
-		if (fBoolean) {
-		} else {
-			/*]*/foo();/*[*/

-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test284.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test284.java
deleted file mode 100644
index ac651a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test284.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test284 {
-	public boolean fBoolean;
-	public void foo() {

-		if (fBoolean)

-			foo();

-			
-		if (fBoolean) {
-		} else {
-			/*]*/foo();/*[*/

-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test285.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test285.java
deleted file mode 100644
index 43fa03e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test285.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package validSelection;
-
-public class A_test285 {
-	public boolean fBoolean;
-	public void foo() {

-		if (fBoolean)

-			/*[*/foo();/*]*/

-			
-		if (fBoolean) {
-		} else {
-			foo();

-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test286.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test286.java
deleted file mode 100644
index 8de156e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test286.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test286 {
-	public boolean fBoolean;
-	public void foo() {

-		/*[*/foo();/*]*/	

-		if (fBoolean)

-			foo();

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test287.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test287.java
deleted file mode 100644
index bc5a019..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test287.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package validSelection;
-
-public class A_test287 {
-	public boolean fBoolean;
-	public void foo() {

-		if (fBoolean)

-			foo();

-		/*[*/foo();/*]*/	

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test300.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test300.java
deleted file mode 100644
index e95eda5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test300.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test300 {
-	public void foo() {
-		try {/*[*/
-			foo();
-		/*]*/} catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test301.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test301.java
deleted file mode 100644
index 84b93a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test301.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test301 {
-	public void foo() {
-		try {
-			/*]*/foo()/*[*/;
-		} catch (Exception e) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test302.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test302.java
deleted file mode 100644
index 5e0f55f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test302.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test302 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test303.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test303.java
deleted file mode 100644
index 003b7b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test303.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test303 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			/*]*/foo()/*[*/;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test304.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test304.java
deleted file mode 100644
index 23cc5fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test304.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package validSelection;
-
-public class A_test304 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		} catch (Throwable t) {
-			/*]*/foo();/*[*/
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test305.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test305.java
deleted file mode 100644
index aa531b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test305.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package validSelection;
-
-public class A_test305 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			/*]*/foo();/*[*/
-		} catch (Throwable t) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test306.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test306.java
deleted file mode 100644
index 45338ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test306.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package validSelection;
-
-public class A_test306 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		} catch (Error e) {
-			/*]*/foo();/*[*/
-		} catch (Throwable t) {
-			foo();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test307.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test307.java
deleted file mode 100644
index 141a152..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test307.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test307 {
-	public void foo() {
-		try {
-			foo();
-		} finally {/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test308.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test308.java
deleted file mode 100644
index 5e598b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test308.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package validSelection;
-
-public class A_test308 {
-	public void foo() {
-		try {
-			foo();
-		} finally {/*[*/
-			foo();
-		/*]*/}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test309.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test309.java
deleted file mode 100644
index f0dc5b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test309.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package validSelection;
-
-public class A_test309 {
-	public void foo() {
-		/*]*/try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		} finally {
-			foo();
-		}/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test310.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test310.java
deleted file mode 100644
index cf121db..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test310.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test310 {
-	public void foo() {
-		try {
-			foo();
-		} catch (Exception e) {
-			foo();
-		}

-		/*]*/foo();/*[*/
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test311.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test311.java
deleted file mode 100644
index 2a0c75c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test311.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package validSelection;
-
-public class A_test311 {
-	public void foo() {
-		/*]*/foo();/*[*/

-		try {

-			foo();

-		} catch (Exception e) {

-			foo();

-		}

-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test350.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test350.java
deleted file mode 100644
index 69940c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test350.java
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test351.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test351.java
deleted file mode 100644
index 758accd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test351.java
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test352.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test352.java
deleted file mode 100644
index acfd893..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test352.java
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test353.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test353.java
deleted file mode 100644
index f92ec2f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SelectionAnalyzerWorkSpace/SelectionAnalyzerTests/validSelection/A_test353.java
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test0.java
deleted file mode 100644
index 83c7430..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test0.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	void m(){

-		m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test0_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test0_out.txt
deleted file mode 100644
index 8bd85dc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test0_out.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-{

-		m();

-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test1.java
deleted file mode 100644
index 69f22e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test1.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + /*[*/1/*]*/;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test10.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test10.java
deleted file mode 100644
index 5e6cf5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test10.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-		if (i < 0){

-			i += i;

-			return;

-		} else

-		 m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test10_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test10_out.txt
deleted file mode 100644
index 1a5a117..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test10_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-1 + 1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test11.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test11.java
deleted file mode 100644
index 5e6cf5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test11.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-		if (i < 0){

-			i += i;

-			return;

-		} else

-		 m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test11_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test11_out.txt
deleted file mode 100644
index 1a5a117..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test11_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-1 + 1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test12.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test12.java
deleted file mode 100644
index 5e6cf5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test12.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-		if (i < 0){

-			i += i;

-			return;

-		} else

-		 m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test12_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test12_out.txt
deleted file mode 100644
index 1a5a117..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test12_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-1 + 1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test13.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test13.java
deleted file mode 100644
index 5e6cf5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test13.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-		if (i < 0){

-			i += i;

-			return;

-		} else

-		 m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test13_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test13_out.txt
deleted file mode 100644
index a6d0770..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test13_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-i= 1 + 1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test14.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test14.java
deleted file mode 100644
index 5e6cf5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test14.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-		if (i < 0){

-			i += i;

-			return;

-		} else

-		 m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test14_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test14_out.txt
deleted file mode 100644
index a6d0770..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test14_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-i= 1 + 1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test15.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test15.java
deleted file mode 100644
index 519a5d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test15.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class A{

-	void m(int t){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test15_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test15_out.txt
deleted file mode 100644
index 523b42f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test15_out.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-void m(int t){

-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test16.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test16.java
deleted file mode 100644
index 81a7a66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test16.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class A{       

-	void m(){m();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test16_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test16_out.txt
deleted file mode 100644
index 71df1f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test16_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-m()
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test17.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test17.java
deleted file mode 100644
index c81256b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test17.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-class A{    

-	/**

-	 * method comment

-	 */   

-	void m(){

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test17_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test17_out.txt
deleted file mode 100644
index e97da26..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test17_out.txt
+++ /dev/null

@@ -1,7 +0,0 @@
-class A{    

-	/**

-	 * method comment

-	 */   

-	void m(){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test18.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test18.java
deleted file mode 100644
index 7ebd961..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test18.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class A{    

-	void m(){

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test18_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test18_out.txt
deleted file mode 100644
index 9705b03..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test18_out.txt
+++ /dev/null

@@ -1,4 +0,0 @@
-class A{    

-	void m(){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test19.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test19.java
deleted file mode 100644
index 5e6cf5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test19.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-		if (i < 0){

-			i += i;

-			return;

-		} else

-		 m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test19_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test19_out.txt
deleted file mode 100644
index 699755f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test19_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-return;
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test1_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test1_out.txt
deleted file mode 100644
index e6c6dc0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test1_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-1 + /*[*/1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test2.java
deleted file mode 100644
index 3044647..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test2.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test20.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test20.java
deleted file mode 100644
index 3044647..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test20.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test20_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test20_out.txt
deleted file mode 100644
index 1a5a117..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test20_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-1 + 1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test21.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test21.java
deleted file mode 100644
index ae91c6e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test21.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-interface A{

-	public void foo(int arg);

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test21_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test21_out.txt
deleted file mode 100644
index d7895bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test21_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-public void foo(int arg);
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test22.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test22.java
deleted file mode 100644
index ae91c6e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test22.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;

-interface A{

-	public void foo(int arg);

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test22_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test22_out.txt
deleted file mode 100644
index d7895bc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test22_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-public void foo(int arg);
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test23.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test23.java
deleted file mode 100644
index 52a8c3c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test23.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;

-class A{

-	void m(){

-		try{

-		} catch (Exception e){

-			m();			

-		}

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test23_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test23_out.txt
deleted file mode 100644
index d5ae539..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test23_out.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-catch (Exception e){

-			m();			

-		}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test24.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test24.java
deleted file mode 100644
index ae74271..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test24.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void f(){
-		f();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test24_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test24_out.txt
deleted file mode 100644
index 8741679..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test24_out.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-void f(){
-		f();
-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test25.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test25.java
deleted file mode 100644
index bcf2e69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test25.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	void m0(){
-	}
-	void m(){
-	}
-	void m1(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test25_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test25_out.txt
deleted file mode 100644
index 1a53499..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test25_out.txt
+++ /dev/null

@@ -1,4 +0,0 @@
-void m(){
-	}
-	void m1(){
-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test26.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test26.java
deleted file mode 100644
index bcf2e69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test26.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-class A{
-	void m0(){
-	}
-	void m(){
-	}
-	void m1(){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test26_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test26_out.txt
deleted file mode 100644
index f831328..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test26_out.txt
+++ /dev/null

@@ -1,4 +0,0 @@
-void m0(){
-	}
-	void m(){
-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test27.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test27.java
deleted file mode 100644
index d2035f3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test27.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B{}
-class C{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test27_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test27_out.txt
deleted file mode 100644
index c9ffcde..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test27_out.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-class B{}
-class C{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test28.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test28.java
deleted file mode 100644
index d2035f3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test28.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-}
-class B{}
-class C{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test28_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test28_out.txt
deleted file mode 100644
index d6bbd7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test28_out.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-class A{
-}
-class B{}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test29.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test29.java
deleted file mode 100644
index 779530a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test29.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A {
-	void f(){
-		if (true)
-			f();
-		f();	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test29_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test29_out.txt
deleted file mode 100644
index 2f75758..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test29_out.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-if (true)
-			f();
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test2_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test2_out.txt
deleted file mode 100644
index a6d0770..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test2_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-i= 1 + 1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test3.java
deleted file mode 100644
index 3044647..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test3.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test30.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test30.java
deleted file mode 100644
index 0a2b8f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test30.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	void m(int t){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test30_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test30_out.txt
deleted file mode 100644
index 7d6914b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test30_out.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-void m(int t){
-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test31.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test31.java
deleted file mode 100644
index 2249ad9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test31.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-class A{
-	void mm(int t){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test31_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test31_out.txt
deleted file mode 100644
index 3595034..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test31_out.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-void mm(int t){
-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test32.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test32.java
deleted file mode 100644
index 80a8c1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test32.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class AA{
-	void mm(int t){
-		AA a= ( AA )this;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test32_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test32_out.txt
deleted file mode 100644
index 6c376d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test32_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-AA
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test33.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test33.java
deleted file mode 100644
index bb8528c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test33.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class AA{
-	void mm(int t){
-		String xx= "";
-		String yy= ( xx );
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test33_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test33_out.txt
deleted file mode 100644
index 59b66ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test33_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-xx
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test34.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test34.java
deleted file mode 100644
index 2167c9f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test34.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class AA{
-	void mm(int t){
-		if (true){
-			break;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test34_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test34_out.txt
deleted file mode 100644
index 8cb76cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test34_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-break;
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test35.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test35.java
deleted file mode 100644
index fcf46a3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test35.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class AA{
-	void mm(int t){
-		if (true){
-			continue;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test35_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test35_out.txt
deleted file mode 100644
index 45127c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test35_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-continue;
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test36.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test36.java
deleted file mode 100644
index c8ac58c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test36.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	void f1(int i){
-		switch(i){
-			case 1:
-			 break;
-			default:
-	    	 break;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test36_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test36_out.txt
deleted file mode 100644
index 1d69da7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test36_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-case 1:
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test37.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test37.java
deleted file mode 100644
index c8ac58c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test37.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A {
-	void f1(int i){
-		switch(i){
-			case 1:
-			 break;
-			default:
-	    	 break;
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test37_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test37_out.txt
deleted file mode 100644
index 9aff9e3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test37_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-default:
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test38.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test38.java
deleted file mode 100644
index 7aedaf6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test38.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A {
-	void f2(){}
-	/***/
-	void f1(){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test38_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test38_out.txt
deleted file mode 100644
index 48b14b8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test38_out.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-void f2(){}
-	/***/
-	void f1(){}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test39.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test39.java
deleted file mode 100644
index 28ed338..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test39.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-		Inner(){
-			super();
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test39_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test39_out.txt
deleted file mode 100644
index 1cadcee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test39_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-super();
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test3_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test3_out.txt
deleted file mode 100644
index 2017592..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test3_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-int i= 1 + 1;
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test4.java
deleted file mode 100644
index 6b73dac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test4.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	/*[*/void m(){

-		int i= 1 + 1;

-	}/*]*/

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test40.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test40.java
deleted file mode 100644
index 6bcc76f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test40.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A{
-	class Inner{
-		Inner(int t){}
-		Inner(){
-			this(3);
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test40_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test40_out.txt
deleted file mode 100644
index b0bfbda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test40_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-this(3);
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test4_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test4_out.txt
deleted file mode 100644
index 1c454e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test4_out.txt
+++ /dev/null

@@ -1,5 +0,0 @@
-class A{

-	/*[*/void m(){

-		int i= 1 + 1;

-	}/*]*/

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test5.java
deleted file mode 100644
index 0ee5d2a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test5.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-class A{

-	void m(){

-		if (true){

-			/*[*/int i= 1 + 1;/*]*/

-		}	

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test5_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test5_out.txt
deleted file mode 100644
index e6ba032..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test5_out.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-{

-			/*[*/int i= 1 + 1;/*]*/

-		}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test6.java
deleted file mode 100644
index a4424c7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test6.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;

-class A{

-	void m(){

-		if (true)/*[*/{

-			int i= 1 + 1;

-		}/*]*/

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test6_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test6_out.txt
deleted file mode 100644
index d14356b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test6_out.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-if (true)/*[*/{

-			int i= 1 + 1;

-		}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test7.java
deleted file mode 100644
index ac09c77..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test7.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class A{

-	void m(){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test7_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test7_out.txt
deleted file mode 100644
index 1c2aa1f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test7_out.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-void m(){

-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test8.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test8.java
deleted file mode 100644
index 81a7a66..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test8.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class A{       

-	void m(){m();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test8_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test8_out.txt
deleted file mode 100644
index 968af3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test8_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-m();
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test9.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test9.java
deleted file mode 100644
index 519a5d6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test9.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;

-class A{

-	void m(int t){

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test9_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test9_out.txt
deleted file mode 100644
index 523b42f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_test9_out.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-void m(int t){

-	}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testWholeCu.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testWholeCu.java
deleted file mode 100644
index 3044647..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testWholeCu.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testWholeCu_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testWholeCu_out.txt
deleted file mode 100644
index 3044647..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testWholeCu_out.txt
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength0.java
deleted file mode 100644
index 3044647..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength0.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength0_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength0_out.txt
deleted file mode 100644
index 1a5a117..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength0_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-1 + 1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength1.java
deleted file mode 100644
index aaf66a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength1.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		int i= 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength1_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength1_out.txt
deleted file mode 100644
index 56a6051..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength1_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-1
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength2.java
deleted file mode 100644
index aaf66a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength2.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		int i= 1 + 2;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength2_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength2_out.txt
deleted file mode 100644
index d8263ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength2_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-2
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength3.java
deleted file mode 100644
index 891a804..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength3.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		int i= 1 + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength3_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength3_out.txt
deleted file mode 100644
index 08b9811..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength3_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-m
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength4.java
deleted file mode 100644
index 891a804..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength4.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(){
-		int i= 1 + 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength4_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength4_out.txt
deleted file mode 100644
index 4e0b2da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength4_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-int
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength5.java
deleted file mode 100644
index dfab451..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength5.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	void m(int var){
-		++var;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength5_out.txt b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength5_out.txt
deleted file mode 100644
index 0362a8a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/A_testZeroLength5_out.txt
+++ /dev/null

@@ -1 +0,0 @@
-var
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/OffsetTest.java b/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/OffsetTest.java
deleted file mode 100644
index 5e6cf5c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/StructureSelectionAction/OffsetTest.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;

-class A{

-	void m(){

-		int i= 1 + 1;

-		if (i < 0){

-			i += i;

-			return;

-		} else

-		 m();

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/.cvsignore
deleted file mode 100644
index 9caf6f2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-.metadata

-bin

-*.class
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/.cvsignore b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/.cvsignore
deleted file mode 100644
index 4fdcfd7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin

-.classpath

-*.class
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/.project b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/.project
deleted file mode 100644
index 48a8e0a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>SurroundWithTests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/A.java
deleted file mode 100644
index ab44e52..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-import java.io.File;

-import java.net.URL;

-

-class A {

-	public void foo() {

-		File file= null;

-		

-		URL url= file.toURL();

-		

-		url= null;

-	}

-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/D.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/D.java
deleted file mode 100644
index 583b741..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/D.java
+++ /dev/null

@@ -1,7 +0,0 @@
-import java.io.*;
-
-
-/* comment */
-public class D {
-    private InputStream input= new FileInputStream("myfile");
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestAlreadyCaught.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestAlreadyCaught.java
deleted file mode 100644
index 03bfd682..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestAlreadyCaught.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-import java.net.MalformedURLException;

-

-public class TestAlreadyCaught {

-	public void foo() {

-		File file= null;

-		try {

-			/*]*/file.toURL();/*[*/

-		} catch(MalformedURLException e) {

-		}

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestDeclarationInitializer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestDeclarationInitializer.java
deleted file mode 100644
index 8454084..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestDeclarationInitializer.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package trycatch_in;
-
-import java.io.File;
-import java.net.URL;
-
-class TestDeclarationInitializer {
-	public void foo() {
-		File file= null;
-		
-		/*[*/URL url= file.toURL();/*]*/
-		url= null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExceptionOrder.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExceptionOrder.java
deleted file mode 100644
index 9f02974..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExceptionOrder.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package trycatch_in;

-

-public class TestExceptionOrder {

-	public static class Exception_1 extends Exception {

-	}

-	public static class Exception_2 extends Exception_1 {

-	}

-	

-	public void throw1() throws Exception_1 {

-	}

-	

-	public void throw2() throws Exception_2 {

-	}

-	

-	public void foo() {

-		/*[*/throw1();

-		throw2();/*]*/

-	}	

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExpression.java
deleted file mode 100644
index 1913421..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExpression.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package trycatch_in;
-import java.io.File;
-
-class TestExpression{	
-	void fg(){
-		File file= null;
-		
-		/*[*/int i= 3 * (2 + 1);
-		file.toURL();/*]*/
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExpressionStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExpressionStatement.java
deleted file mode 100644
index 4a8122b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestExpressionStatement.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package trycatch_in;
-
-import java.net.URL;
-
-public class TestExpressionStatement {
-	public void foo() {
-		/*[*/new URL("http://www.eclipse.org")/*]*/;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInitializer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInitializer.java
deleted file mode 100644
index b9e540a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInitializer.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package trycatch_in;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-public class TestInitializer {
-    private static InputStream input;
-
-    static {
-		/*[*/input = new FileInputStream("myfile");/*]*/
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInitializerThrowsException.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInitializerThrowsException.java
deleted file mode 100644
index 3477608..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInitializerThrowsException.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package trycatch_in;
-
-import java.io.File;
-import java.net.URL;
-
-public class TestInitializerThrowsException {
-
-	public void foo() {
-		File file= null;
-		
-		/*[*/URL url= file.toURL();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInvalidParent1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInvalidParent1.java
deleted file mode 100644
index d9f3e50..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInvalidParent1.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-

-public class TestInvalidParent1 {

-	public void foo() {

-		File file= null;

-		if (/*]*/file.toURL() == null/*[*/)

-			return;

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInvalidParent2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInvalidParent2.java
deleted file mode 100644
index 6cac896..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestInvalidParent2.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-import java.net.URL;

-

-public class TestInvalidParent2 {

-	public void foo() {

-		File file= null;

-		URL url= /*]*/file.toURL();/*[*/

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestMultiLine.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestMultiLine.java
deleted file mode 100644
index 534a8fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestMultiLine.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-

-public class TestMultiLine {

-	public void foo() {

-		File file= null;

-		foo();/*]*/file.toURL();

-		file.toURL();

-		file.toURL();/*]*/foo();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestNested.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestNested.java
deleted file mode 100644
index 878cde0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestNested.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package trycatch_in;
-
-public class TestNested {
-	public void foo() {
-		try {
-			throw new Exception();
-		} catch (Exception e) {
-			/*[*/throw new Exception();/*]*/
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestNoException.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestNoException.java
deleted file mode 100644
index a06082c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestNoException.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package trycatch_in;

-

-public class TestNoException {

-	public void foo() {

-		/*]*/foo();/*[*/

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestOneLine.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestOneLine.java
deleted file mode 100644
index f1e2517..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestOneLine.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-

-public class TestOneLine {

-	public void foo() {

-		File file= null;

-		foo();/*]*/file.toURL();/*]*/foo();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestRuntimeException1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestRuntimeException1.java
deleted file mode 100644
index f8efefc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestRuntimeException1.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package trycatch_in;
-
-public class TestRuntimeException1 {
-	public void foo() {
-		Class clazz= null;
-		
-		/*[*/clazz.getConstructors();/*]*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestRuntimeException2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestRuntimeException2.java
deleted file mode 100644
index cff422d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestRuntimeException2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package trycatch_in;
-
-public class TestRuntimeException2 {
-	public void foo() {
-		/*]*/throw new NullPointerException();/*[*/
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSimple.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSimple.java
deleted file mode 100644
index 6ba5a71..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSimple.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-

-public class TestSimple {

-	public void foo() {

-		File file= null;

-		/*[*/file.toURL();/*]*/

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestStaticField.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestStaticField.java
deleted file mode 100644
index af1c21e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestStaticField.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package trycatch_in;
-
-public class TestStaticField {
-	/*]*/private static InputStream input= new FileInputStream("myfile");/*[*/
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSuperCall.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSuperCall.java
deleted file mode 100644
index 2f76b48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSuperCall.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package trycatch_in;
-
-import java.io.IOException;
-
-public class TestSuperCall {
-	public void foo() throws IOException {
-	}
-	
-	static class A extends TestSuperCall {
-		public void bar() {
-			/*[*/super.foo();/*]*/
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSuperConstructorCall.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSuperConstructorCall.java
deleted file mode 100644
index e123539..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestSuperConstructorCall.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package trycatch_in;
-
-import java.net.MalformedURLException;
-
-public class TestSuperConstructorCall {
-	static class A {
-		public A(int i) throws MalformedURLException {
-		}
-	}
-	
-	static class B extends A {
-		public B() {
-			super(10);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThenStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThenStatement.java
deleted file mode 100644
index 0a7f4f9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThenStatement.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package trycatch_in;
-
-public class TestThenStatement {
-	
- void foo() {
-   TestThenStatement bar= null;
-   if (bar != null)
-	 /*]*/bar.run();/*[*/
- }
- 
- void run() throws InterruptedException{
- }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThisConstructorCall.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThisConstructorCall.java
deleted file mode 100644
index 7b2645d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThisConstructorCall.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package trycatch_in;
-
-import java.net.MalformedURLException;
-
-public class TestThisConstructorCall {
-	public TestThisConstructorCall(int i) throws MalformedURLException {
-	}
-	public TestThisConstructorCall() {
-		this(10);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThrowInCatch.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThrowInCatch.java
deleted file mode 100644
index b00e475..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestThrowInCatch.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package trycatch_in;

-

-public class TestThrowInCatch {

-	void f() throws Exception{

-		/*[*/try{

-		} catch (Exception e){

-			throw new Exception();

-		}/*]*/

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal1.java
deleted file mode 100644
index 776f37b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal1.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-

-public class TestWrappedLocal1 {

-

-	public void foo() {

-		File file= null;

-		

-		/*[*/int i= 10; 

-		file.toURL();/*]*/

-		i= 20;

-	}

-

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal2.java
deleted file mode 100644
index 04c7a8d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal2.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-

-public class TestWrappedLocal2 {

-

-	public void foo() {

-		File file= null;

-		

-		/*[*/int i= 10; int x; 

-		file.toURL();/*]*/

-		i= 20;

-	}

-

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal3.java
deleted file mode 100644
index c8ef9e3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal3.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package trycatch_in;

-

-import java.io.File;

-

-public class TestWrappedLocal3 {

-

-	public void foo() {

-		File file= null;

-		

-		int i;

-		/*[*/int x; 

-		file.toURL();/*]*/

-		i= 20;

-	}

-

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal4.java
deleted file mode 100644
index 6484a31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal4.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package trycatch_in;
-
-import java.io.File;
-
-public class TestWrappedLocal4 {
-
-	public void foo() {
-		File file= null;
-		
-		/*[*/int i= 10, x= 20;
-		file.toURL();/*]*/
-		i= 20;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal5.java
deleted file mode 100644
index c0e229a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal5.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package trycatch_in;
-
-import java.io.File;
-
-public class TestWrappedLocal5 {
-
-	public void foo() {
-		File file= null;
-		
-		/*[*/int i, x; 
-		file.toURL();/*]*/
-		i= 20;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal6.java
deleted file mode 100644
index bb703ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_in/TestWrappedLocal6.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package trycatch_in;
-
-import java.io.File;
-
-public class TestWrappedLocal6 {
-
-	public void foo() {
-		File file= null;
-		
-		/*[*/int a, i= 10, x; 
-		file.toURL();/*]*/
-		i= 20;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestDeclarationInitializer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestDeclarationInitializer.java
deleted file mode 100644
index 792db39..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestDeclarationInitializer.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package trycatch_out;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-class TestDeclarationInitializer {
-	public void foo() {
-		File file= null;
-		
-		/*[*/URL url;/*]*/
-		try {
-			url = file.toURL();
-		} catch (MalformedURLException e) {
-		}
-		url= null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExceptionOrder.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExceptionOrder.java
deleted file mode 100644
index b3467fe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExceptionOrder.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package trycatch_out;

-

-public class TestExceptionOrder {

-	public static class Exception_1 extends Exception {

-	}

-	public static class Exception_2 extends Exception_1 {

-	}

-	

-	public void throw1() throws Exception_1 {

-	}

-	

-	public void throw2() throws Exception_2 {

-	}

-	

-	public void foo() {

-		try {

-			/*[*/throw1();

-			throw2();/*]*/

-		} catch (Exception_2 e) {

-		} catch (Exception_1 e) {

-		}

-	}	

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExpression.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExpression.java
deleted file mode 100644
index 7bde695..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExpression.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package trycatch_out;
-import java.io.File;
-import java.net.MalformedURLException;
-
-class TestExpression{	
-	void fg(){
-		File file= null;
-		
-		/*[*/int i;
-		try {
-			i = 3 * (2 + 1);
-			file.toURL();/*]*/
-		} catch (MalformedURLException e) {
-		}
-		i++;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExpressionStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExpressionStatement.java
deleted file mode 100644
index 37ca7a5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestExpressionStatement.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package trycatch_out;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-public class TestExpressionStatement {
-	public void foo() {
-		try {
-			/*[*/new URL("http://www.eclipse.org")/*]*/;
-		} catch (MalformedURLException e) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestInitializer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestInitializer.java
deleted file mode 100644
index 9e6e5fd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestInitializer.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package trycatch_out;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-public class TestInitializer {
-    private static InputStream input;
-
-    static {
-		try {
-			/*[*/input = new FileInputStream("myfile");/*]*/
-		} catch (FileNotFoundException e) {
-		}
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestInitializerThrowsException.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestInitializerThrowsException.java
deleted file mode 100644
index 52f732e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestInitializerThrowsException.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package trycatch_out;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-public class TestInitializerThrowsException {
-
-	public void foo() {
-		File file= null;
-		
-		try {
-			/*[*/URL url= file.toURL();/*]*/
-		} catch (MalformedURLException e) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestMultiLine.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestMultiLine.java
deleted file mode 100644
index 19b9e32..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestMultiLine.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package trycatch_out;

-

-import java.io.File;

-import java.net.MalformedURLException;

-

-public class TestMultiLine {

-	public void foo() {

-		File file= null;

-		foo();/*]*/try {

-			file.toURL();

-			file.toURL();

-			file.toURL();/*]*/

-		} catch (MalformedURLException e) {

-		}foo();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestNested.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestNested.java
deleted file mode 100644
index 7ca2e7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestNested.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package trycatch_out;
-
-public class TestNested {
-	public void foo() {
-		try {
-			throw new Exception();
-		} catch (Exception e) {
-			try {
-				/*[*/throw new Exception();/*]*/
-			} catch (Exception e1) {
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestOneLine.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestOneLine.java
deleted file mode 100644
index b00d2b1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestOneLine.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package trycatch_out;

-

-import java.io.File;

-import java.net.MalformedURLException;

-

-public class TestOneLine {

-	public void foo() {

-		File file= null;

-		foo();/*]*/try {

-			file.toURL();/*]*/

-		} catch (MalformedURLException e) {

-		}foo();

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestRuntimeException1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestRuntimeException1.java
deleted file mode 100644
index 98fc00e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestRuntimeException1.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package trycatch_out;
-
-public class TestRuntimeException1 {
-	public void foo() {
-		Class clazz= null;
-		
-		try {
-			/*[*/clazz.getConstructors();/*]*/
-		} catch (SecurityException e) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestSimple.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestSimple.java
deleted file mode 100644
index 9982c47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestSimple.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package trycatch_out;

-

-import java.io.File;

-import java.net.MalformedURLException;

-

-public class TestSimple {

-	public void foo() {

-		File file= null;

-		try {

-			/*[*/file.toURL();/*]*/

-		} catch (MalformedURLException e) {

-		}

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestSuperCall.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestSuperCall.java
deleted file mode 100644
index e2574f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestSuperCall.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package trycatch_out;
-
-import java.io.IOException;
-
-public class TestSuperCall {
-	public void foo() throws IOException {
-	}
-	
-	static class A extends TestSuperCall {
-		public void bar() {
-			try {
-				/*[*/super.foo();/*]*/
-			} catch (IOException e) {
-			}
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestThenStatement.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestThenStatement.java
deleted file mode 100644
index f659bcc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestThenStatement.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package trycatch_out;
-
-public class TestThenStatement {
-	
- void foo() {
-   TestThenStatement bar= null;
-   if (bar != null)
-	try {
-		/*]*/bar.run();/*[*/
-	} catch (InterruptedException e) {
-	}
- }
- 
- void run() throws InterruptedException{
- }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestThrowInCatch.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestThrowInCatch.java
deleted file mode 100644
index f911511..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestThrowInCatch.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package trycatch_out;

-

-public class TestThrowInCatch {

-	void f() throws Exception{

-		try {

-			/*[*/try{

-			} catch (Exception e){

-				throw new Exception();

-			}/*]*/

-		} catch (Exception e) {

-		}

-	}

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal1.java
deleted file mode 100644
index 2627462..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal1.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package trycatch_out;

-

-import java.io.File;

-import java.net.MalformedURLException;

-

-public class TestWrappedLocal1 {

-

-	public void foo() {

-		File file= null;

-		

-		/*[*/int i;

-		try {

-			i = 10; 

-			file.toURL();/*]*/

-		} catch (MalformedURLException e) {

-		}

-		i= 20;

-	}

-

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal2.java
deleted file mode 100644
index 842bb3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal2.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package trycatch_out;

-

-import java.io.File;

-import java.net.MalformedURLException;

-

-public class TestWrappedLocal2 {

-

-	public void foo() {

-		File file= null;

-		

-		/*[*/int i;

-		try {

-			i = 10; int x; 

-			file.toURL();/*]*/

-		} catch (MalformedURLException e) {

-		}

-		i= 20;

-	}

-

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal3.java
deleted file mode 100644
index 354ace5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal3.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package trycatch_out;

-

-import java.io.File;

-import java.net.MalformedURLException;

-

-public class TestWrappedLocal3 {

-

-	public void foo() {

-		File file= null;

-		

-		int i;

-		try {

-			/*[*/int x; 

-			file.toURL();/*]*/

-		} catch (MalformedURLException e) {

-		}

-		i= 20;

-	}

-

-}


diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal4.java
deleted file mode 100644
index 3efa6ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal4.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package trycatch_out;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-public class TestWrappedLocal4 {
-
-	public void foo() {
-		File file= null;
-		
-		/*[*/int i, x;
-		try {
-			i = 10;
-			x = 20;
-			file.toURL();/*]*/
-		} catch (MalformedURLException e) {
-		}
-		i= 20;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal5.java
deleted file mode 100644
index c15f62d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal5.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package trycatch_out;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-public class TestWrappedLocal5 {
-
-	public void foo() {
-		File file= null;
-		
-		/*[*/int i, x;
-		try {
-			file.toURL();/*]*/
-		} catch (MalformedURLException e) {
-		}
-		i= 20;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal6.java
deleted file mode 100644
index 6fcfd31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/SurroundWithWorkSpace/SurroundWithTests/trycatch_out/TestWrappedLocal6.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package trycatch_out;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-public class TestWrappedLocal6 {
-
-	public void foo() {
-		File file= null;
-		
-		/*[*/int a, i, x;
-		try {
-			i = 10; 
-			file.toURL();/*]*/
-		} catch (MalformedURLException e) {
-		}
-		i= 20;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints0.java
deleted file mode 100644
index d94c6d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints0.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		A a0= null;
-		A a1= a0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints1.java
deleted file mode 100644
index 69e8d96..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints1.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	A a0= null, a1;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints10.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints10.java
deleted file mode 100644
index a7f4098..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints10.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	A[] f1(){return null;}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints11.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints11.java
deleted file mode 100644
index e0f9bbe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints11.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	A f(A a0, Object a1){
-		return null;
-	}
-}
-class B extends A{
-	A f(A a3, Object a4){
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints12.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints12.java
deleted file mode 100644
index d73dc6b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints12.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	static A f(A a0, Object a1){
-		return null;
-	}
-}
-class B extends A{
-	static A f(A a3, Object a4){
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints13.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints13.java
deleted file mode 100644
index ce90ab6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints13.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-class A{
-	private A f(A a0, Object a1){
-		return null;
-	}
-}
-class B extends A{
-	private A f(A a3, Object a4){
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints14.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints14.java
deleted file mode 100644
index 78e7954..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints14.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package p;
-class A{
-	A f(A a0){
-		return null;
-	}
-}
-class B extends A implements I{
-	A f(A a3){
-		B ax= null;
-		ax.f(a3);
-		return null;
-	}
-}
-interface I {
-	A f(A ai);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints15.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints15.java
deleted file mode 100644
index 738879f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints15.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-class A{
-	A f(A a0){
-		return null;
-	}
-}
-class B extends A implements I{
-	A f(A a3){
-		super.f(a3);
-		return null;
-	}
-}
-interface I {
-	A f(A ai);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints16.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints16.java
deleted file mode 100644
index 5aacfa7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints16.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	A aField= this;
-	{
-		A aTemp= this;
-	}
-	void f(){
-		A a= this;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints17.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints17.java
deleted file mode 100644
index 6249d98..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints17.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	A f(){
-		A a= null;
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints18.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints18.java
deleted file mode 100644
index 0501fbc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints18.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	A(A a0){
-	}
-}
-class B extends A{
-	B(A a1){
-		super(a1);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints19.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints19.java
deleted file mode 100644
index 47d2ec6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints19.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class A{
-	A aField;
-}
-class B extends A{
-	void f(){
-		A a= null;
-		super.aField= a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints2.java
deleted file mode 100644
index aec8c28..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints2.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		A a0= null;
-		A a1= (A)a0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints20.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints20.java
deleted file mode 100644
index 64235a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints20.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	A aField;
-}
-class B extends A{
-	A aField;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints21.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints21.java
deleted file mode 100644
index 5d5469f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints21.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	void f2(A[] as){}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints22.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints22.java
deleted file mode 100644
index 8889288..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints22.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class A{
-	A f(A a0, Object a1){
-		return null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints23.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints23.java
deleted file mode 100644
index 99fd06b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints23.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-class Test1 {
-		public static void main(String[] args) {
-			for(int i=0; i < args.length; );
-		}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints3.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints3.java
deleted file mode 100644
index 070a6ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints3.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		for (A a= null, b= null;;){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints4.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints4.java
deleted file mode 100644
index 07c8ac3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints4.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		A a0= null;
-		A[] as0= {a0};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints5.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints5.java
deleted file mode 100644
index 0c4346e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints5.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		A a0= null;
-		A[] as0= new A[]{a0};
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints6.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints6.java
deleted file mode 100644
index 9e8b07a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints6.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	A(A a){}
-	void f(){
-		A a0= null;
-		A a1= new A(a0);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints7.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints7.java
deleted file mode 100644
index 9b0474c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints7.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	A(A a){}
-	A(){
-		this(null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints8.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints8.java
deleted file mode 100644
index 9c91cb2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints8.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A{
-	A aField;
-	Object x;
-	void f(){
-		aField.x= this;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints9.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints9.java
deleted file mode 100644
index 61b8bfd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testConstraints9.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A{
-	void f(){
-		A a= null;
-		boolean x= a instanceof A;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber0.java
deleted file mode 100644
index f917196..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber0.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	A a;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber1.java
deleted file mode 100644
index 5abb5ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber1.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	A a= null;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber2.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber2.java
deleted file mode 100644
index e725807..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testNumber2.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A{
-	A a0= null, a1, a2;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testUpdatableExtractInterfaceRanges0.java b/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testUpdatableExtractInterfaceRanges0.java
deleted file mode 100644
index e717a99..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/TypeConstraints/A_testUpdatableExtractInterfaceRanges0.java
+++ /dev/null

@@ -1,81 +0,0 @@
-package p;
-
-interface Bag{
-	public java.util.Iterator iterator();
-	public A add(Comparable e);
-	public A addAll(A v1);
-}
-class A implements Bag{
-	int size = 0;
-	Comparable[] elems = new Comparable[10];
-	public java.util.Iterator iterator() {
-		return new Iterator(this);
-	}
-	public A add(Comparable e) {
-		if (size + 1 == elems.length) {
-			Comparable[] newElems = new Comparable[2 * size];
-			System.arraycopy(elems, 0, newElems, 0, size);
-			elems = newElems;
-		}
-		elems[size++] = e;
-		return this;
-	}
-	public A addAll(A v1) {
-		java.util.Iterator i = v1.iterator();
-		for (; i.hasNext(); add((Comparable) i.next()));
-		return this;
-	}
-	public void sort() { /* insertion sort */
-		for (int i = 1; i < size; i++) {
-			Comparable e1 = elems[i];
-			int j = i;
-			while ((j > 0) && (elems[j - 1].compareTo(e1) > 0)) {
-				elems[j] = elems[j - 1];
-				j--;
-			}
-			elems[j] = e1;
-		}
-	}
-}
-class Iterator implements java.util.Iterator {
-	private int count = 0;
-	private A v2;
-	Iterator(A v3) {
-		v2 = v3;
-	}
-	public boolean hasNext() {
-		return count < v2.size;
-	}
-	public Object next() {
-		return v2.elems[count++];
-	}
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-}
-class Client {
-	public static void main(String[] args) {
-		A v4 = createList();
-		populate(v4);
-		update(v4);
-		sortList(v4);
-		print(v4);
-	}
-	static A createList() {
-		return new A();
-	}
-	static void populate(A v5) {
-		v5.add("foo").add("bar");
-	}
-	static void update(A v6) {
-		A v7 = new A().add("zap").add("baz");
-		v6.addAll(v7);
-	}
-	static void sortList(A v8) {
-		v8.sort();
-	}
-	static void print(A v9) {
-		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
-			System.out.println("Object: " + iter.next());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/in/A.java
deleted file mode 100644
index e773ba6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/in/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A implements I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/in/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/in/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/out/A.java
deleted file mode 100644
index e773ba6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/out/A.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class A implements I{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/out/I.java
deleted file mode 100644
index 6bf3b7a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test0_/out/I.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/in/A.java
deleted file mode 100644
index eb1b77e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public final void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/out/A.java
deleted file mode 100644
index eb1b77e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public final void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test10_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/in/A.java
deleted file mode 100644
index b29a790..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-abstract class A implements I{
-	abstract public void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/out/A.java
deleted file mode 100644
index b29a790..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-abstract class A implements I{
-	abstract public void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test11_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/in/A.java
deleted file mode 100644
index 9e26007..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A implements I{
-	public void m(){}
-	private void f(){
-		A a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/out/A.java
deleted file mode 100644
index 41cb3cd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-class A implements I{
-	public void m(){}
-	private void f(){
-		I a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test12_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/in/A.java
deleted file mode 100644
index be2224a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A extends Object implements Cloneable, I{
-	public void m(){
-	}
-	protected Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/out/A.java
deleted file mode 100644
index be2224a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A extends Object implements Cloneable, I{
-	public void m(){
-	}
-	protected Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test13_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/in/A.java
deleted file mode 100644
index 6289367..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	void f(){
-		A a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/out/A.java
deleted file mode 100644
index a4a2709..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	void f(){
-		I a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test14_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/in/A.java
deleted file mode 100644
index 41579b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/in/I.java
deleted file mode 100644
index c9ea053..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/in/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-	void m1();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/out/A.java
deleted file mode 100644
index 857dece..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		I a= new A();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/out/I.java
deleted file mode 100644
index c9ea053..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test15_/out/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-	void m1();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/in/A.java
deleted file mode 100644
index 577598e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/out/A.java
deleted file mode 100644
index 2a08fb9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		I a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test16/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/in/A.java
deleted file mode 100644
index 1e3a413..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/out/A.java
deleted file mode 100644
index 1e3a413..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test17/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/in/A.java
deleted file mode 100644
index 2154631..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A();
-		a.m();
-
-		A a1= new A();
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/out/A.java
deleted file mode 100644
index f175b95..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		I a= new A();
-		a.m();
-
-		A a1= new A();
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test18/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/in/A.java
deleted file mode 100644
index 66eebc6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A(), a1 = new A();
-		a.m();
-
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/out/A.java
deleted file mode 100644
index 66eebc6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A(), a1 = new A();
-		a.m();
-
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test19/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/in/A.java
deleted file mode 100644
index 8a36a2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/out/A.java
deleted file mode 100644
index 8a36a2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public void m(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test1_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/in/A.java
deleted file mode 100644
index 66eebc6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		A a= new A(), a1 = new A();
-		a.m();
-
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/in/I.java
deleted file mode 100644
index c9ea053..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/in/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-	void m1();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/out/A.java
deleted file mode 100644
index f92f6a6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m(){}
-	public void m1(){}
-	void f(){
-		I a= new A(), a1 = new A();
-		a.m();
-
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/out/I.java
deleted file mode 100644
index c9ea053..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test20/out/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-	void m1();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/in/A.java
deleted file mode 100644
index e5b9c3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A extends Exception implements I {
-	public void m() {}
-	void e() throws A{}
-	void g() {
-		try{
-			e();
-		} catch (A a){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/out/A.java
deleted file mode 100644
index e5b9c3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A extends Exception implements I {
-	public void m() {}
-	void e() throws A{}
-	void g() {
-		try{
-			e();
-		} catch (A a){
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test21/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/in/A.java
deleted file mode 100644
index b0fcab7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	Class g() {
-		return A.class;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/out/A.java
deleted file mode 100644
index b0fcab7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	Class g() {
-		return A.class;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test22/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/in/A.java
deleted file mode 100644
index 747e26e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	void g() {
-		A a= (A)new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/out/A.java
deleted file mode 100644
index fe659e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	void g() {
-		I a= (I)new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test23/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/in/A.java
deleted file mode 100644
index 377f835..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		A a= (A)new A();
-		((A)this).m1();
-		((A)this).m();
-		(((A)this)).m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/out/A.java
deleted file mode 100644
index 2af8159..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		I a= (I)new A();
-		((A)this).m1();
-		((I)this).m();
-		(((I)this)).m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test24/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/in/A.java
deleted file mode 100644
index eb1eb60..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	protected A g() {
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/out/A.java
deleted file mode 100644
index 689cc1a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	protected I g() {
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test25/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/in/A.java
deleted file mode 100644
index f8c4867..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		g().m();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/out/A.java
deleted file mode 100644
index 9bb324d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected I g() {
-		g().m();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test26/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/in/A.java
deleted file mode 100644
index 75151ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		g().m1();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/out/A.java
deleted file mode 100644
index 75151ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		g().m1();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test27/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/in/A.java
deleted file mode 100644
index a6a4385..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		return this;	
-	}
-}
-class A1 extends A{
-	protected A g() {
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/out/A.java
deleted file mode 100644
index ea612d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected I g() {
-		return this;	
-	}
-}
-class A1 extends A{
-	protected I g() {
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test28/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/in/A.java
deleted file mode 100644
index 2792500..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/in/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		return this;	
-	}
-}
-class A1 extends A{
-	protected A g() {
-		g().m1();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/out/A.java
deleted file mode 100644
index 2792500..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/out/A.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A g() {
-		return this;	
-	}
-}
-class A1 extends A{
-	protected A g() {
-		g().m1();
-		return this;	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test29/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/in/A.java
deleted file mode 100644
index b0e0bdf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.List;
-
-class A implements I{
-	public List m(){return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/in/I.java
deleted file mode 100644
index 5273f15..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/in/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.util.List;
-/** typecomment template*/
-interface I {
-	List m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/out/A.java
deleted file mode 100644
index b0e0bdf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import java.util.List;
-
-class A implements I{
-	public List m(){return null;}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/out/I.java
deleted file mode 100644
index 5273f15..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test2_/out/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.util.List;
-/** typecomment template*/
-interface I {
-	List m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/in/A.java
deleted file mode 100644
index 10362fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	A f(A a){
-		f(a).m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/out/A.java
deleted file mode 100644
index 10362fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	A f(A a){
-		f(a).m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test30/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/in/A.java
deleted file mode 100644
index eca9d5e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	A f(A a){
-		f(a).m();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/out/A.java
deleted file mode 100644
index 0cfc234..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((I)this);
-	}
-	I f(I a){
-		f(a).m();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test31/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/in/A.java
deleted file mode 100644
index b8e34b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/out/A.java
deleted file mode 100644
index 2424bbd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		I a1= a0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test32/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/in/A.java
deleted file mode 100644
index a7373d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/out/A.java
deleted file mode 100644
index a7373d0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test33/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/in/A.java
deleted file mode 100644
index 0c46d3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		a1.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/out/A.java
deleted file mode 100644
index 32d25a1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		I a1= a0;
-		a1.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test34/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/in/A.java
deleted file mode 100644
index b377467..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A implements I { //implements Fred
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/out/A.java
deleted file mode 100644
index b377467..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A implements I { //implements Fred
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test35/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/in/A.java
deleted file mode 100644
index 416a922..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		f(a0);
-	}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/out/A.java
deleted file mode 100644
index 416a922..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		f(a0);
-	}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test36/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/in/A.java
deleted file mode 100644
index 1b1ed7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		f(a0);
-	}
-	void f(A a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/out/A.java
deleted file mode 100644
index 1070412..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		f(a0);
-	}
-	void f(I a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test37/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/in/A.java
deleted file mode 100644
index bfdcb70..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		a1.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/out/A.java
deleted file mode 100644
index 93bff1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		I a1;
-		a1= a0;
-		a1.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test38/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/in/A.java
deleted file mode 100644
index b9deeeb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/out/A.java
deleted file mode 100644
index b9deeeb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test39/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/in/A.java
deleted file mode 100644
index c598efa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class A implements I{
-	public void m(){
-		List list= new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/out/A.java
deleted file mode 100644
index c598efa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class A implements I{
-	public void m(){
-		List list= new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test3_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/in/A.java
deleted file mode 100644
index 17596e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a1;
-		a1= null;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/out/A.java
deleted file mode 100644
index 17596e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a1;
-		a1= null;
-		a1.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test40/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/in/A.java
deleted file mode 100644
index 1af56bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		A a2= a1;
-		a2.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/out/A.java
deleted file mode 100644
index 1af56bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1= a0;
-		A a2= a1;
-		a2.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test41/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/in/A.java
deleted file mode 100644
index 4172720..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		A a2;
-		a2= a1;
-		a2.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/out/A.java
deleted file mode 100644
index 4172720..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		A a1;
-		a1= a0;
-		A a2;
-		a2= a1;
-		a2.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test42/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/in/A.java
deleted file mode 100644
index b25eedd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		((A)a0).m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/out/A.java
deleted file mode 100644
index 4f1549d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		((I)a0).m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test43/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/in/A.java
deleted file mode 100644
index e747555..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		A a0= new A();
-		((A)a0).m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/out/A.java
deleted file mode 100644
index e032247..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void test(){
-		I a0= new A();
-		((A)a0).m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test44/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/in/A.java
deleted file mode 100644
index fb1dd55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/out/A.java
deleted file mode 100644
index fb1dd55..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test45/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/in/A.java
deleted file mode 100644
index a301d27..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(A a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/out/A.java
deleted file mode 100644
index 2a68a7c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(I a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test46/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/in/A.java
deleted file mode 100644
index 4b67e34..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	A g() {
-		A a= new A();
-		g().m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/out/A.java
deleted file mode 100644
index 4b67e34..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	A g() {
-		A a= new A();
-		g().m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test47/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/in/A.java
deleted file mode 100644
index 28a0e57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	A f(A a){
-		f(a).m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/out/A.java
deleted file mode 100644
index 28a0e57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	A f(A a){
-		f(a).m1();
-		return a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test48/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/in/A.java
deleted file mode 100644
index dffad44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/out/A.java
deleted file mode 100644
index dffad44..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void g() {
-		f((A)this);
-	}
-	void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test49/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/in/A.java
deleted file mode 100644
index 9304981..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements Cloneable, I{
-	public void m(){
-	}
-	protected Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/out/A.java
deleted file mode 100644
index 9304981..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-
-class A implements Cloneable, I{
-	public void m(){
-	}
-	protected Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test4_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/in/A.java
deleted file mode 100644
index 9e7aff4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	A a;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/out/A.java
deleted file mode 100644
index 9e7aff4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	A a;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test50/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/in/A.java
deleted file mode 100644
index 3c1c5c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	A a;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/out/A.java
deleted file mode 100644
index 5728437..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	I a;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test51/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/in/A.java
deleted file mode 100644
index 4aaa2cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	A fA;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= fA;
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/out/A.java
deleted file mode 100644
index 4aaa2cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	A fA;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= fA;
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test52/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/in/A.java
deleted file mode 100644
index 1c5ff48..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	A fA;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= fA;
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/out/A.java
deleted file mode 100644
index f10dd01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class A implements I {
-	I fA;
-	public void m() {}
-	public void m1() {}
-	void f(){
-		I a= fA;
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test53/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/A.java
deleted file mode 100644
index bed1d04..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected void f(A a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/A1.java
deleted file mode 100644
index 2d54186..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/A1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected void f(A a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/A.java
deleted file mode 100644
index e68d749..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected void f(I a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/A1.java
deleted file mode 100644
index 3eccac6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/A1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected void f(I a){
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test54/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/A.java
deleted file mode 100644
index bed1d04..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected void f(A a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/A1.java
deleted file mode 100644
index a4285b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/A1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/A.java
deleted file mode 100644
index bed1d04..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected void f(A a){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/A1.java
deleted file mode 100644
index a4285b3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/A1.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected void f(A a){
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test55/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/A.java
deleted file mode 100644
index 2e5f384..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/A1.java
deleted file mode 100644
index c6b716d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/A.java
deleted file mode 100644
index 2e5f384..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/A1.java
deleted file mode 100644
index c6b716d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test56/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/A.java
deleted file mode 100644
index f8e8cef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/A1.java
deleted file mode 100644
index d29e8f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/A.java
deleted file mode 100644
index 1391097..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/A.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	protected I f(){
-		return this;
-	}
-	void test(){
-		f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/A1.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/A1.java
deleted file mode 100644
index 2de0edc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/A1.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-public class A1 extends A{
-	protected I f(){
-		return this;
-	}
-	void test(){
-		f().m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test57/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/in/A.java
deleted file mode 100644
index 4dd4223..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	int f;
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().f=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/out/A.java
deleted file mode 100644
index 4dd4223..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	int f;
-	public void m() {}
-	public void m1() {}
-	protected A f(){
-		return this;
-	}
-	void test(){
-		f().f=0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test58/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/in/A.java
deleted file mode 100644
index 709538d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import p.A;
-class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/out/A.java
deleted file mode 100644
index 709538d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-
-import p.A;
-class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test59/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/in/A.java
deleted file mode 100644
index 0be1335..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-class A implements I{
-	public void m() throws IOException{
-		List list= new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/in/I.java
deleted file mode 100644
index d3792de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/in/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.io.IOException;
-/** typecomment template*/
-interface I {
-	void m() throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/out/A.java
deleted file mode 100644
index 0be1335..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-class A implements I{
-	public void m() throws IOException{
-		List list= new ArrayList();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/out/I.java
deleted file mode 100644
index d3792de..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test5_/out/I.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-import java.io.IOException;
-/** typecomment template*/
-interface I {
-	void m() throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/in/A.java
deleted file mode 100644
index ba23032..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	public static void s() {}
-	void t(){
-		A.s();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/out/A.java
deleted file mode 100644
index ba23032..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	public static void s() {}
-	void t(){
-		A.s();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test60/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/in/A.java
deleted file mode 100644
index c16b697..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	public static int s= 0;
-	void t(){
-		A.s= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/out/A.java
deleted file mode 100644
index c16b697..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	public static int s= 0;
-	void t(){
-		A.s= 1;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test61/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/in/A.java
deleted file mode 100644
index d2a5048..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void t(){
-		new A(){
-			void g(){
-				A.this.m1();
-			}
-		};	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/out/A.java
deleted file mode 100644
index d2a5048..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void t(){
-		new A(){
-			void g(){
-				A.this.m1();
-			}
-		};	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test62/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/in/A.java
deleted file mode 100644
index 98bff3d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void t(){
-		new A(){
-			void g() throws InterruptedException{
-				A.super.wait();
-			}
-		};	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/out/A.java
deleted file mode 100644
index 98bff3d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void t(){
-		new A(){
-			void g() throws InterruptedException{
-				A.super.wait();
-			}
-		};	
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test63/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/A.java
deleted file mode 100644
index e388da3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(Inter i){
-		A a= new A();
-		i.work(a);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/Inter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/Inter.java
deleted file mode 100644
index 06fa9e7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/in/Inter.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-public interface Inter {
-	void work(A a);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/A.java
deleted file mode 100644
index 6eea703..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(Inter i){
-		I a= new A();
-		i.work(a);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/Inter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/Inter.java
deleted file mode 100644
index 505676f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test64/out/Inter.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-
-public interface Inter {
-	void work(I a);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/in/A.java
deleted file mode 100644
index 35d13b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= create();
-		a.m1();
-	}
-	A create(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/out/A.java
deleted file mode 100644
index 35d13b2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= create();
-		a.m1();
-	}
-	A create(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test65/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/in/A.java
deleted file mode 100644
index ccba566..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(){
-		A a= create();
-		a.m();
-	}
-	A create(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/out/A.java
deleted file mode 100644
index 5cc489b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-	void f(){
-		I a= create();
-		a.m();
-	}
-	I create(){
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test66/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/A.java
deleted file mode 100644
index 82243b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/Inter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/Inter.java
deleted file mode 100644
index 147dd9a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/Inter.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public interface Inter {
-	void work(A a);
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/Outer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/Outer.java
deleted file mode 100644
index e09d286..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/in/Outer.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-public class Outer{
-	public static class Implementor implements Inter{	
-		public void work(A a) {}
-	}
-	Implementor implementor;
-	void f(){
-		A a= new A();
-		implementor.work(a);
-	}
-}	

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/A.java
deleted file mode 100644
index 82243b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/Inter.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/Inter.java
deleted file mode 100644
index 147dd9a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/Inter.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public interface Inter {
-	void work(A a);
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/Outer.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/Outer.java
deleted file mode 100644
index e09d286..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test67/out/Outer.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-public class Outer{
-	public static class Implementor implements Inter{	
-		public void work(A a) {}
-	}
-	Implementor implementor;
-	void f(){
-		A a= new A();
-		implementor.work(a);
-	}
-}	

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/A.java
deleted file mode 100644
index 61b7b47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-	static A getA(){
-		return null;
-	}
-	public void m(){}
-	public void m1(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/As.java
deleted file mode 100644
index 5aa68d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/As.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		A a= A.getA();
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/A.java
deleted file mode 100644
index 61b7b47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-	static A getA(){
-		return null;
-	}
-	public void m(){}
-	public void m1(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/As.java
deleted file mode 100644
index 5aa68d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/As.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		A a= A.getA();
-		a.m1();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test68/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/A.java
deleted file mode 100644
index 61b7b47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-	static A getA(){
-		return null;
-	}
-	public void m(){}
-	public void m1(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/As.java
deleted file mode 100644
index 156c195..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/As.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		A a= A.getA();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/A.java
deleted file mode 100644
index be71c7e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-class A implements I {
-	static I getA(){
-		return null;
-	}
-	public void m(){}
-	public void m1(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/As.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/As.java
deleted file mode 100644
index 5dfb4a2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/As.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-/** typecomment template*/
-public class As {
-	void f(){
-		I a= A.getA();
-		a.m();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/I.java
deleted file mode 100644
index aa33e93..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test69/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/in/A.java
deleted file mode 100644
index 7514b5e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/in/I.java
deleted file mode 100644
index df6e9a1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/in/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-/** typecomment template*/
-interface I {
-	List m(Set set) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/out/A.java
deleted file mode 100644
index 7514b5e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/out/I.java
deleted file mode 100644
index df6e9a1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test6_/out/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-/** typecomment template*/
-interface I {
-	List m(Set set) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/in/A.java
deleted file mode 100644
index 7795837..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/in/I.java
deleted file mode 100644
index 62cc2fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/out/A.java
deleted file mode 100644
index 7795837..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-
-public class A implements I {
-	public void m() {}
-	public void m1() {}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/out/I.java
deleted file mode 100644
index 62cc2fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test70/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-public interface I {
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/in/A.java
deleted file mode 100644
index ab8e79e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set, Set set1) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/in/I.java
deleted file mode 100644
index 6729aef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/in/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.Set;
-import java.util.List;
-/** typecomment template*/
-interface I {
-	List m(Set set, Set set1) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/out/A.java
deleted file mode 100644
index ab8e79e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set, Set set1) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/out/I.java
deleted file mode 100644
index 6729aef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test7_/out/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.Set;
-import java.util.List;
-/** typecomment template*/
-interface I {
-	List m(Set set, Set set1) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/in/A.java
deleted file mode 100644
index f105f3a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set, String string) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/in/I.java
deleted file mode 100644
index 31f4af7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/in/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-/** typecomment template*/
-interface I {
-	List m(Set set, String string) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/out/A.java
deleted file mode 100644
index f105f3a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-class A implements I{
-	public List m(Set set, String string) throws IOException{
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/out/I.java
deleted file mode 100644
index 31f4af7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test8_/out/I.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-/** typecomment template*/
-interface I {
-	List m(Set set, String string) throws IOException;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/in/A.java
deleted file mode 100644
index 44f67ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public void m(int i, boolean b, short s, char c, long l, double d){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/in/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/in/I.java
deleted file mode 100644
index c2c8159..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/in/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m(int i, boolean b, short s, char c, long l, double d);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/out/A.java
deleted file mode 100644
index 44f67ab..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class A implements I{
-	public void m(int i, boolean b, short s, char c, long l, double d){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/out/I.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/out/I.java
deleted file mode 100644
index c2c8159..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/test9_/out/I.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-/** typecomment template*/
-interface I {
-	void m(int i, boolean b, short s, char c, long l, double d);
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew0/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew0/in/A.java
deleted file mode 100644
index 68e951a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew0/in/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//use Object
-class A{
-}
-class Test{
-	void test(){
-		A a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew0/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew0/out/A.java
deleted file mode 100644
index f33ec7f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew0/out/A.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package p;
-//use Object
-class A{
-}
-class Test{
-	void test(){
-		Object a= new A();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew1/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew1/in/A.java
deleted file mode 100644
index 35df66f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew1/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
-class Test{
-	void test() throws CloneNotSupportedException, InterruptedException{
-		A a= new A();
-		a.getClass();
-		a.equals(null);
-		a.hashCode();
-		a.notify();
-		a.notifyAll();
-		a.toString();
-		a.wait();
-		a.wait(0);
-		a.wait(0, 0);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew1/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew1/out/A.java
deleted file mode 100644
index fe63dff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew1/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
-class Test{
-	void test() throws CloneNotSupportedException, InterruptedException{
-		Object a= new A();
-		a.getClass();
-		a.equals(null);
-		a.hashCode();
-		a.notify();
-		a.notifyAll();
-		a.toString();
-		a.wait();
-		a.wait(0);
-		a.wait(0, 0);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/A.java
deleted file mode 100644
index f2da52e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A  extends B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/B.java
deleted file mode 100644
index b4d16e4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-	public int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/Test.java
deleted file mode 100644
index 686a1f3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(B b){
-		b.f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/A.java
deleted file mode 100644
index f2da52e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A  extends B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/B.java
deleted file mode 100644
index b4d16e4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-	public int f;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/Test.java
deleted file mode 100644
index 57aa14f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew10/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B a= new A();
-		test(a);
-	}
-	void test(B b){
-		b.f= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/A.java
deleted file mode 100644
index 610201d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/B.java
deleted file mode 100644
index 1176786..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface B{
-	public static final int f = 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/Test.java
deleted file mode 100644
index 668a1ad..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(B b){
-		int y= b.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/A.java
deleted file mode 100644
index 610201d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/B.java
deleted file mode 100644
index 1176786..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface B{
-	public static final int f = 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/Test.java
deleted file mode 100644
index 2903684..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew11/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B a= new A();
-		test(a);
-	}
-	void test(B b){
-		int y= b.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/A.java
deleted file mode 100644
index 610201d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/B.java
deleted file mode 100644
index 1176786..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface B{
-	public static final int f = 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/Test.java
deleted file mode 100644
index fae09f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(A b){
-		int y= b.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/A.java
deleted file mode 100644
index 610201d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/B.java
deleted file mode 100644
index 1176786..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface B{
-	public static final int f = 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/Test.java
deleted file mode 100644
index 2903684..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew12/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B a= new A();
-		test(a);
-	}
-	void test(B b){
-		int y= b.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/A.java
deleted file mode 100644
index 610201d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/B.java
deleted file mode 100644
index 1be7bd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface B{
-	void foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/Test.java
deleted file mode 100644
index cb21f6a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(A b){
-		b.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/A.java
deleted file mode 100644
index 610201d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/B.java
deleted file mode 100644
index 1be7bd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface B{
-	void foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/Test.java
deleted file mode 100644
index a7a4cd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew13/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B a= new A();
-		test(a);
-	}
-	void test(B b){
-		b.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/A.java
deleted file mode 100644
index b7caa13..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-//use B
-abstract class A implements B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/B.java
deleted file mode 100644
index 1be7bd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface B{
-	void foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/Test.java
deleted file mode 100644
index 2784a2b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= null;
-		test(a);
-	}
-	void test(A b){
-		b.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/A.java
deleted file mode 100644
index b7caa13..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-//use B
-abstract class A implements B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/B.java
deleted file mode 100644
index 1be7bd3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-interface B{
-	void foo();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/Test.java
deleted file mode 100644
index 6d15a3f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew14/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B a= null;
-		test(a);
-	}
-	void test(B b){
-		b.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/A.java
deleted file mode 100644
index 3169101..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public static final int f = 0;
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/B.java
deleted file mode 100644
index 93910c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/Test.java
deleted file mode 100644
index fae09f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(A b){
-		int y= b.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/A.java
deleted file mode 100644
index 3169101..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public static final int f = 0;
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/B.java
deleted file mode 100644
index 93910c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/Test.java
deleted file mode 100644
index fae09f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew15/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(A b){
-		int y= b.f;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/A.java
deleted file mode 100644
index 3169101..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public static final int f = 0;
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/B.java
deleted file mode 100644
index 93910c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/Test.java
deleted file mode 100644
index 9f63b12..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/in/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B b= new A();
-		if (b instanceof A){
-		} else{
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/A.java
deleted file mode 100644
index 3169101..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/A.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-//use B
-class A implements B{
-	public static final int f = 0;
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/B.java
deleted file mode 100644
index 93910c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-interface B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/Test.java
deleted file mode 100644
index 9f63b12..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew16/out/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B b= new A();
-		if (b instanceof A){
-		} else{
-		}
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew17/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew17/in/A.java
deleted file mode 100644
index 02be956..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew17/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//use C
-interface I{}
-class C implements I{
-}
-
-class B extends C{
-}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		A c= new A();
-		c.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew17/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew17/out/A.java
deleted file mode 100644
index 6ac86ac..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew17/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//use C
-interface I{}
-class C implements I{
-}
-
-class B extends C{
-}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		C c= new A();
-		c.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew18/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew18/in/A.java
deleted file mode 100644
index 333bb11..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew18/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//use B
-interface I{}
-class C implements I{
-}
-
-class B extends C{
-}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		A c= new A();
-		c.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew18/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew18/out/A.java
deleted file mode 100644
index c82a790..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew18/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//use B
-interface I{}
-class C implements I{
-}
-
-class B extends C{
-}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		B c= new A();
-		c.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew19/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew19/in/A.java
deleted file mode 100644
index d3c964b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew19/in/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//use I
-interface I{}
-class C implements I{
-}
-
-class B extends C{
-}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		A c= new A();
-		c.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew19/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew19/out/A.java
deleted file mode 100644
index e0e3df6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew19/out/A.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package p;
-//use I
-interface I{}
-class C implements I{
-}
-
-class B extends C{
-}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		I c= new A();
-		c.toString();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew2/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew2/in/A.java
deleted file mode 100644
index d48a194..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew2/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
-class Test{
-	void test(){
-		A a= new A();
-		a.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew2/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew2/out/A.java
deleted file mode 100644
index d48a194..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew2/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
-class Test{
-	void test(){
-		A a= new A();
-		a.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew20/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew20/in/A.java
deleted file mode 100644
index 24f6984..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew20/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//change to B
-class B{}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		A a= new A();
-		f(a);
-	}
-	void f(B b){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew20/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew20/out/A.java
deleted file mode 100644
index 51fb3ba..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew20/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//change to B
-class B{}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		B a= new A();
-		f(a);
-	}
-	void f(B b){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew21/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew21/in/A.java
deleted file mode 100644
index ad7b1a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew21/in/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//change to Object
-class B{}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		A a= new A();
-		f(a);
-	}
-	void f(B b){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew21/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew21/out/A.java
deleted file mode 100644
index ad7b1a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew21/out/A.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package p;
-//change to Object
-class B{}
-class A extends B{
-}
-
-class Test{
-	void f(){
-		A a= new A();
-		f(a);
-	}
-	void f(B b){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/A.java
deleted file mode 100644
index c301b57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-//change to B
-class A extends B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/B.java
deleted file mode 100644
index f0b30e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-class B{}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/Test.java
deleted file mode 100644
index daaaf59..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/in/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class Test{
-	A a;
-	void f(){
-		f(a);
-	}
-	void f(B b){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/A.java
deleted file mode 100644
index c301b57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-//change to B
-class A extends B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/B.java
deleted file mode 100644
index f0b30e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-class B{}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/Test.java
deleted file mode 100644
index 931ad74..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew22/out/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class Test{
-	B a;
-	void f(){
-		f(a);
-	}
-	void f(B b){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/A.java
deleted file mode 100644
index 4002c75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-//change to Object
-class A extends B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/B.java
deleted file mode 100644
index f0b30e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-class B{}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/Test.java
deleted file mode 100644
index daaaf59..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/in/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class Test{
-	A a;
-	void f(){
-		f(a);
-	}
-	void f(B b){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/A.java
deleted file mode 100644
index 4002c75..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-//change to Object
-class A extends B{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/B.java
deleted file mode 100644
index f0b30e1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/B.java
+++ /dev/null

@@ -1,2 +0,0 @@
-package p;
-class B{}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/Test.java
deleted file mode 100644
index daaaf59..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew23/out/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class Test{
-	A a;
-	void f(){
-		f(a);
-	}
-	void f(B b){
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/in/A.java
deleted file mode 100644
index aef777f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/in/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-//change to Object
-interface A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/in/B.java
deleted file mode 100644
index 1a09cbc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/in/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B implements A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/out/A.java
deleted file mode 100644
index aef777f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/out/A.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-//change to Object
-interface A{
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/out/B.java
deleted file mode 100644
index 1a09cbc..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew24/out/B.java
+++ /dev/null

@@ -1,3 +0,0 @@
-package p;
-class B implements A{
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/A.java
deleted file mode 100644
index cfe710f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-interface A{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/B.java
deleted file mode 100644
index 8beb399..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class B {
-	public B(A a){
-		a.m();
-	}
-	public void m() {	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/C.java
deleted file mode 100644
index f2c103d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/in/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class C extends B{
-	public C(A a, int i) {
-		super(a);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/A.java
deleted file mode 100644
index cfe710f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-interface A{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/B.java
deleted file mode 100644
index 8beb399..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/B.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-public class B {
-	public B(A a){
-		a.m();
-	}
-	public void m() {	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/C.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/C.java
deleted file mode 100644
index f2c103d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew25/out/C.java
+++ /dev/null

@@ -1,6 +0,0 @@
-package p;
-public class C extends B{
-	public C(A a, int i) {
-		super(a);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/in/A.java
deleted file mode 100644
index cfe710f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-interface A{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/in/B.java
deleted file mode 100644
index 2d2d084..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/in/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class B {
-	public B(A a){
-		a.m();
-	}
-	public B(int y, A a){
-		this(a);
-	}
-	public void m() {	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/out/A.java
deleted file mode 100644
index cfe710f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-interface A{
-	void m();
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/out/B.java
deleted file mode 100644
index 2d2d084..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew26/out/B.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-public class B {
-	public B(A a){
-		a.m();
-	}
-	public B(int y, A a){
-		this(a);
-	}
-	public void m() {	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/in/A.java
deleted file mode 100644
index 2d596b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/in/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//use B
-class A extends B{
-	void f(A a){
-		a.field= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/in/B.java
deleted file mode 100644
index 890f6c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class B {
-	int field= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/out/A.java
deleted file mode 100644
index 8652ee4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/out/A.java
+++ /dev/null

@@ -1,7 +0,0 @@
-package p;
-//use B
-class A extends B{
-	void f(B a){
-		a.field= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/out/B.java
deleted file mode 100644
index 890f6c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew27/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class B {
-	int field= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/in/A.java
deleted file mode 100644
index 11af736..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/in/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//use B
-class A extends B{
-	int field;
-	void f(A a){
-		a.field= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/in/B.java
deleted file mode 100644
index 890f6c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class B {
-	int field= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/out/A.java
deleted file mode 100644
index 11af736..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/out/A.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package p;
-//use B
-class A extends B{
-	int field;
-	void f(A a){
-		a.field= 0;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/out/B.java
deleted file mode 100644
index 890f6c5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew28/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-public class B {
-	int field= 0;
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew29/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew29/in/A.java
deleted file mode 100644
index a96448c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew29/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//change to B
-class B {
-} 
-class A extends B{
-    void f(A a){
-        A[] as= {a};
-        as[0].f(null);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew29/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew29/out/A.java
deleted file mode 100644
index a96448c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew29/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//change to B
-class B {
-} 
-class A extends B{
-    void f(A a){
-        A[] as= {a};
-        as[0].f(null);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew3/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew3/in/A.java
deleted file mode 100644
index e0ed591..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew3/in/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
-class Test{
-	void test() throws InterruptedException{
-		A a= new A();
-		a.getClass();
-		a.equals(null);
-		a.hashCode();
-		a.notify();
-		a.notifyAll();
-		a.toString();
-		a.wait();
-		a.wait(0);
-		a.wait(0, 0);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew3/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew3/out/A.java
deleted file mode 100644
index 1dd6103..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew3/out/A.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
-class Test{
-	void test() throws InterruptedException{
-		Object a= new A();
-		a.getClass();
-		a.equals(null);
-		a.hashCode();
-		a.notify();
-		a.notifyAll();
-		a.toString();
-		a.wait();
-		a.wait(0);
-		a.wait(0, 0);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew30/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew30/in/A.java
deleted file mode 100644
index 70e2962..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew30/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//change to B
-class B {
-} 
-class A extends B{
-    void f(A a){
-        A[] as= new A[]{a};
-        as[0].f(null);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew30/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew30/out/A.java
deleted file mode 100644
index 70e2962..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew30/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-//change to B
-class B {
-} 
-class A extends B{
-    void f(A a){
-        A[] as= new A[]{a};
-        as[0].f(null);
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew31/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew31/in/A.java
deleted file mode 100644
index a7589b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew31/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//change to B
-class B {
-} 
-class A extends B{
-    void f(){
-        A[] as= new A[0];
-        as[0].f();
-    }
-    void fz(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew31/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew31/out/A.java
deleted file mode 100644
index a7589b4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew31/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-//change to B
-class B {
-} 
-class A extends B{
-    void f(){
-        A[] as= new A[0];
-        as[0].f();
-    }
-    void fz(){}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew32/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew32/in/A.java
deleted file mode 100644
index a41ca90..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew32/in/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//change to B
-class B {
-} 
-class A extends B{
-	void f(){
-		A a= null;
-		A a1= a;
-		A a2= a1;
-		A a3= null;
-		a3.f();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew32/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew32/out/A.java
deleted file mode 100644
index a98d211..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew32/out/A.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package p;
-//change to B
-class B {
-} 
-class A extends B{
-	void f(){
-		B a= null;
-		B a1= a;
-		B a2= a1;
-		A a3= null;
-		a3.f();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew33/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew33/in/A.java
deleted file mode 100644
index 5b12fbb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew33/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-//change to Vector
-import java.util.Vector;
-
-class A extends Vector {
-    void foo() {
-        A bar= null;
-        System.out.println(bar.toString());
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew33/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew33/out/A.java
deleted file mode 100644
index 7fdfb01..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew33/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-//change to Vector
-import java.util.Vector;
-
-class A extends Vector {
-    void foo() {
-        Vector bar= null;
-        System.out.println(bar.toString());
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew34/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew34/in/A.java
deleted file mode 100644
index 30c1cf7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew34/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-//change to Vector
-import java.util.Vector;
-
-class A extends Vector {
-    void foo() {
-        A bar= null;
-        System.out.println(bar.firstElement());
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew34/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew34/out/A.java
deleted file mode 100644
index dd8dfbb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew34/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-//change to Vector
-import java.util.Vector;
-
-class A extends Vector {
-    void foo() {
-        Vector bar= null;
-        System.out.println(bar.firstElement());
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew35/in/A.java
deleted file mode 100644
index 8ed2fc2..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew35/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-//change to Vector
-import java.util.Vector;
-
-class A extends Vector {
-    void foo() {
-        A bar= null;
-        System.out.println(bar.capacity());
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew35/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew35/out/A.java
deleted file mode 100644
index 050f919..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew35/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-//change to Vector
-import java.util.Vector;
-
-class A extends Vector {
-    void foo() {
-        Vector bar= null;
-        System.out.println(bar.capacity());
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew36/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew36/in/A.java
deleted file mode 100644
index de7402f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew36/in/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class B {}
-class A extends B {}
-class Test{
-	void foo() {
-		A a= null;		
-		B b= (A) a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew36/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew36/out/A.java
deleted file mode 100644
index 0e90aaf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew36/out/A.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-
-class B {}
-class A extends B {}
-class Test{
-	void foo() {
-		B a= null;		
-		B b= (B) a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew37/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew37/in/A.java
deleted file mode 100644
index 3295d99..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew37/in/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class B {}
-class A extends B {}
-class Test{
-	void foo() {
-		A a= null;		
-		B b;
-		b= (A) a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew37/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew37/out/A.java
deleted file mode 100644
index 7ac949e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew37/out/A.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class B {}
-class A extends B {}
-class Test{
-	void foo() {
-		B a= null;		
-		B b;
-		b= (B) a;
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew38/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew38/in/A.java
deleted file mode 100644
index bb03522..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew38/in/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-
-interface B {
-	public abstract int foo();
-}
-
-public class A implements B {
-	public int foo() {
-		return 0;
-	}
-	
-}
-
-class Tester {
-	void bar() {
-		A t= null;
-		int i= t.foo();
-		t.hashCode();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew38/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew38/out/A.java
deleted file mode 100644
index 733687b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew38/out/A.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package p;
-
-interface B {
-	public abstract int foo();
-}
-
-public class A implements B {
-	public int foo() {
-		return 0;
-	}
-	
-}
-
-class Tester {
-	void bar() {
-		B t= null;
-		int i= t.foo();
-		t.hashCode();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/in/A.java
deleted file mode 100644
index 03608f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/in/Test.java
deleted file mode 100644
index 88c9b35..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/in/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class Test{
-	void test(){
-		A a= new A();
-		f(a);
-	}
-	void f(A a){
-		a.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/out/A.java
deleted file mode 100644
index 03608f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/out/Test.java
deleted file mode 100644
index 88c9b35..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew4/out/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class Test{
-	void test(){
-		A a= new A();
-		f(a);
-	}
-	void f(A a){
-		a.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/in/A.java
deleted file mode 100644
index 03608f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/in/Test.java
deleted file mode 100644
index dc51ed0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/in/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class Test{
-	void test(){
-		A a= new A();
-		f(a);
-	}
-	void f(A a){
-		a.getClass();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/out/A.java
deleted file mode 100644
index 03608f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/out/Test.java
deleted file mode 100644
index 6a28786..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew5/out/Test.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package p;
-class Test{
-	void test(){
-		Object a= new A();
-		f(a);
-	}
-	void f(Object a){
-		a.getClass();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/in/A.java
deleted file mode 100644
index 03608f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/in/Test.java
deleted file mode 100644
index f9a6139..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/in/Test.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class Test{
-	void test(){
-		A a= new A();
-		List list= new ArrayList(1);
-		list.add(a);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/out/A.java
deleted file mode 100644
index 03608f1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-class A{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/out/Test.java
deleted file mode 100644
index 6920e3c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew6/out/Test.java
+++ /dev/null

@@ -1,12 +0,0 @@
-package p;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class Test{
-	void test(){
-		Object a= new A();
-		List list= new ArrayList(1);
-		list.add(a);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/A.java
deleted file mode 100644
index 314eeed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A extends B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/B.java
deleted file mode 100644
index e099b0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-	public void fooB(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/Test.java
deleted file mode 100644
index af5a97e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(A a){
-		a.fooB();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/A.java
deleted file mode 100644
index 314eeed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A extends B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/B.java
deleted file mode 100644
index e099b0e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-	public void fooB(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/Test.java
deleted file mode 100644
index 92b9cda..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew7/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B a= new A();
-		test(a);
-	}
-	void test(B a){
-		a.fooB();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/A.java
deleted file mode 100644
index 314eeed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A extends B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/B.java
deleted file mode 100644
index 421cf56..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/Test.java
deleted file mode 100644
index 3e9cbf6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(A a){
-		a.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/A.java
deleted file mode 100644
index 314eeed..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use B
-class A extends B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/B.java
deleted file mode 100644
index 421cf56..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/B.java
+++ /dev/null

@@ -1,4 +0,0 @@
-package p;
-class B{
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/Test.java
deleted file mode 100644
index 6d99e1d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew8/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		B a= new A();
-		test(a);
-	}
-	void test(B a){
-		a.foo();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/in/A.java
deleted file mode 100644
index 99794fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/in/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-class A {
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/in/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/in/Test.java
deleted file mode 100644
index 500eb57..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/in/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		A a= new A();
-		test(a);
-	}
-	void test(Object o){
-		o.hashCode();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/out/A.java
deleted file mode 100644
index 99794fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/out/A.java
+++ /dev/null

@@ -1,5 +0,0 @@
-package p;
-//use Object
-class A {
-	public void foo(){};
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/out/Test.java b/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/out/Test.java
deleted file mode 100644
index fd7140d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/UseSupertypeWherePossible/testNew9/out/Test.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package p;
-
-class Test{
-	void test(){
-		Object a= new A();
-		test(a);
-	}
-	void test(Object o){
-		o.hashCode();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/templates/test/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/templates/test/in/A.java
deleted file mode 100644
index b23b2d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/templates/test/in/A.java
+++ /dev/null

@@ -1 +0,0 @@
-package p;
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/templates/test/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/templates/test/out/A.java
deleted file mode 100644
index b23b2d9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/templates/test/out/A.java
+++ /dev/null

@@ -1 +0,0 @@
-package p;
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/templates/testFail/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/templates/testFail/in/A.java
deleted file mode 100644
index ff4381d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/templates/testFail/in/A.java
+++ /dev/null

@@ -1 +0,0 @@
-package p;

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/AllTests.java
deleted file mode 100644
index 34646a4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/AllTests.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.actions;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-	
-	public static Test suite ( ) {
-		TestSuite suite= new TestSuite("All Action Tests");
-
-		suite.addTest(StructureSelectionActionTests.suite());
-		suite.addTest(GoToNextPreviousMemberActionTests.suite());
-		return suite;
-	}
-
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/GoToNextPreviousMemberActionTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/GoToNextPreviousMemberActionTests.java
deleted file mode 100644
index d68fb47..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/GoToNextPreviousMemberActionTests.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.actions;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.ISourceRange;
-
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.jdt.internal.ui.javaeditor.selectionactions.GoToNextPreviousMemberAction;
-
-public class GoToNextPreviousMemberActionTests extends RefactoringTest{
-
-	private static final Class clazz= GoToNextPreviousMemberActionTests.class;
-	private static final String REFACTORING_PATH= "GoToNextPreviousMemberAction/";
-	public GoToNextPreviousMemberActionTests(String name){
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	private String getSimpleTestFileName(){
-		return "A_" + getName() + ".java";
-	}
-	
-	private String getTestFileName(){
-		return TEST_PATH_PREFIX + getRefactoringPath() + getSimpleTestFileName();
-	}
-	
-	//------------
-	protected ICompilationUnit createCUfromTestFile() throws Exception {
-		return createCU(getPackageP(), getSimpleTestFileName(), getFileContents(getTestFileName()));
-	}
-	
-	private void helper(int startLine, int startColumn, int endLine, int endColumn, 
-											int expectedStartLine, int expectedStartColumn, boolean isSelectNext) throws Exception {
-		ICompilationUnit cu= createCUfromTestFile();
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ISourceRange actualNewRange= new GoToNextPreviousMemberAction(isSelectNext).getNewSelectionRange(selection, cu.getAllTypes());
-		ISourceRange expectedNewRange= TextRangeUtil.getSelection(cu, expectedStartLine, expectedStartColumn, expectedStartLine, expectedStartColumn);
-		assertEquals("incorrect selection offset", expectedNewRange.getOffset(), actualNewRange.getOffset());
-		assertEquals("incorrect selection length", expectedNewRange.getLength(), actualNewRange.getLength());
-	}	
-
-	private void helperNext(int startLine, int startColumn, int expectedStartLine, int expectedStartColumn) throws Exception{
-		helper(startLine, startColumn, startLine, startColumn, expectedStartLine, expectedStartColumn, true);										
-	}
-
-	private void helperPrevious(int startLine, int startColumn, int expectedStartLine, int expectedStartColumn) throws Exception{
-		helper(startLine, startColumn, startLine, startColumn, expectedStartLine, expectedStartColumn, false);			
-	}
-
-	//----
-	public void testPrevious0() throws Exception{
-		helperPrevious(6, 5, 5, 11);
-	}
-
-	public void testPrevious1() throws Exception{
-		helperPrevious(8, 5, 7, 6);
-	}
-
-	public void testPrevious2() throws Exception{
-		helperPrevious(3, 1, 3, 1);
-	}
-
-	public void testPrevious3() throws Exception{
-		helperPrevious(15, 9, 13, 6);
-	}
-
-	public void testPrevious4() throws Exception{
-		helperPrevious(19, 1, 18, 9);
-	}
-
-	public void testPrevious5() throws Exception{
-		helperPrevious(31, 10, 27, 10);
-	}
-
-	public void testPrevious6() throws Exception{
-		helperPrevious(35, 3, 34, 2);
-	}
-
-	public void testNext0() throws Exception{
-		helperNext(3, 1, 4, 7);
-	}
-
-	public void testNext1() throws Exception{
-		helperNext(27, 10, 31, 10);
-	}
-
-	public void testNext2() throws Exception{
-		helperNext(35, 2, 35, 2);
-	}
-
-	public void testNext3() throws Exception{
-		helperNext(19, 1, 20, 13);
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/StructureSelectionActionTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/StructureSelectionActionTests.java
deleted file mode 100644
index 0f814ec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/actions/StructureSelectionActionTests.java
+++ /dev/null

@@ -1,397 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.actions;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.corext.SourceRange;
-import org.eclipse.jdt.internal.ui.javaeditor.selectionactions.StructureSelectEnclosingAction;
-import org.eclipse.jdt.internal.ui.javaeditor.selectionactions.StructureSelectNextAction;
-import org.eclipse.jdt.internal.ui.javaeditor.selectionactions.StructureSelectPreviousAction;
-import org.eclipse.jdt.ui.tests.refactoring.AbstractSelectionTestCase;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-public class StructureSelectionActionTests extends RefactoringTest{
-	
-	private static final Class clazz= StructureSelectionActionTests.class;
-	private static final String REFACTORING_PATH= "StructureSelectionAction/";
-	
-	public StructureSelectionActionTests(String name){
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-	
-	private String getSimpleTestFileName(boolean input){
-		String fileName = "A_" + getName();
-		fileName += input ? "": "_out";
-		fileName +=  input ? ".java": ".txt"; 
-		return fileName;
-	}
-	
-	private String getTestFileName(boolean input){
-		return TEST_PATH_PREFIX + getRefactoringPath() + getSimpleTestFileName(input);
-	}
-	
-	//------------
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(input), getFileContents(getTestFileName(input)));
-	}
-	
-	private ISourceRange getSelection(ICompilationUnit cu) throws Exception{
-		String source= cu.getSource();
-		int offset= source.indexOf(AbstractSelectionTestCase.SQUARE_BRACKET_OPEN);
-		int end= source.indexOf(AbstractSelectionTestCase.SQUARE_BRACKET_CLOSE);
-		return new SourceRange(offset, end - offset);
-	}
-
-	private void check(ICompilationUnit cu, ISourceRange newRange) throws IOException, JavaModelException {
-		String expected= getFileContents(getTestFileName(false));
-		String actual= cu.getSource().substring(newRange.getOffset(), newRange.getOffset() + newRange.getLength());
-//		assertEquals("selection incorrect length", expected.length(), actual.length());
-		assertEqualLines("selection incorrect", expected, actual);
-	}	
-	
-	private void helperSelectUp() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true);
-		ISourceRange selection= getSelection(cu);
-
-		ISourceRange newRange= new StructureSelectEnclosingAction().getNewSelectionRange(selection, cu);
-		
-		check(cu, newRange);
-	}
-	
-	private void helperSelectUp(int startLine, int startColumn, int endLine, int endColumn) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ISourceRange newRange= new StructureSelectEnclosingAction().getNewSelectionRange(selection, cu);
-
-		check(cu, newRange);
-	}	
-	
-	private void helperSelectNext(int startLine, int startColumn, int endLine, int endColumn) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-
-		ISourceRange newRange= new StructureSelectNextAction().getNewSelectionRange(selection, cu);
-		check(cu, newRange);
-	}	
-	
-	private void helperSelectPrevious(int startLine, int startColumn, int endLine, int endColumn) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-
-		ISourceRange newRange= new StructureSelectPreviousAction().getNewSelectionRange(selection, cu);
-		check(cu, newRange);
-	}	
-		
-	private void helperZeroLength(int line, int column) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true);
-		ISourceRange selection= new SourceRange(TextRangeUtil.getOffset(cu, line, column), 1);
-			
-		//DebugUtils.dump(name() + ":<" + cu.getSource().substring(selection.getOffset()) + "/>");
-		
-		ISourceRange newRange= new StructureSelectEnclosingAction().getNewSelectionRange(selection, cu);
-		check(cu, newRange);
-	}
-	
-	private void offsetTest(int line, int column, int expected) throws Exception{
-		String filePath= TEST_PATH_PREFIX + getRefactoringPath() + "OffsetTest.java";
-		ICompilationUnit cu= createCU(getPackageP(), "OffsetTest.java", getFileContents(filePath));
-		assertEquals("incorrect offset", expected, TextRangeUtil.getOffset(cu, line, column));
-	}
-	
-
-	// ---- tests --- 
-	
-	public void test0() throws Exception{
-		helperSelectUp(4, 9, 4, 13);
-	}
-	
-	public void test1() throws Exception{
-		helperSelectUp();
-	}
-
-	public void test2() throws Exception{
-		helperSelectUp(4, 16, 4, 21);
-	}
-
-	public void test3() throws Exception{
-		helperSelectUp(4, 9, 4, 21);
-	}
-
-	public void test4() throws Exception{
-		helperSelectUp();
-	}
-	
-	public void test5() throws Exception{
-		helperSelectUp();
-	}
-	
-	public void test6() throws Exception{
-		helperSelectUp();
-	}
-
-	public void test7() throws Exception{
-		//helper1();
-		helperSelectUp(3, 10, 3, 14);
-	}
-
-	public void test8() throws Exception{
-		helperSelectUp(3, 16, 3, 18);
-	}
-
-	public void test9() throws Exception{
-		helperSelectUp(3, 10, 3, 11);
-	}
-	
-	public void test10() throws Exception{
-		helperSelectUp(4, 18, 4, 21);
-	}
-
-	public void test11() throws Exception{
-		helperSelectUp(4, 20, 4, 21);
-	}
-
-	public void test12() throws Exception{
-		helperSelectUp(4, 16, 4, 19);
-	}
-	
-	public void test13() throws Exception{
-		helperSelectUp(4, 13, 4, 16);
-	}
-	
-	public void test14() throws Exception{
-		helperSelectUp(4, 16, 4, 21);
-	}
-	
-	public void test15() throws Exception{
-		// identical to test9 ???
-		helperSelectUp(3, 10, 3, 11);
-	}
-	
-	public void test16() throws Exception{
-		helperSelectUp(3, 16, 3, 17);
-	}
-	
-	public void test17() throws Exception{
-		helperSelectUp(3, 5, 7, 6);
-	}
-	
-	public void test18() throws Exception{
-		helperSelectUp(3, 5, 4, 6);
-	}
-	
-	public void test19() throws Exception{
-		helperSelectUp(7, 14, 7, 16);
-	}
-	
-	public void test20() throws Exception{
-		helperSelectUp(4, 18, 4, 19);
-	}
-	
-	public void test21() throws Exception{
-		//regression test for bug#10182
-		//printTestDisabledMessage("regression test for bug#11151");
-		helperSelectNext(3, 21, 3, 28);
-	}
-	
-	public void test22() throws Exception{
-		//regression test for bug#10182
-		//printTestDisabledMessage("regression test for bug#11151");
-		helperSelectPrevious(3, 21, 3, 28);
-	}
-	
-	public void test23() throws Exception{
-//		printTestDisabledMessage("regression test for bug#10570");
-		helperSelectPrevious(5, 30, 7, 10);
-	}
-	
-	public void test24() throws Exception{
-		//regression test for bug#11424
-		helperSelectPrevious(3, 13, 5, 6);
-	}
-
-	public void test25() throws Exception{
-		//regression test for bug#11879
-		helperSelectNext(5, 5, 6, 6);
-	}
-	
-	public void test26() throws Exception{
-		//regression test for bug#11879
-		helperSelectPrevious(5, 5, 6, 6);
-	}
-	
-	public void test27() throws Exception{
-		//regression test for bug#11879
-		helperSelectNext(4, 1, 4, 10);
-	}
-
-	public void test28() throws Exception{
-		//regression test for bug#11879
-		helperSelectPrevious(4, 1, 4, 10);
-	}
-	
-	public void test29() throws Exception{
-//		printTestDisabledMessage("regression test for bug#16051");
-		helperSelectUp(5, 13, 5, 17);
-	}
-
-	public void test30() throws Exception{
-//		printTestDisabledMessage("regression test for bug#22082");
-		helperSelectUp(3, 10, 3, 10);
-	}
-	
-	public void test31() throws Exception{
-//		printTestDisabledMessage("regression test for bug#22082");
-		helperSelectUp(3, 10, 3, 10);
-	}
-
-	public void test32() throws Exception{
-//		printTestDisabledMessage("regression test for bug#22939");
-		helperSelectUp(4, 18, 4, 18);
-	}
-
-	public void test33() throws Exception{
-//		printTestDisabledMessage("regression test for bug#22939");
-		helperSelectUp(5, 23, 5, 23);
-	}
-
-	public void test34() throws Exception{
-//		printTestDisabledMessage("regression test for bug#23118");
-		helperSelectUp(5, 14, 5, 14);
-	}
-
-	public void test35() throws Exception{
-//		printTestDisabledMessage("regression test for bug#23118");
-		helperSelectUp(5, 14, 5, 14);
-	}
-
-	public void test36() throws Exception{
-//		printTestDisabledMessage("regression test for bug#23259");
-		helperSelectUp(5, 14, 5, 14);
-	}
-
-	public void test37() throws Exception{
-//		printTestDisabledMessage("regression test for bug#23259");
-		helperSelectUp(7, 14, 7, 14);
-	}
-
-	public void test38() throws Exception{
-//		printTestDisabledMessage("regression test for bug#23263");
-		helperSelectPrevious(4, 5, 5, 16);
-	}
-
-	public void test39() throws Exception{
-//		printTestDisabledMessage("regression test for bug#23464");
-		helperSelectPrevious(6, 13, 6, 20);
-	}
-
-	public void test40() throws Exception{
-//		printTestDisabledMessage("regression test for bug#23464 ");
-		helperSelectPrevious(7, 13, 7, 20);
-	}
-	
-	public void testZeroLength0() throws Exception{
-		//printTestDisabledMessage("");
-		helperZeroLength(4, 20);
-	}
-	
-	public void testZeroLength1() throws Exception{
-		helperSelectNext(4, 16, 4, 16);
-		helperSelectPrevious(4, 17, 4, 17);
-	}
-	
-	public void testZeroLength2() throws Exception{
-		helperSelectNext(4, 20, 4, 20);
-		helperSelectPrevious(4, 21, 4, 21);
-	}
-	
-	public void testZeroLength3() throws Exception{
-		helperSelectNext(3, 10, 3, 10);
-		helperSelectPrevious(3, 11, 3, 11);
-	}
-	
-	public void testZeroLength4() throws Exception{
-		helperSelectNext(4, 9, 4, 9);
-		helperSelectPrevious(4, 10, 4, 10);
-	}
-	
-	public void testZeroLength5() throws Exception{
-		helperSelectNext(4, 11, 4, 11);
-		helperSelectPrevious(4, 14, 4, 14);
-	}
-	
-	public void testWholeCu() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true);
-		ISourceRange selection= cu.getSourceRange();
-
-		ISourceRange newRange= new StructureSelectEnclosingAction().getNewSelectionRange(selection, cu);
-		
-		String expected= getFileContents(getTestFileName(false));
-		String actual= cu.getSource().substring(newRange.getOffset(), newRange.getOffset() + newRange.getLength());
-		assertEqualLines("selection incorrect", expected, actual);
-	}
-
-	//--- offset calculation tests
-	
-	public void testOffset0() throws Exception{
-		offsetTest(4, 20, 47);
-	}	
-	
-	public void testOffset1() throws Exception{
-		offsetTest(5, 9, 53);
-	}	
-	
-	public void testOffset2() throws Exception{
-		offsetTest(7, 13, 81);
-	}	
-	
-	public void testTabCount0(){
-		int t= TextRangeUtil.calculateTabCountInLine("\t\t1", 9);
-		assertEquals(2, t);
-	}
-	
-	public void testTabCount1(){
-		int t= TextRangeUtil.calculateTabCountInLine("\t\tint i= 1 + 1;", 20);
-		assertEquals(2, t);
-	}
-	
-	public void testTabCount2(){
-		int t= TextRangeUtil.calculateTabCountInLine("\t\t\treturn;", 13);
-		assertEquals(3, t);
-	}
-	
-	public void testTabCount3(){
-		int t= TextRangeUtil.calculateTabCountInLine("\tvoid m(){m();", 18);
-		assertEquals(1, t);
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/all/AllAllTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/all/AllAllTests.java
deleted file mode 100644
index a41d573..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/all/AllAllTests.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.all;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.TestOptionsSetup;
-
-public class AllAllTests {
-	public static Test suite ( ) {
-		TestSuite suite= new TestSuite("All Tests");
-		suite.addTest(org.eclipse.jdt.ui.tests.actions.AllTests.suite());
-		suite.addTest(org.eclipse.jdt.ui.tests.nls.AllTests.suite());
-		suite.addTest(org.eclipse.jdt.ui.tests.refactoring.AllTests.suite());
-		suite.addTest(org.eclipse.jdt.ui.tests.refactoring.extensions.AllTests.suite());
-		suite.addTest(org.eclipse.jdt.ui.tests.changes.AllTests.suite());
-		suite.addTest(org.eclipse.jdt.ui.tests.reorg.AllTests.suite());
-		suite.addTest(org.eclipse.jdt.ui.tests.typeconstraints.TypeConstraintTests.suite());
-	    return new TestOptionsSetup(suite);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/changes/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/changes/AllTests.java
deleted file mode 100644
index bf9e9c3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/changes/AllTests.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.changes;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class AllTests {
-	
-	public static Test suite ( ) {
-		TestSuite suite= new TestSuite("All Change Tests");
-		suite.addTest(TrackPositionTest.suite());
-	    return suite;
-	}
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/changes/TrackPositionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/changes/TrackPositionTest.java
deleted file mode 100644
index ac4dc8a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/changes/TrackPositionTest.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.changes;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-
-import org.eclipse.jdt.internal.corext.refactoring.changes.TextChangeCompatibility;
-import org.eclipse.ltk.core.refactoring.DocumentChange;
-
-public class TrackPositionTest extends TestCase {
-
-	private static final Class THIS= TrackPositionTest.class;
-	private static final String NN= "N.N";
-	
-	private IDocument fDocument;
-	private DocumentChange fChange;
-	
-	public TrackPositionTest(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new TestSuite(THIS);
-	}
-	
-	protected void setUp() throws Exception {
-		fDocument= new Document("0123456789");
-		fChange= new DocumentChange(NN, fDocument);
-		fChange.setKeepPreviewEdits(true);
-		fChange.initializeValidationData(new NullProgressMonitor());
-	}
-	
-	protected void tearDown() throws Exception {
-		fChange= null;
-	}
-
-	public void test1() throws Exception {
-		TextEdit edit= new ReplaceEdit(2, 2, "xyz");
-		TextChangeCompatibility.addTextEdit(fChange, NN, edit);
-		executeChange();
-		assertEquals(edit.getRegion(), 2, 3);
-	}
-	
-	public void test2() throws Exception {
-		TextEdit edit= new ReplaceEdit(5, 3, "xy");
-		TextChangeCompatibility.addTextEdit(fChange, NN, edit);
-		IDocument preview= fChange.getPreviewDocument(new NullProgressMonitor());
-		assertEquals(fDocument.get(), "0123456789");
-		assertEquals(preview.get(), "01234xy89");
-		assertEquals(fChange.getPreviewEdit(edit).getRegion(), 5, 2);
-	}
-		
-	private void executeChange() throws Exception {
-		try {
-			assertTrue(!fChange.isValid(new NullProgressMonitor()).hasFatalError());
-			fChange.perform(new NullProgressMonitor());
-		} finally {
-			fChange.dispose();
-		}
-	}
-	
-	private static void assertEquals(IRegion r, int offset, int length) {
-		assertEquals("Offset", offset, r.getOffset());
-		assertEquals("Length", length, r.getLength());	
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/AllTests.java
deleted file mode 100644
index eba091d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/AllTests.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class AllTests {
-	
-	public static Test suite ( ) {
-        TestSuite suite = new TestSuite();
-        // old
-        suite.addTest(NLSElementTester.suite());
-		suite.addTest(NLSScannerTester.suite());
-		suite.addTest(CellEditorTester.suite());
-
-		// new
-        suite.addTest(NlsRefactoringCheckInitialConditionsTest.allTests());
-        suite.addTest(NlsRefactoringCheckFinalConditionsTest.allTests());
-        suite.addTest(NlsRefactoringCreateChangeTest.allTests());
-        suite.addTest(NLSSourceModifierTest.allTests());
-        suite.addTest(NLSHintTest.allTests());
-        suite.addTest(PropertyFileDocumentModellTest.suite());
-        suite.addTest(SimpleLineReaderTest.suite());
-        suite.addTest(NLSHolderTest.suite());
-        suite.addTest(NLSSubstitutionTest.suite());
-
-        return suite;
-	}
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/CellEditorTester.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/CellEditorTester.java
deleted file mode 100644
index c7e191e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/CellEditorTester.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.ui.refactoring.nls.MultiStateCellEditor;
-
-
-public class CellEditorTester extends TestCase {
-
-	public CellEditorTester(String name) {
-		super(name);
-	}
-	
-	public static void main (String[] args) {
-		junit.textui.TestRunner.run (suite());
-	}
-	
-	public static Test suite() {
-		return new TestSuite(CellEditorTester.class);
-	}
-	
-	public void test0(){
-		MultiStateCellEditor ce= new MultiStateCellEditor(null, 3, 0);
-		assertTrue(ce.getValue().equals(new Integer(0)));	
-	}
-	
-	public void test1(){
-		MultiStateCellEditor ce= new MultiStateCellEditor(null, 3, 0);
-		ce.activate();
-		assertTrue(ce.getValue().equals(new Integer(1)));	
-	}
-	public void test2(){
-		MultiStateCellEditor ce= new MultiStateCellEditor(null, 3, 0);
-		ce.activate();
-		ce.activate();
-		assertTrue(ce.getValue().equals(new Integer(2)));	
-	}
-	
-	public void test3(){
-		MultiStateCellEditor ce= new MultiStateCellEditor(null, 3, 0);
-		ce.activate();
-		ce.activate();
-		ce.activate();
-		assertTrue(ce.getValue().equals(new Integer(0)));	
-	}
-	
-	public void test4(){
-		MultiStateCellEditor ce= new MultiStateCellEditor(null, 3, 0);
-		ce.setValue(new Integer(1));
-		assertTrue(ce.getValue().equals(new Integer(1)));	
-	}
-	
-	public void test5(){
-		MultiStateCellEditor ce= new MultiStateCellEditor(null, 3, 0);
-		ce.setValue(new Integer(2));
-		ce.activate();
-		assertTrue(ce.getValue().equals(new Integer(0)));	
-	}	
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSElementTester.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSElementTester.java
deleted file mode 100644
index 77af09b..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSElementTester.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSElement;
-
-
-public class NLSElementTester extends TestCase{
-	
-	public NLSElementTester(String name) {
-		super(name);
-	}
-	
-	private NLSElement fEl;
-	private int fOff, fLen;
-	private String fVal;
-	
-	
-	public static void main (String[] args) {
-		junit.textui.TestRunner.run (suite());
-	}
-	
-	public static Test suite() {
-		return new TestSuite(NLSElementTester.class);
-	}
-	
-	protected void setUp(){
-		fOff= 3;
-		fLen= 5;
-		fVal= "test"; //$NON-NLS-1$
-		fEl= new NLSElement(fVal, fOff, fLen, 0);
-	}
-	
-	protected void tearDown(){
-	}
-	
-	public void test0(){
-		assertEquals("Position offset", fOff, fEl.getPosition().getOffset()); //$NON-NLS-1$
-	}
-	
-	public void test1(){	
-		assertEquals("Position length", fLen, fEl.getPosition().getLength()); //$NON-NLS-1$
-	}
-	
-	public void test2(){		
-		assertEquals("value", fVal, fEl.getValue()); //$NON-NLS-1$
-	}
-	
-	public void test3(){	
-		assertEquals("tagposition", null, fEl.getTagPosition()); //$NON-NLS-1$
-	}
-	
-	public void test3a(){	
-		fEl.setTagPosition(1, 2);
-		assertEquals("tagposition.length", 2, fEl.getTagPosition().getLength()); //$NON-NLS-1$
-		assertEquals("tagposition.offset", 1, fEl.getTagPosition().getOffset()); //$NON-NLS-1$
-	}
-
-
-	public void test4(){	
-		assertEquals("hastag", false, fEl.hasTag()); //$NON-NLS-1$
-	}
-	
-	public void test4a(){	
-		fEl.setTagPosition(1, 2);
-		assertEquals("hastag", true, fEl.hasTag()); //$NON-NLS-1$
-	}
-		
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSHintTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSHintTest.java
deleted file mode 100644
index 5fad379..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSHintTest.java
+++ /dev/null

@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSHint;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ASTCreator;
-
-public class NLSHintTest extends TestCase {
-
-    private IJavaProject javaProject;
-
-    private IPackageFragmentRoot fSourceFolder;
-    
-    private final static String TEST_KLAZZ =
-        "public class Test {" +
-        "	private String str=TestMessages.getString(\"whateverKey\");//$NON-NLS-1$\n" +
-        "}\n";
-    
-    private final static String ACCESSOR_KLAZZ = 
-		"public class TestMessages {\n" +
-		"	private static final String BUNDLE_NAME = \"test.test\";//$NON-NLS-1$\n" +
-		"	public static String getString(String s) {" +
-		"		return \"\";\n" +
-		"	}\n" +
-		"}\n";
-
-    public NLSHintTest(String arg) {
-        super(arg);        
-    }
-    
-    public static Test allTests() {
-    	if (true) {
-    		return new ProjectTestSetup(new TestSuite(NLSHintTest.class));
-    	} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new NLSHintTest("testResourceBundleHint"));
-			return new ProjectTestSetup(suite);
-    	}
-	}
-	
-	public static Test suite() {
-		return allTests();		
-	}
-
-    protected void setUp() throws Exception {
-        javaProject = ProjectTestSetup.getProject();
-        fSourceFolder = JavaProjectHelper.addSourceContainer(javaProject, "src");                
-    }
-
-    protected void tearDown() throws Exception {        
-        JavaProjectHelper.clear(javaProject, ProjectTestSetup.getDefaultClasspath());        
-    }
-    
-    /*
-     * documents bug 57622.
-     */
-    public void testNlsedButNotTranslated() throws Exception {
-    	IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-    	String klazz = 
-    		"package test;\n" +
-    		"public class Test {" +
-			"	private String str=\"whateverKey\";//$NON-NLS-1$\n" +
-			"}\n";
-    	ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        NLSHint hint = createNLSHint(cu);
-        assertEquals("Messages", hint.getAccessorClassName());    		 
-    }
-    
-    /*
-     * documents bug 59074
-     */
-    public void testLooksLikeAccessor() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz =
-            "package test;\n" +
-            "public class Test {\n" +
-            "	String[] foo = {\"ab\", String.valueOf(Boolean.valueOf(\"cd\")), \"de\"}; //$NON-NLS-1$ //$NON-NLS-2$\n" +
-			"}\n";
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        NLSHint hint = createNLSHint(cu);
-        assertEquals("Messages", hint.getAccessorClassName());
-        assertEquals(pack, hint.getAccessorClassPackage());
-        assertEquals("messages.properties", hint.getResourceBundleName());
-        assertEquals(pack, hint.getResourceBundlePackage());
-   }
-    
-    /*
-     * nlsed-String must be an argument of method.
-     */
-    public void testNoAccessorClassHint1() throws Exception {
-    	IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-    	String klazz = 
-    		"package test;\n" +
-    		"public class Test {" +
-			"	private String str=\"whateverKey\".toString();//$NON-NLS-1$\n" +
-			"}\n";
-    	ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        NLSHint hint = createNLSHint(cu);
-        assertEquals("Messages", hint.getAccessorClassName());    		 
-    }
-       
-    /*
-     * method has no necessary static modifier. 
-     */
-    public void testNoAccessorClassHint2() throws Exception {
-    	IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-    	String klazz = 
-    		"package test;\n" +
-    		"public class Test {" +
-			"	private String str=new Wrong().meth(\"whatever\");//$NON-NLS-1$\n" +
-			"}\n";
-    	
-    	String klazz2 =
-    		"package test;\n" +
-			"public class Wrong {\n" +
-			"	public void meth(String str) {};\n" +
-			"}\n";
-    	ICompilationUnit cu= pack.createCompilationUnit("Wrong.java", klazz2, false, null);
-    	cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-    	
-        NLSHint hint = createNLSHint(cu);
-        assertEquals("Messages", hint.getAccessorClassName());    		 
-    }
-
-    /*
-     * accessor class does not exist.
-     */
-    public void testNoAccessorClassHint3() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz = "package test;\n" + TEST_KLAZZ;
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        NLSHint hint = createNLSHint(cu);
-        assertEquals("Messages", hint.getAccessorClassName());
-    }
-
-    public void testAccessorClassAndPackageHint() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz = "package test;\n" + TEST_KLAZZ;
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-                
-        klazz = "package test;\n" + ACCESSOR_KLAZZ;
-        pack.createCompilationUnit("TestMessages.java", klazz, false, null);
-        
-        NLSHint hint = createNLSHint(cu);
-        assertEquals("TestMessages", hint.getAccessorClassName());
-        assertEquals(pack, hint.getAccessorClassPackage());
-    }
-    
-	public void testPackageHintWithNoPackage() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("", false, null);
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", TEST_KLAZZ, false, null);                	
-        
-        pack.createCompilationUnit("TestMessages.java", ACCESSOR_KLAZZ, false, null);        
-        
-        NLSHint hint = createNLSHint(cu);        
-        assertEquals(pack, hint.getAccessorClassPackage());
-    }
-    
-    public void testPackageHintWithDifferentPackages() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz = 
-            "package test;\n" +
-            "import test.foo.TestMessages;\n" +
-            TEST_KLAZZ;	
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);        
-                
-        IPackageFragment fooPackage = fSourceFolder.createPackageFragment("test.foo", false, null);
-        klazz = "package test.foo;\n" + ACCESSOR_KLAZZ;
-        fooPackage.createCompilationUnit("TestMessages.java", klazz, false, null);
-                
-        NLSHint hint = createNLSHint(cu);
-        assertEquals(fooPackage, hint.getAccessorClassPackage());
-    }    
-
-    public void testResourceBundleHint() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz = "package test;\n" + TEST_KLAZZ;            
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        klazz = "package test;\n" +ACCESSOR_KLAZZ;        
-        pack.createCompilationUnit("TestMessages.java", klazz, false, null);
-        NLSHint hint = createNLSHint(cu);
-        assertEquals("test.properties", hint.getResourceBundleName());
-    }
-    
-    public void testResourceBundleHintWithDifferentPackagesAndClassGetName() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz =
-            "package test;\n" +
-        	"import test.foo.TestMessages;\n" +
-        	TEST_KLAZZ;
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        IPackageFragment fooPackage = fSourceFolder.createPackageFragment("test.foo", false, null);
-        klazz = 
-            "package test.foo;\n" +
-            "public class TestMessages {\n" +
-            "	private static final String BUNDLE_NAME = TestMessages.class.getName();\n" +
-            "	public static String getString(String s) {\n" +
-            "		return \"\"\n;" +
-            "	}\n" +
-            "}\n";
-        fooPackage.createCompilationUnit("TestMessages.java", klazz, false, null);        
-        
-        NLSHint hint = createNLSHint(cu);
-        assertEquals("TestMessages.properties", hint.getResourceBundleName());        
-    }
-    
-    public void testResourceBundlePackageHint() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz = 
-            "package test;\n" +
-        	"import test.foo.TestMessages;\n" +
-        	TEST_KLAZZ;
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        IPackageFragment fooPackage = fSourceFolder.createPackageFragment("test.foo", false, null);
-        fooPackage.createCompilationUnit("TestMessages.java", klazz, false, null);
-        
-        createResource(pack, "test.properties", "a=0");
-        NLSHint hint = createNLSHint(cu);
-        assertEquals(pack, hint.getResourceBundlePackage());
-    }
-    
-    public void testResourceBundlePackageHintWithClassGetName() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz = 
-            "package test;\n" +
-        	"import test.foo.TestMessages;\n" +
-        	TEST_KLAZZ;
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        IPackageFragment fooPackage = fSourceFolder.createPackageFragment("test.foo", false, null);
-        klazz = 
-            "package test.foo;\n" +
-            "public class TestMessages {\n" +
-            "	private static final String BUNDLE_NAME = TestMessages.class.getName();\n" +
-            "	public static String getString(String s) {\n" +
-            "		return \"\"\n;" +
-            "	}\n" +
-            "}\n";
-        fooPackage.createCompilationUnit("TestMessages.java", klazz, false, null); 
-        
-        createResource(fooPackage, "TestMessages.properties", "a=0");
-        NLSHint hint = createNLSHint(cu);
-        assertEquals(fooPackage, hint.getResourceBundlePackage());
-    }
-    
-    
-    
-    
-    public void testPackageHintWithoutPreviousNLSing() throws Exception {
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        String klazz = "package test;\n" + TEST_KLAZZ;
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        NLSHint hint = createNLSHint(cu);
-        assertEquals(pack, hint.getAccessorClassPackage());
-        assertEquals(pack, hint.getResourceBundlePackage());
-    }
-    
-    private IFile createResource(IPackageFragment pack, String resourceName, String content) throws Exception {
-	    IPath path = pack.getPath().append(resourceName);
-	    IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-	    InputStream is = new ByteArrayInputStream(content.getBytes()); 
-	    file.create(is, true, new NullProgressMonitor());	    
-	    is.close();
-        return file;
-	}
-    
-	private NLSHint createNLSHint(ICompilationUnit cu) {
-		CompilationUnit unit= ASTCreator.createAST(cu, null);
-		return new NLSHint(cu, unit);
-	}
-    
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSHolderTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSHolderTest.java
deleted file mode 100644
index ec08145..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSHolderTest.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSHint;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSSubstitution;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ASTCreator;
-
-public class NLSHolderTest extends TestCase {
-
-	private IJavaProject javaProject;
-
-	private IPackageFragmentRoot fSourceFolder;
-
-	private final static String ACCESSOR_KLAZZ= "package test;\n" + "public class TestMessages {\n" + "	private static final String BUNDLE_NAME = \"test.test\";//$NON-NLS-1$\n" + "	public static String getString(String s) {" + "		return \"\";\n" + "	}\n" + "}\n";
-
-	public NLSHolderTest(String arg) {
-		super(arg);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(NLSHolderTest.class));
-	}
-
-	public static Test suite() {
-		return allTests();
-	}
-
-	protected void setUp() throws Exception {
-		javaProject= ProjectTestSetup.getProject();
-		fSourceFolder= JavaProjectHelper.addSourceContainer(javaProject, "src");
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(javaProject, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	public void testSubstitutionWithAccessor() throws Exception {
-		String klazz= "package test;\n" + "public class Test {" + "	private String str=TestMessages.getString(\"Key.5\");//$NON-NLS-1$\n" + "}\n";
-		IPackageFragment pack= fSourceFolder.createPackageFragment("test", false, null);
-		ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-		pack.createCompilationUnit("TestMessages.java", ACCESSOR_KLAZZ, false, null);
-		
-		CompilationUnit astRoot= ASTCreator.createAST(cu, null);
-		NLSHint hint= new NLSHint(cu, astRoot);
-		NLSSubstitution[] substitution= hint.getSubstitutions();
-		assertEquals(substitution.length, 1);
-		assertEquals(substitution[0].getKey(), "Key.5");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSScannerTester.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSScannerTester.java
deleted file mode 100644
index e8d4d7f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSScannerTester.java
+++ /dev/null

@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSElement;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSLine;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSScanner;
-
-
-public class NLSScannerTester extends TestCase {
-
-
-	public NLSScannerTester(String name) {
-		super(name);
-	}
-	
-	public static void main (String[] args) {
-		junit.textui.TestRunner.run (suite());
-	}
-	
-	public static Test suite() {
-		return new TestSuite(NLSScannerTester.class);
-	}
-	
-	private void printDisabledMessage(String msg){
-		System.out.println("\nTest " + getName() + " disabled (" + msg + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	public void test0() throws Exception{
-		String text= "fred"; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		assertEquals("empty", true, l.length == 0); //$NON-NLS-1$
-	}
-	
-	public void test1() throws Exception{
-//		String text= "fred\"x\"";
-//		List l= NLSScanner.scan(text);
-//		assertEquals("non empty", false, l.isEmpty());
-//		assertEquals("1 line", 1, l.size());
-		printDisabledMessage("Scanner does not handle strings in the first line"); //$NON-NLS-1$
-	}
-	
-	public void test1a() throws Exception{
-		String text= "fred\n\"x\""; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		assertEquals("non empty", false, l.length == 0); //$NON-NLS-1$
-		assertEquals("1 line", 1,l.length); //$NON-NLS-1$
-	}
-	
-	public void test2() throws Exception{
-//		String text= "fred\"x\" \"xx\"";
-//		NLSLine[] l= NLSScanner.scan(text);
-//		assertEquals("non empty", false, l.isEmpty());
-//		assertEquals("2 line", 2,l.length);
-		printDisabledMessage("Scanner does not handle strings in the first line"); //$NON-NLS-1$
-	}
-	
-	public void test2a() throws Exception{
-		String text= "fred\n\"x\" \"xx\""; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		assertEquals("non empty", false, l.length == 0); //$NON-NLS-1$
-		assertEquals("1 lines", 1,l.length); //$NON-NLS-1$
-	}
-	
-	public void test3() throws Exception{
-//		String text= "fred\"x\"\n \"xx\"";
-//		NLSLine[] l= NLSScanner.scan(text);
-//		assertEquals("non empty", false, l.length == 0);
-//		assertEquals("2 lines", 2,l.length);
-		printDisabledMessage("Scanner does not handle strings in the first line"); //$NON-NLS-1$
-	}
-
-
-	public void test4() throws Exception{
-		String text= "fred\n \"xx\""; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		assertEquals("non empty", false, l.length == 0); //$NON-NLS-1$
-		assertEquals("1 line", 1,l.length); //$NON-NLS-1$
-	}
-	
-	public void test5() throws Exception{
-		String text= "\n \"xx\""; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("1 string", 1, line.size()); //$NON-NLS-1$
-	}	
-	
-	public void test6() throws Exception{
-		String text= "\n \"xx\" \"dff\""; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("2 string", 2, line.size()); //$NON-NLS-1$
-	}	
-	
-	public void test7() throws Exception{
-		String text= "\n \"xx\" \n\"dff\""; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("1 string A", 1, line.size()); //$NON-NLS-1$
-		
-		line= l[1];
-		assertEquals("1 string B", 1, line.size()); //$NON-NLS-1$
-	}	
-
-
-	public void test8() throws Exception{
-		String text= "\n \"xx\" \n\"dff\" \"ccc\""; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("1 string A", 1, line.size()); //$NON-NLS-1$
-		
-		line= l[1];
-		assertEquals("2 strings B", 2, line.size()); //$NON-NLS-1$
-	}
-	
-	public void test9() throws Exception{
-		String text= "fred\n \"xx\"" + NLSElement.createTagText(1) + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		NLSElement el= line.get(0);
-		assertEquals("has tag", true, el.hasTag()); //$NON-NLS-1$
-	}
-
-
-	public void test10() throws Exception{
-		String text= "fred\n \"xx\"\n"; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		NLSElement el= line.get(0);
-		assertEquals("has tag", false, el.hasTag()); //$NON-NLS-1$
-	}
-	
-	public void test11() throws Exception{
-		String text= 
-				"\n\"x\" \"y\"" //$NON-NLS-1$
-				+ NLSElement.createTagText(2) 
-				+ NLSElement.createTagText(1) 
-				+ "\n"; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("2 strings", 2, line.size()); //$NON-NLS-1$
-		
-		NLSElement el= line.get(0);
-		assertEquals("0 has tag", true, el.hasTag()); //$NON-NLS-1$
-		
-		el= line.get(1);
-		assertEquals("1 has tag", true, el.hasTag()); //$NON-NLS-1$
-	}
-	
-	public void test12() throws Exception{
-		String text= 
-				"\n\"x\" \"y\"" //$NON-NLS-1$
-				+ NLSElement.createTagText(1) 
-				+ NLSElement.createTagText(2) 
-				+ "\n"; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("2 strings", 2, line.size()); //$NON-NLS-1$
-		
-		NLSElement el= line.get(0);
-		assertEquals("0 has tag", true, el.hasTag()); //$NON-NLS-1$
-		
-		el= line.get(1);
-		assertEquals("1 has tag", true, el.hasTag()); //$NON-NLS-1$
-	}
-	
-	public void test13() throws Exception{
-		String text= 
-				"\n\"x\" \"y\"" //$NON-NLS-1$
-				+ NLSElement.createTagText(1) 
-				+ "\n"; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("2 strings", 2, line.size()); //$NON-NLS-1$
-		
-		NLSElement el= line.get(0);
-		assertEquals("0 has tag", true, el.hasTag()); //$NON-NLS-1$
-		
-		el= line.get(1);
-		assertEquals("1 has no tag", false, el.hasTag()); //$NON-NLS-1$
-	}
-	
-	public void test14() throws Exception{
-		String text= 
-				"\n\"x\" \"y\"" //$NON-NLS-1$
-				+ NLSElement.createTagText(2) 
-				+ "\n"; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("2 strings", 2, line.size()); //$NON-NLS-1$
-		
-		NLSElement el= line.get(0);
-		assertEquals("0 has no tag", false, el.hasTag()); //$NON-NLS-1$
-		
-		el= line.get(1);
-		assertEquals("1 has tag", true, el.hasTag()); //$NON-NLS-1$
-	}
-
-	//regression test for bug 12600
-	public void test54() throws Exception{
-		String text= 
-				"\n\"x\"" //$NON-NLS-1$
-				+ NLSElement.TAG_PREFIX + 1 
-				+ "\n"; //$NON-NLS-1$
-		NLSLine[] l= NLSScanner.scan(text);
-		NLSLine line=l[0];
-		assertEquals("1 strings", 1, line.size()); //$NON-NLS-1$
-		
-		NLSElement el= line.get(0);
-		assertEquals("0 has no tag", false, el.hasTag()); //$NON-NLS-1$
-		
-	}
-				
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSSourceModifierTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSSourceModifierTest.java
deleted file mode 100644
index ad932be..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSSourceModifierTest.java
+++ /dev/null

@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jface.text.Document;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSHint;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSRefactoring;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSSourceModifier;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSSubstitution;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ASTCreator;
-
-import org.eclipse.ltk.core.refactoring.TextChange;
-
-public class NLSSourceModifierTest extends TestCase {
-    
-    private IJavaProject javaProject;
-    
-    private IPackageFragmentRoot fSourceFolder;
-    
-    public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(NLSSourceModifierTest.class));
-	}
-	
-	public static Test suite() {
-		return allTests();		
-	}
-
-    protected void setUp() throws Exception {
-        javaProject = ProjectTestSetup.getProject();
-        fSourceFolder = JavaProjectHelper.addSourceContainer(javaProject, "src");                
-    }
-
-    protected void tearDown() throws Exception {        
-        JavaProjectHelper.clear(javaProject, ProjectTestSetup.getDefaultClasspath());        
-    }
-       
-    public NLSSourceModifierTest(String name) {
-        super(name); 
-    }
-    
-    public void testFromSkippedToTranslated() throws Exception {
-        
-        String klazz =
-            "public class Test {\n" +
-            "	private String str=\"whatever\";\n" +
-            "}\n"; 
-        
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        CompilationUnit astRoot= createAST(cu);
-        NLSSubstitution[] nlsSubstitutions = getSubstitutions(cu, astRoot);
-        NLSSubstitution.setPrefix("key.");
-        nlsSubstitutions[0].setState(NLSSubstitution.EXTERNALIZED);
-        nlsSubstitutions[0].generateKey(nlsSubstitutions);
-        
-        String defaultSubst= NLSRefactoring.getDefaultSubstitutionPattern();
-        TextChange change = (TextChange) NLSSourceModifier.create(cu, nlsSubstitutions, defaultSubst, pack, "Accessor");
-        
-        Document doc = new Document(klazz);
-        change.getEdit().apply(doc);
-        
-        assertEquals(
-                "public class Test {\n" +
-                "	private String str=Accessor.getString(\"key.0\"); //$NON-NLS-1$\n" +
-            	"}\n", 
-            	doc.get());
-    }
-    
-    public void testFromSkippedToNotTranslated() throws Exception {
-        
-        String klazz =
-            "public class Test {\n" +
-            "	private String str=\"whatever\";\n" +
-            "}\n"; 
-        
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        CompilationUnit astRoot= createAST(cu);
-        NLSSubstitution[] nlsSubstitutions = getSubstitutions(cu, astRoot);
-        NLSSubstitution.setPrefix("key.");
-        nlsSubstitutions[0].setState(NLSSubstitution.IGNORED);
-        
-        String defaultSubst= NLSRefactoring.getDefaultSubstitutionPattern();
-        TextChange change = (TextChange) NLSSourceModifier.create(cu, nlsSubstitutions, defaultSubst, pack, "Accessor");
-        
-        Document doc = new Document(klazz);
-        change.getEdit().apply(doc);
-        
-        assertEquals(
-                "public class Test {\n" +
-                "	private String str=\"whatever\"; //$NON-NLS-1$\n" +
-                "}\n",  
-            	doc.get());
-    }
-    
-    /*
-     * TODO: the key should be 0
-     */
-    public void testFromNotTranslatedToTranslated() throws Exception {
-        
-        String klazz =
-            "public class Test {\n" +
-            "	private String str=\"whatever\"; //$NON-NLS-1$\n" +
-            "}\n"; 
-        
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        CompilationUnit astRoot= createAST(cu);
-        NLSSubstitution[] nlsSubstitutions = getSubstitutions(cu, astRoot);
-        NLSSubstitution.setPrefix("key.");
-        nlsSubstitutions[0].setState(NLSSubstitution.EXTERNALIZED);
-        nlsSubstitutions[0].generateKey(nlsSubstitutions);
-        
-        String defaultSubst= NLSRefactoring.getDefaultSubstitutionPattern();
-        TextChange change = (TextChange) NLSSourceModifier.create(cu, nlsSubstitutions, defaultSubst, pack, "Accessor");
-        
-        Document doc = new Document(klazz);
-        change.getEdit().apply(doc);
-        
-        assertEquals(
-                "public class Test {\n" +
-                "	private String str=Accessor.getString(\"key.0\"); //$NON-NLS-1$\n" +
-            	"}\n", 
-            	doc.get());
-    }
-    
-    public void testFromNotTranslatedToSkipped() throws Exception {
-        
-        String klazz =
-            "public class Test {\n" +
-            "	private String str=\"whatever\"; //$NON-NLS-1$\n" +
-            "}\n"; 
-        
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        ICompilationUnit cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        CompilationUnit astRoot= createAST(cu);
-        NLSSubstitution[] nlsSubstitutions = getSubstitutions(cu, astRoot);
-        NLSSubstitution.setPrefix("key.");
-        nlsSubstitutions[0].setState(NLSSubstitution.INTERNALIZED);
-        
-        String defaultSubst= NLSRefactoring.getDefaultSubstitutionPattern();
-        TextChange change = (TextChange) NLSSourceModifier.create(cu, nlsSubstitutions, defaultSubst, pack, "Accessor");
-        
-        Document doc = new Document(klazz);
-        change.getEdit().apply(doc);
-        
-        assertEquals(
-                "public class Test {\n" +
-                "	private String str=\"whatever\"; \n" +
-                "}\n",  
-            	doc.get());
-    }
-    
-	private NLSSubstitution[] getSubstitutions(ICompilationUnit cu, CompilationUnit astRoot) {
-		NLSHint hint= new NLSHint(cu, astRoot);
-		return hint.getSubstitutions();
-	}
-
-	public void testFromTranslatedToNotTranslated() throws Exception {
-        
-        String klazz =
-            "package test;\n" +
-            "public class Test {\n" +
-            "	private String str=Accessor.getString(\"key.0\"); //$NON-NLS-1$\n" +
-            "}\n"; 
-        
-        String accessorKlazz =
-            "package test;\n" +
-    		"public class Accessor {\n" +
-    		"	private static final String BUNDLE_NAME = \"test.test\";//$NON-NLS-1$\n" +
-    		"	public static String getString(String s) {\n" +
-    		"		return \"\";\n" +
-    		"	}\n" +
-    		"}\n";
-        
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        ICompilationUnit cu= pack.createCompilationUnit("Accessor.java", accessorKlazz, false, null);
-        cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        CompilationUnit astRoot= createAST(cu);
-        NLSSubstitution[] nlsSubstitutions = getSubstitutions(cu, astRoot);
-        NLSSubstitution.setPrefix("key.");
-        nlsSubstitutions[0].setValue("whatever");
-        nlsSubstitutions[0].setState(NLSSubstitution.IGNORED);
-        
-        String defaultSubst= NLSRefactoring.getDefaultSubstitutionPattern();
-        TextChange change = (TextChange) NLSSourceModifier.create(cu, nlsSubstitutions, defaultSubst, pack, "Accessor");
-        
-        Document doc = new Document(klazz);
-        change.getEdit().apply(doc);
-        
-        assertEquals(
-                "package test;\n" +
-                "public class Test {\n" +
-                "	private String str=\"whatever\"; //$NON-NLS-1$\n" +
-                "}\n",  
-            	doc.get());
-    }
-    
-    public void testFromTranslatedToSkipped() throws Exception {
-        
-        String klazz =
-            "package test;\n" +
-            "public class Test {\n" +
-            "	private String str=Accessor.getString(\"key.0\"); //$NON-NLS-1$\n" +
-            "}\n"; 
-        
-        String accessorKlazz =
-            "package test;\n" +
-    		"public class Accessor {\n" +
-    		"	private static final String BUNDLE_NAME = \"test.test\";//$NON-NLS-1$\n" +
-    		"	public static String getString(String s) {\n" +
-    		"		return \"\";\n" +
-    		"	}\n" +
-    		"}\n";
-        
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        ICompilationUnit cu= pack.createCompilationUnit("Accessor.java", accessorKlazz, false, null);
-        cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        CompilationUnit astRoot= createAST(cu);
-        NLSSubstitution[] nlsSubstitutions = getSubstitutions(cu, astRoot);
-        NLSSubstitution.setPrefix("key.");
-        nlsSubstitutions[0].setValue("whatever");
-        nlsSubstitutions[0].setState(NLSSubstitution.INTERNALIZED);
-        
-        String defaultSubst= NLSRefactoring.getDefaultSubstitutionPattern();
-        TextChange change = (TextChange) NLSSourceModifier.create(cu, nlsSubstitutions, defaultSubst, pack, "Accessor");
-        
-        Document doc = new Document(klazz);
-        change.getEdit().apply(doc);
-        
-        assertEquals(
-                "package test;\n" +
-                "public class Test {\n" +
-                "	private String str=\"whatever\"; \n" +
-                "}\n",  
-            	doc.get());
-    }
-    
-    public void testReplacementOfKey() throws Exception {        
-        String klazz =
-            "package test;\n" +
-            "public class Test {\n" +
-            "	private String str=Accessor.getString(\"key.0\"); //$NON-NLS-1$\n" +
-            "}\n"; 
-        
-        String accessorKlazz =
-            "package test;\n" +
-    		"public class Accessor {\n" +
-    		"	private static final String BUNDLE_NAME = \"test.test\";//$NON-NLS-1$\n" +
-    		"	public static String getString(String s) {\n" +
-    		"		return \"\";\n" +
-    		"	}\n" +
-    		"}\n";
-        
-        IPackageFragment pack = fSourceFolder.createPackageFragment("test", false, null);
-        ICompilationUnit cu= pack.createCompilationUnit("Accessor.java", accessorKlazz, false, null);
-        cu= pack.createCompilationUnit("Test.java", klazz, false, null);
-        
-        CompilationUnit astRoot= createAST(cu);
-        NLSSubstitution[] nlsSubstitutions = getSubstitutions(cu, astRoot);
-        nlsSubstitutions[0].setKey("nls.0");        
-        
-        String defaultSubst= NLSRefactoring.getDefaultSubstitutionPattern();
-        TextChange change = (TextChange) NLSSourceModifier.create(cu, nlsSubstitutions, defaultSubst, pack, "Accessor");
-        
-        Document doc = new Document(klazz);
-        change.getEdit().apply(doc);
-        
-        assertEquals(
-                "package test;\n" +
-                "public class Test {\n" +
-                "	private String str=Accessor.getString(\"nls.0\"); //$NON-NLS-1$\n" +
-                "}\n",  
-            	doc.get());
-    }
-
-	private CompilationUnit createAST(ICompilationUnit cu) {
-		return ASTCreator.createAST(cu, null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSSubstitutionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSSubstitutionTest.java
deleted file mode 100644
index 3719efe..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NLSSubstitutionTest.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSSubstitution;
-
-public class NLSSubstitutionTest extends TestCase {
-	
-	public NLSSubstitutionTest(String name) {
-		super(name);
-	}
-	
-	public static TestSuite suite() {
-		return new TestSuite(NLSSubstitutionTest.class);
-	}
-	
-	public void testGeneratedKey() {
-	    NLSSubstitution.setPrefix("key.");
-		NLSSubstitution[] substitutions = {
-				new NLSSubstitution(NLSSubstitution.EXTERNALIZED, "key.0", "v1", null, null),
-				new NLSSubstitution(NLSSubstitution.EXTERNALIZED, "key.2", "v2", null, null)
-				};
-		
-		NLSSubstitution subs = new NLSSubstitution(NLSSubstitution.IGNORED, "v1", null);
-		subs.setState(NLSSubstitution.EXTERNALIZED);
-		subs.generateKey(substitutions);
-		assertEquals(subs.getKey(), "key.1");
-	}
-	
-	public void testGeneratedKey2() {
-	    NLSSubstitution.setPrefix("key.");
-		NLSSubstitution[] substitutions = {
-				new NLSSubstitution(NLSSubstitution.EXTERNALIZED, "key.0", "v1", null, null),
-				new NLSSubstitution(NLSSubstitution.INTERNALIZED, "v2", null)
-				};
-		substitutions[1].setState(NLSSubstitution.EXTERNALIZED);
-		substitutions[1].generateKey(substitutions);
-			
-		NLSSubstitution subs = new NLSSubstitution(NLSSubstitution.IGNORED, "v1", null);
-		subs.setState(NLSSubstitution.EXTERNALIZED);
-		subs.generateKey(substitutions);
-		assertEquals(subs.getKey(), "key.2");
-	}
-	
-	public void testGetKeyWithoutPrefix() {
-	    NLSSubstitution.setPrefix("test.");
-	    NLSSubstitution substitution = new NLSSubstitution(NLSSubstitution.EXTERNALIZED, "key", "value", null, null);
-	    assertEquals("key", substitution.getKey());
-	}
-	
-	public void testGetKeyWithPrefix() {
-	    NLSSubstitution.setPrefix("test.");
-	    NLSSubstitution substitution = new NLSSubstitution(NLSSubstitution.INTERNALIZED, "value", null);
-	    substitution.setState(NLSSubstitution.EXTERNALIZED);
-	    substitution.setKey("key");
-	    assertEquals("test.key", substitution.getKey());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCheckFinalConditionsTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCheckFinalConditionsTest.java
deleted file mode 100644
index a5274d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCheckFinalConditionsTest.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSMessages;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSRefactoring;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSSubstitution;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry;
-
-public class NlsRefactoringCheckFinalConditionsTest extends TestCase {
-
-	//private IPath fPropertyFilePath;
-	private IPackageFragment fAccessorPackage;
-	private String fAccessorClassName;
-	private String fSubstitutionPattern;
-	private NlsRefactoringTestHelper fHelper;
-	private IJavaProject javaProject;
-	private IPackageFragment fResourceBundlePackage;
-	private String fResourceBundleName;
-
-	public NlsRefactoringCheckFinalConditionsTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(NlsRefactoringCheckFinalConditionsTest.class));
-	}
-
-	public static Test suite() {
-		return allTests();
-	}
-
-	protected void setUp() throws Exception {
-		javaProject= ProjectTestSetup.getProject();
-		fHelper= new NlsRefactoringTestHelper(javaProject);
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(javaProject, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	public void testCheckInputWithoutExistingPropertiesFile() throws Exception {
-		ICompilationUnit cu= fHelper.getCu("/TestSetupProject/src1/p/WithStrings.java");
-		IFile propertyFile= fHelper.getFile("/TestSetupProject/src2/p/test.properties");
-		propertyFile.delete(false, fHelper.fNpm);
-		initDefaultValues(cu);
-
-		RefactoringStatus res= createCheckInputStatus(cu);
-
-		assertFalse("should info about properties", res.isOK());
-
-		assertEquals("one info", 1, res.getEntries().length);
-		RefactoringStatusEntry help= res.getEntryAt(0);
-		assertEquals("info", RefactoringStatus.INFO, help.getSeverity());
-		assertEquals(NLSMessages.getFormattedString("NLSRefactoring.will_be_created", propertyFile.getFullPath().toString()), help.getMessage());
-	}
-
-	/*
-	 * no substitutions -> nothing to do
-	 */
-	public void testCheckInputWithNoSubstitutions() throws Exception {
-		ICompilationUnit cu= fHelper.getCu("/TestSetupProject/src1/p/WithoutStrings.java"); //$NON-NLS-1$
-		initDefaultValues(cu);
-
-		checkNothingToDo(createCheckInputStatus(cu));
-	}
-
-	/*
-	 * substitution checks
-	 */
-	public void testCheckInputWithSubstitutionPatterns() throws Exception {
-		ICompilationUnit cu= fHelper.getCu("/TestSetupProject/src1/p/WithStrings.java"); //$NON-NLS-1$
-		initDefaultValues(cu);
-
-		fSubstitutionPattern= ""; //$NON-NLS-1$
-
-		RefactoringStatus res= createCheckInputStatus(cu);
-
-		RefactoringStatusEntry[] results= res.getEntries();
-
-		assertEquals("substitution pattern must be given", 2, results.length); //$NON-NLS-1$
-		assertEquals("first is fatal", RefactoringStatus.ERROR, results[0].getSeverity()); //$NON-NLS-1$
-		assertEquals("right fatal message", //$NON-NLS-1$
-				NLSMessages.getString("NLSRefactoring.pattern_empty"), //$NON-NLS-1$
-				results[0].getMessage());
-
-		assertEquals("warning no key given", RefactoringStatus.WARNING, //$NON-NLS-1$
-				results[1].getSeverity());
-		assertEquals("right warning message", //$NON-NLS-1$
-				NLSMessages.getFormattedString("NLSRefactoring.pattern_does_not_contain", //$NON-NLS-1$
-						"${key}"), results[1].getMessage()); //$NON-NLS-1$
-
-		fSubstitutionPattern= "blabla${key}"; //$NON-NLS-1$
-		res= createCheckInputStatus(cu);
-		assertTrue("substitution pattern ok", res.isOK()); //$NON-NLS-1$
-
-		fSubstitutionPattern= "${key}blabla${key}"; //$NON-NLS-1$
-		res= createCheckInputStatus(cu);
-		assertFalse("substitution pattern ko", res.isOK()); //$NON-NLS-1$
-
-		results= res.getEntries();
-		assertEquals("one warning", 1, results.length); //$NON-NLS-1$
-		assertEquals("warning", RefactoringStatus.WARNING, results[0].getSeverity()); //$NON-NLS-1$
-		assertEquals("warning message", //$NON-NLS-1$
-				NLSMessages.getFormattedString("NLSRefactoring.Only_the_first_occurrence_of", //$NON-NLS-1$
-						"${key}"), results[0].getMessage()); //$NON-NLS-1$
-
-		// check for duplicate keys????
-		// check for keys already defined
-		// check for keys
-	}
-
-	private RefactoringStatus createCheckInputStatus(ICompilationUnit cu) throws CoreException {
-		NLSRefactoring refac= prepareRefac(cu);
-		RefactoringStatus res= refac.checkFinalConditions(fHelper.fNpm);
-		return res;
-	}
-
-	private void initDefaultValues(ICompilationUnit cu) {
-		//fPropertyFilePath= fHelper.getFile("/TestSetupProject/src2/p/test.properties").getFullPath(); //$NON-NLS-1$
-		fResourceBundlePackage= fHelper.getPackageFragment("/TestSetupProject/src2/p");
-		fResourceBundleName= "test.properties";
-		fAccessorPackage= fHelper.getPackageFragment("/TestSetupProject/src1/p"); //$NON-NLS-1$
-		fAccessorClassName= "Help"; //$NON-NLS-1$
-		fSubstitutionPattern= "${key}"; //$NON-NLS-1$
-	}
-
-	private NLSRefactoring prepareRefac(ICompilationUnit cu) {
-		NLSRefactoring refac= NLSRefactoring.create(cu);
-		NLSSubstitution[] subs= refac.getSubstitutions();
-		refac.setPrefix("");
-		for (int i= 0; i < subs.length; i++) {
-			subs[i].setState(NLSSubstitution.EXTERNALIZED);
-			subs[i].generateKey(subs);
-		}
-		fillInValues(refac);
-		return refac;
-	}
-
-	private void checkNothingToDo(RefactoringStatus status) {
-		assertEquals("fatal error expected", 1, status.getEntries().length); //$NON-NLS-1$
-
-		RefactoringStatusEntry fatalError= status.getEntryAt(0);
-		assertEquals("fatalerror", RefactoringStatus.FATAL, fatalError.getSeverity()); //$NON-NLS-1$
-		assertEquals("errormessage", //$NON-NLS-1$
-				NLSMessages.getString("NLSRefactoring.nothing_to_do"), //$NON-NLS-1$
-				fatalError.getMessage());
-	}
-
-	private void fillInValues(NLSRefactoring refac) {
-		refac.setAccessorClassPackage(fAccessorPackage);
-		//refac.setPropertyFilePath(fPropertyFilePath);
-		refac.setResourceBundleName(fResourceBundleName);
-		refac.setResourceBundlePackage(fResourceBundlePackage);
-		refac.setAccessorClassName(fAccessorClassName);
-		refac.setSubstitutionPattern(fSubstitutionPattern);
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCheckInitialConditionsTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCheckInitialConditionsTest.java
deleted file mode 100644
index 68ee126..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCheckInitialConditionsTest.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSRefactoring;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class NlsRefactoringCheckInitialConditionsTest extends TestCase {
-
-	private NlsRefactoringTestHelper fHelper;
-	private IJavaProject javaProject;
-
-	public NlsRefactoringCheckInitialConditionsTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(NlsRefactoringCheckInitialConditionsTest.class));
-	}
-
-	public static Test suite() {
-		return allTests();
-	}
-
-	protected void setUp() throws Exception {
-		javaProject= ProjectTestSetup.getProject();
-		fHelper= new NlsRefactoringTestHelper(javaProject);
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(javaProject, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	protected String getRefactoringPath() {
-		return "nls/"; //$NON-NLS-1$
-	}
-
-	public void testActivationWithoutStrings() throws Exception {
-		ICompilationUnit cu= fHelper.getCu("/TestSetupProject/src1/p/WithoutStrings.java"); //$NON-NLS-1$
-		Refactoring refac= NLSRefactoring.create(cu);
-
-		RefactoringStatus res= refac.checkInitialConditions(fHelper.fNpm);
-		assertFalse("no nls needed", res.isOK()); //$NON-NLS-1$
-	}
-
-	public void testActivationWithStrings() throws Exception {
-		ICompilationUnit cu= fHelper.getCu("/TestSetupProject/src1/p/WithStrings.java"); //$NON-NLS-1$
-		Refactoring refac= NLSRefactoring.create(cu);
-
-		RefactoringStatus res= refac.checkInitialConditions(fHelper.fNpm);
-		assertTrue("nls needed", res.isOK()); //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCreateChangeTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCreateChangeTest.java
deleted file mode 100644
index e433921..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringCreateChangeTest.java
+++ /dev/null

@@ -1,707 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSRefactoring;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSSubstitution;
-
-import org.eclipse.ltk.core.refactoring.Change;
-
-public class NlsRefactoringCreateChangeTest extends TestCase {
-
-	private NlsRefactoringTestHelper fHelper;
-	private IJavaProject fJavaProject;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public NlsRefactoringCreateChangeTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(NlsRefactoringCreateChangeTest.class));
-	}
-
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new NlsRefactoringCreateChangeTest("testRenameToDuplicate"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-	protected void setUp() throws Exception {
-		fJavaProject= ProjectTestSetup.getProject();
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fHelper= new NlsRefactoringTestHelper(fJavaProject);
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJavaProject, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	public void testWithoutPreviousNlsing() throws Exception {
-
-		fHelper.createPackageFragment("p2", "/TestSetupProject/src2"); //$NON-NLS-1$//$NON-NLS-2$
-
-		ICompilationUnit cu= RefactoringTest.createCU(fHelper.getPackageFragment("/TestSetupProject/src1/p"), "Test.java", //$NON-NLS-1$//$NON-NLS-2$
-				"package p;\r\nclass Test {String hello=\"helloworld\";}"); //$NON-NLS-1$
-
-		NLSRefactoring nls= createDefaultNls(cu);
-		nls.setAccessorClassPackage(fHelper.getPackageFragment("/TestSetupProject/src2/p2")); //$NON-NLS-1$
-
-		performChange(nls);
-
-		checkContentOfCu("manipulated class", cu, "package p;\r\n\r\nimport p2.Messages;\r\n\r\nclass Test {String hello=Messages.getString(\"test0\");} //$NON-NLS-1$"); //$NON-NLS-1$ //$NON-NLS-2$
-		checkContentOfFile("properties", fHelper.getFile("/TestSetupProject/src2/p/test.properties"), "test0=helloworld\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-
-	public void testCreateChangeWithCollidingImport() throws Exception {
-		String testClass= "package p;" + "import p.another.Messages;" + "class Test {" + "String hello=\"helloworld\";\r\n" + "}";
-		ICompilationUnit cu= RefactoringTest.createCU(fHelper.getPackageFragment("/TestSetupProject/src1/p"), "Test.java", //$NON-NLS-1$ //$NON-NLS-2$
-				testClass); //$NON-NLS-1$
-		NLSRefactoring nls= createDefaultNls(cu);
-
-		performChange(nls);
-
-		checkContentOfCu("manipulated class", cu, "package p;" + "import p.another.Messages;\r\n" + "class Test {" + "String hello=p.Messages.getString(\"test0\"); //$NON-NLS-1$\r\n" + "}");
-		checkContentOfFile("properties", fHelper.getFile("/TestSetupProject/src2/p/test.properties"), "test0=helloworld\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-
-	// BUG 59156
-	public void testCreateChangeWithExistingAccessorclassInDifferentPackage() throws Exception {
-		String accessorKlazz= "package test;\n" + "public class Accessor {\n" + "		 private static final String BUNDLE_NAME = \"test.test\";//$NON-NLS-1$\n" + "		 public static String getString(String s) {\n" + "		 		 return \"\";\n" + "		 }\n" + "}\n";
-		RefactoringTest.createCU(fHelper.getPackageFragment("/TestSetupProject/src1/p"), "Accessor.java", accessorKlazz);
-
-		String nlsMe= "package test;\n" + "class Test {\n" + "  String hello=\"helloworld\";\n" + "}\n";
-		fHelper.createPackageFragment("test", "/TestSetupProject/src1");
-		ICompilationUnit testClass= RefactoringTest.createCU(fHelper.getPackageFragment("/TestSetupProject/src1/test"), "AClass.java", nlsMe);
-
-		NLSRefactoring nls= NLSRefactoring.create(testClass);
-
-		nls.setAccessorClassPackage(fHelper.getPackageFragment("/TestSetupProject/src1/p"));
-		nls.setResourceBundlePackage(fHelper.getPackageFragment("/TestSetupProject/src2/p"));
-		nls.setResourceBundleName("test.properties");
-		nls.setAccessorClassName("Accessor");
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		nls.setPrefix("test");
-		substitutions[0].setState(NLSSubstitution.EXTERNALIZED);
-		substitutions[0].generateKey(substitutions);
-
-		performChange(nls);
-
-		checkContentOfCu("manipulated class", testClass, "package test;\n\n" + "import p.Accessor;\n\n" + "class Test {\n" + "  String hello=Accessor.getString(\"test0\"); //$NON-NLS-1$\n" + "}\n");
-	}
-
-	public void testCreateChangeWithNonDefaultSubstitution() throws Exception {
-		ICompilationUnit cu= RefactoringTest.createCU(fHelper.getPackageFragment("/TestSetupProject/src1/p"), "Test.java", //$NON-NLS-1$ //$NON-NLS-2$
-				"package p;import p.another.Messages;class Test {String hello=\"helloworld\";}"); //$NON-NLS-1$
-		NLSRefactoring nls= createDefaultNls(cu);
-
-		String string= "nonDefault(" + NLSRefactoring.KEY + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-		nls.setSubstitutionPattern(string);
-
-		performChange(nls);
-		checkContentOfCu("manipulated class", //$NON-NLS-1$
-				cu, "package p;import p.another.Messages;\r\nclass Test {String hello=p.Messages.nonDefault(\"test0\");} //$NON-NLS-1$"); //$NON-NLS-1$
-		checkContentOfFile("properties", fHelper.getFile("/TestSetupProject/src2/p/test.properties"), "test0=helloworld\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	private void createDefaultAccessor(IPackageFragment pack1) throws JavaModelException {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Accessor {\n");
-		buf.append("    private static final String BUNDLE_NAME = \"test.Accessor\";//$NON-NLS-1$\n");
-		buf.append("    public static String getString(String s) {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Accessor.java", buf.toString(), false, null);
-	}
-	
-	public void testExternalizedToIgnore() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("A.1=Hello1\n");
-		buf.append("A.2=Hello2\n");
-		buf.append("A.3=Hello3\n");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"A.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"A.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"A.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		substitutions[0].setState(NLSSubstitution.IGNORED);
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("A.2=Hello2\n");
-		buf.append("A.3=Hello3\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= \"Hello1\"; //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"A.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"A.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-
-	public void testInsertToDuplicate() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= \"Hello1\";\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		NLSSubstitution sub= substitutions[2];
-		
-		sub.setState(NLSSubstitution.EXTERNALIZED);
-		sub.setKey("1");
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-	
-	public void testRenameToDuplicate() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		buf.append("Test.3=Hello3\n");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		NLSSubstitution sub= substitutions[2];
-		sub.setKey("Test.1");
-		sub.setValue("Hello1");
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-
-	public void testRenameDuplicate() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		NLSSubstitution sub= substitutions[2];
-		sub.setKey("Test.3");
-		sub.setValue("Hello3");
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		buf.append("Test.3=Hello3\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-	
-	public void testInternalizeDuplicate() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		NLSSubstitution sub= substitutions[2];
-		sub.setState(NLSSubstitution.INTERNALIZED);
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= \"Hello1\"; \n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-	
-	public void testInternalizeAndInsert() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= \"Hello1\";\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		NLSSubstitution sub= substitutions[0];
-		sub.setState(NLSSubstitution.INTERNALIZED);
-		
-		NLSSubstitution sub2= substitutions[2];
-		sub2.setState(NLSSubstitution.EXTERNALIZED);
-		sub2.setKey("1");
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= \"Hello1\"; \n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-	
-	
-	public void testAddMissing1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		NLSSubstitution sub= substitutions[2];
-		sub.setValue("Hello3");
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		buf.append("Test.3=Hello3\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-	
-	public void testAddMissing2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		NLSSubstitution sub= substitutions[1];
-		sub.setValue("Hello22");
-		
-		NLSSubstitution sub2= substitutions[2];
-		sub2.setValue("Hello3");
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello22\n");
-		buf.append("Test.3=Hello3\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello3= Accessor.getString(\"Test.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-	
-	public void testNoNewLineAtEnd() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= \"Hello2\";\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 2, substitutions.length);
-		NLSSubstitution sub= substitutions[1];
-		sub.setState(NLSSubstitution.EXTERNALIZED);
-		sub.setKey("2");
-
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-	
-	public void testTwoInsertsNoNewLineAtEnd() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
-		
-		// Accessor class
-		createDefaultAccessor(pack1);
-		
-		// property file
-		StringBuffer buf= new StringBuffer();
-		buf.append("Test.1=Hello1");
-		IFile file= createPropertyFile(pack1, "Accessor.properties", buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= \"Hello2\";\n");
-		buf.append("    String hello2= \"Hello3\";\n");
-		buf.append("}\n");
-		ICompilationUnit cu = pack1.createCompilationUnit("Test.java", buf.toString(), false, null);
-
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		assertEquals("number of substitutions", 3, substitutions.length);
-		NLSSubstitution sub= substitutions[1];
-		sub.setState(NLSSubstitution.EXTERNALIZED);
-		sub.setKey("2");
-
-		sub= substitutions[2];
-		sub.setState(NLSSubstitution.EXTERNALIZED);
-		sub.setKey("3");
-		
-		performChange(nls);
-		
-		buf= new StringBuffer();
-		buf.append("Test.1=Hello1\n");
-		buf.append("Test.2=Hello2\n");
-		buf.append("Test.3=Hello3\n");
-		checkContentOfFile("property file", file, buf.toString());
-
-		// class to NLS
-		buf= new StringBuffer();
-		buf.append("package test;\n");
-		buf.append("public class Test {\n");
-		buf.append("    String hello1= Accessor.getString(\"Test.1\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.2\"); //$NON-NLS-1$\n");
-		buf.append("    String hello2= Accessor.getString(\"Test.3\"); //$NON-NLS-1$\n");
-		buf.append("}\n");
-		checkContentOfCu("nls file", cu, buf.toString());
-	}
-	
-	private IFile createPropertyFile(IPackageFragment pack, String name, String content) throws UnsupportedEncodingException, CoreException {
-		ByteArrayInputStream is= new ByteArrayInputStream(content.getBytes("8859_1"));
-		IFile file= ((IFolder) pack.getResource()).getFile(name);
-		file.create(is, false, null);
-		return file;
-	}
-
-	private void checkContentOfCu(String message, ICompilationUnit cu, String content) throws Exception {
-		RefactoringTest.assertEqualLines(message, content, cu.getBuffer().getContents());
-	}
-
-	private void checkContentOfFile(String message, IFile file, String content) throws Exception {
-		InputStream in= file.getContents();
-		try {
-			String realContent= copyToString(in);
-			RefactoringTest.assertEqualLines(message, content, realContent);
-		} finally {
-			in.close();
-		}
-	}
-
-	private String copyToString(InputStream in) throws Exception {
-		ByteArrayOutputStream out= new ByteArrayOutputStream();
-		int read= in.read();
-		while (read != -1) {
-			out.write(read);
-			read= in.read();
-		}
-		out.close();
-		return out.toString();
-	}
-
-	private NLSRefactoring createDefaultNls(ICompilationUnit cu) {
-		NLSRefactoring nls= NLSRefactoring.create(cu);
-
-		nls.setAccessorClassPackage(fHelper.getPackageFragment("/TestSetupProject/src1/p")); //$NON-NLS-1$
-		nls.setResourceBundlePackage(fHelper.getPackageFragment("/TestSetupProject/src2/p"));
-		nls.setResourceBundleName("test.properties");
-		//nls.setPropertyFilePath(fHelper.getFile("/TestSetupProject/src2/p/test.properties").getFullPath()); //$NON-NLS-1$
-		nls.setAccessorClassName("Messages"); //$NON-NLS-1$
-
-		NLSSubstitution[] substitutions= nls.getSubstitutions();
-		nls.setPrefix("test");
-		substitutions[0].setState(NLSSubstitution.EXTERNALIZED);
-		substitutions[0].generateKey(substitutions);
-		return nls;
-	}
-
-	private void performChange(NLSRefactoring nls) throws CoreException {
-		nls.checkInitialConditions(fHelper.fNpm);
-		nls.checkFinalConditions(fHelper.fNpm);
-		Change c= nls.createChange(fHelper.fNpm);
-		c.initializeValidationData(fHelper.fNpm);
-		try {
-			c.perform(fHelper.fNpm);
-		} finally {
-			c.dispose();
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringTestHelper.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringTestHelper.java
deleted file mode 100644
index 10fec21..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/NlsRefactoringTestHelper.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.HashMap;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-/**
- * Helper class for the nls-tests.
- * 
- * often used functionality is located here to get around extending testcases
- * from testcases (just for code reuse).
- */
-public class NlsRefactoringTestHelper {
-
-    NullProgressMonitor fNpm;
-    
-    private HashMap fWorkSpaceElements = new HashMap();
-    private IJavaProject fJavaProject;
-        
-    public NlsRefactoringTestHelper(IJavaProject javaProject) throws Exception {
-        fJavaProject = javaProject;
-        fNpm = new NullProgressMonitor();
-        fWorkSpaceElements = new HashMap();
-        setupTestSpace();
-    }
-    
-    private InputStream getInputStream(String input) {
-        return new ByteArrayInputStream(input.getBytes());
-    }
-    
-    private void setupTestSpace() throws Exception {
-        fWorkSpaceElements.put(fJavaProject.getPath().toString(), fJavaProject);
-
-        createPackageFragmentRoot(fJavaProject, "src1"); 
-        createPackageFragmentRoot(fJavaProject, "src2"); 
-
-        createPackageFragment("p", "/TestSetupProject/src1"); 
-        createPackageFragment("p", "/TestSetupProject/src2"); 
-
-        createFile("/TestSetupProject/src2/p", "test.properties", ""); 
-        createCu("/TestSetupProject/src1/p", "WithStrings.java", "package p;class WithStrings {String s1=\"test1\";String s2=\"test2\";}");
-        createCu("/TestSetupProject/src1/p", "WithoutStrings.java", "package p;class WithoutStrings {}");
-        
-		String newFileTemplate= "${package_declaration}\n\n${type_declaration}";
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.NEWTYPE).setPattern(newFileTemplate);
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.TYPECOMMENT).setPattern("");
-
-    }
-
-    private void createFile(String packageFragmentName, String fileName, String content) throws Exception {
-        IPackageFragment fragment = (IPackageFragment) fWorkSpaceElements.get(packageFragmentName);
-        IPath p = fragment.getPath().append(fileName);
-        IFile file = createFile(p, content);
-        fWorkSpaceElements.put(file.getFullPath().toString(), file);
-    }
-
-    private IFile createFile(IPath path, String content) throws Exception {
-        IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-        InputStream iS = getInputStream(content);
-        file.create(iS, true, fNpm);
-        iS.close();
-        return file;
-    }
-
-    public void createPackageFragment(String packageName, String fragmentRootName) throws Exception {
-        IPackageFragmentRoot fragmentRoot = (IPackageFragmentRoot) fWorkSpaceElements.get(fragmentRootName);
-        IPackageFragment newPackageFragment = fragmentRoot.createPackageFragment(packageName, false, fNpm);
-        fWorkSpaceElements.put(newPackageFragment.getPath().toString(), newPackageFragment);
-    }
-
-    public void createPackageFragmentRoot(IJavaProject project, String string) throws CoreException {
-        IPackageFragmentRoot srcRoot1 = JavaProjectHelper.addSourceContainer(project, string);
-        fWorkSpaceElements.put(srcRoot1.getPath().toString(), srcRoot1);
-    }
-
-    public IPackageFragment getPackageFragment(String path) {
-        return (IPackageFragment) fWorkSpaceElements.get(path);
-    }
-
-    public IFile getFile(String string) {
-        return (IFile) fWorkSpaceElements.get(string);
-    }
-
-    public ICompilationUnit createCu(String path, String name, String content) throws Exception {
-        IPackageFragment f = (IPackageFragment) fWorkSpaceElements.get(path);
-        ICompilationUnit res = f.createCompilationUnit(name, content, false, fNpm);
-        fWorkSpaceElements.put(res.getPath().toString(), res);
-        return res;
-    }
-
-    public ICompilationUnit getCu(String string) {
-        return (ICompilationUnit) fWorkSpaceElements.get(string);
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/PropertyFileDocumentModellTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/PropertyFileDocumentModellTest.java
deleted file mode 100644
index 8680c00..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/PropertyFileDocumentModellTest.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.KeyValuePair;
-import org.eclipse.jdt.internal.corext.refactoring.nls.PropertyFileDocumentModel;
-import org.eclipse.jface.text.Document;
-
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-
-import org.eclipse.text.edits.DeleteEdit;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-
-public class PropertyFileDocumentModellTest extends TestCase {
-
-	public PropertyFileDocumentModellTest(String name) {
-		super(name);
-	}
-
-	public static TestSuite suite() {
-		return new TestSuite(PropertyFileDocumentModellTest.class);
-	}
-
-	public void testInsertIntoEmptyDoc() throws Exception {
-		Document props= new Document();
-
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		InsertEdit insertEdit= modell.insert("key", "value");
-		insertEdit.apply(props);
-
-		RefactoringTest.assertEqualLines("key=value\n", props.get());
-	}
-
-	public void testInsertIntoDoc() throws Exception {
-		Document props= new Document("org.eclipse.nls.1=value\n" + "org.eclipse=value\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		InsertEdit insertEdit= modell.insert("org.eclipse.nls.2", "value");
-		insertEdit.apply(props);
-
-		assertEquals("org.eclipse.nls.1=value\n" + "org.eclipse.nls.2=value\n" + "org.eclipse=value\n", props.get());
-	}
-
-	public void testInsertIntoDoc2() throws Exception {
-		Document props= new Document("org.1=value\n" + "org.2=value\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		InsertEdit insertEdit= modell.insert("arg.1", "value");
-		insertEdit.apply(props);
-
-		assertEquals("org.1=value\n" + "org.2=value\n" + "arg.1=value\n", props.get());
-	}
-
-	public void testManyInsertsIntoDoc() throws Exception {
-		Document props= new Document("org.eclipse.nls.1=value\n" + "\n" + "org.eclipse=value\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		KeyValuePair[] keyValuePairs= {new KeyValuePair("org.eclipse.nls.2", "value"), new KeyValuePair("org.eclipse.2", "value")};
-
-		InsertEdit[] insertEdit= modell.insert(keyValuePairs);
-		MultiTextEdit multiEdit= new MultiTextEdit();
-		for (int i= 0; i < insertEdit.length; i++) {
-			multiEdit.addChild(insertEdit[i]);
-		}
-		multiEdit.apply(props);
-
-		assertEquals("org.eclipse.nls.1=value\n" + "org.eclipse.nls.2=value\n" + "\n" + "org.eclipse=value\n" + "org.eclipse.2=value\n", props.get());
-	}
-
-	public void testBlockInsertsIntoDoc() throws Exception {
-		Document props= new Document("org.eclipse.1=value\n" + "org.eclipse.2=value\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		KeyValuePair[] keyValuePairs= {new KeyValuePair("org.eclipse.nls.1", "value"), new KeyValuePair("org.eclipse.nls.2", "value")};
-
-		InsertEdit[] insertEdit= modell.insert(keyValuePairs);
-		MultiTextEdit multiEdit= new MultiTextEdit();
-		for (int i= 0; i < insertEdit.length; i++) {
-			multiEdit.addChild(insertEdit[i]);
-		}
-		multiEdit.apply(props);
-
-		assertEquals("org.eclipse.1=value\n" + "org.eclipse.2=value\n" + "org.eclipse.nls.1=value\n" + "org.eclipse.nls.2=value\n", props.get());
-	}
-
-	public void testInsertIntoDocWithBlankLines1() throws Exception {
-		Document props= new Document("org.eclipse=value\n" + "\n" + "org.eclipse.test=value\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		InsertEdit insertEdit= modell.insert("org.eclipse.test", "value2");
-		insertEdit.apply(props);
-
-		assertEquals("org.eclipse=value\n" + "\n" + "org.eclipse.test=value\n" + "org.eclipse.test=value2\n", props.get());
-	}
-
-	public void testInsertIntoDocWithBlankLines2() throws Exception {
-		Document props= new Document("a.b=v\n" + "\n" + "org.eclipse.test=value\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		InsertEdit insertEdit= modell.insert("a.c", "v");
-		insertEdit.apply(props);
-
-		assertEquals("a.b=v\n" + "a.c=v\n" + "\n" + "org.eclipse.test=value\n", props.get());
-	}
-
-	public void testInsertIntoDocWithDifferentSeperationChar() throws Exception {
-		Document props= new Document("org.eclipse.ok:value\n" + "org.eclipse.what value\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		InsertEdit insertEdit= modell.insert(new KeyValuePair("org.eclipse.nix", "value"));
-		insertEdit.apply(props);
-
-		assertEquals("org.eclipse.ok:value\n" + "org.eclipse.what value\n" + "org.eclipse.nix=value\n", props.get());
-	}
-
-	public void testRemovingOfKey() throws Exception {
-		Document props= new Document("org.eclipse.1=value1\n" + "org.eclipse.2=value2\n" + "org.eclipse.3=value3\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		DeleteEdit deleteEdit= modell.remove("org.eclipse.2");
-		deleteEdit.apply(props);
-
-		assertEquals("org.eclipse.1=value1\n" + "org.eclipse.3=value3\n", props.get());
-	}
-
-	public void testRemovingOfLastKey() throws Exception {
-		Document props= new Document("org.eclipse.1=value1\n" + "org.eclipse.2=value2\n" + "org.eclipse.3=value3\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		DeleteEdit deleteEdit= modell.remove("org.eclipse.3");
-		deleteEdit.apply(props);
-
-		assertEquals("org.eclipse.1=value1\n" + "org.eclipse.2=value2\n", props.get());
-	}
-
-	public void testReplacementOfKeyValuePair() throws Exception {
-		Document props= new Document("org.eclipse.1=value1\n" + "org.eclipse.2=value2\n" + "org.eclipse.3=value3\n");
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(props);
-
-		ReplaceEdit replaceEdit= modell.replace(new KeyValuePair("org.eclipse.2", "value"), new KeyValuePair("org.1", "value"));
-		replaceEdit.apply(props);
-
-		assertEquals("org.eclipse.1=value1\n" + "org.1=value\n" + "org.eclipse.3=value3\n", props.get());
-	}
-
-	// Escaping stuff
-	public void testEscapingOfComments() {
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(new Document());
-		InsertEdit insertEdit= modell.insert(new KeyValuePair("key", "value!please escape"));
-		RefactoringTest.assertEqualLines("key=value\\!please escape\n", insertEdit.getText());
-	}
-
-	public void testEscapingOfLineBreaks() {
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(new Document());
-		InsertEdit insertEdit= modell.insert(new KeyValuePair("key", "value1\nvalue2\r"));
-		RefactoringTest.assertEqualLines("key=value1\\nvalue2\\r\n", insertEdit.getText());
-	}
-
-	public void testEscapingOfUniCode() {
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(new Document());
-		InsertEdit insertEdit= modell.insert(new KeyValuePair("key", "\u00ea"));
-		RefactoringTest.assertEqualLines("key=\\u00EA\n", insertEdit.getText());
-	}
-	
-	public void testEscapingOfLeadingWhiteSpaces() {
-		PropertyFileDocumentModel modell= new PropertyFileDocumentModel(new Document());
-		InsertEdit insertEdit= modell.insert(new KeyValuePair("key", "  test"));
-		RefactoringTest.assertEqualLines("key=\\ \\ test\n", insertEdit.getText());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/SimpleLineReaderTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/SimpleLineReaderTest.java
deleted file mode 100644
index bf3b529..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/nls/SimpleLineReaderTest.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.nls;
-
-import org.eclipse.jface.text.Document;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.corext.refactoring.nls.SimpleLineReader;
-
-public class SimpleLineReaderTest extends TestCase {
-	
-	public static TestSuite suite() {
-		return new TestSuite(SimpleLineReaderTest.class);
-	}
-	
-    public void testSimpleLineReader() throws Exception {
-        SimpleLineReader reader = new SimpleLineReader(new Document("aha\noho\r\n\r\n\n"));         
-        assertEquals("aha\n", reader.readLine()); 
-        assertEquals("oho\r\n", reader.readLine()); 
-        assertEquals("\r\n", reader.readLine()); 
-        assertEquals("\n", reader.readLine()); 
-        assertEquals(null, reader.readLine());
-    }
-    
-    public void testSimpleLineReaderWithEmptyString() {
-        SimpleLineReader simpleLineReader = new SimpleLineReader(new Document("")); 
-        assertEquals(null, simpleLineReader.readLine());
-    }    
-    
-    public void testSimpleLineReaderWithEscapedLF() {
-        SimpleLineReader simpleLineReader = new SimpleLineReader(new Document("a\nb\\nc\n"));
-        assertEquals("a\n", simpleLineReader.readLine()); 
-        assertEquals("b\\nc\n", simpleLineReader.readLine());
-        assertEquals(null, simpleLineReader.readLine());
-    }
-    
-    public void testSimpleLineReaderWithEscapedCR() {
-        SimpleLineReader simpleLineReader = new SimpleLineReader(new Document("a\nb\\rc\r"));
-        assertEquals("a\n", simpleLineReader.readLine()); 
-        assertEquals("b\\rc\r", simpleLineReader.readLine());
-        assertEquals(null, simpleLineReader.readLine());
-    }
-    
-    public void testSimpleLineReaderWithCR() {
-        SimpleLineReader simpleLineReader = new SimpleLineReader(new Document("a\rb\r"));
-        assertEquals("a\r", simpleLineReader.readLine()); 
-        assertEquals("b\r", simpleLineReader.readLine());
-        assertEquals(null, simpleLineReader.readLine());
-    }
-
-    public void testSimpleLineReaderWithoutNL() {
-        SimpleLineReader simpleLineReader = new SimpleLineReader(new Document("=")); 
-        assertEquals("=", simpleLineReader.readLine()); 
-        assertEquals(null, simpleLineReader.readLine());
-    }
-    
-    public void testSimpleLineReaderWithMissingNL() {
-        SimpleLineReader simpleLineReader = new SimpleLineReader(new Document("a\rb"));
-        assertEquals("a\r", simpleLineReader.readLine()); 
-        assertEquals("b", simpleLineReader.readLine());
-        assertEquals(null, simpleLineReader.readLine());
-    }
-    
-    public void testSimpleLineReaderWithLineContinue1() {
-        SimpleLineReader simpleLineReader = new SimpleLineReader(new Document("aaa\\\nbbb\nccc\n"));
-        assertEquals("aaa\\\nbbb\n", simpleLineReader.readLine()); 
-        assertEquals("ccc\n", simpleLineReader.readLine());
-        assertEquals(null, simpleLineReader.readLine());
-    }
-    
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AbstractSelectionTestCase.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AbstractSelectionTestCase.java
deleted file mode 100644
index a5cb1ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AbstractSelectionTestCase.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractCUTestCase;
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringTestPlugin;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.PerformRefactoringOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public abstract class AbstractSelectionTestCase extends AbstractCUTestCase {
-
-	public static final String SQUARE_BRACKET_OPEN= "/*[*/";
-	public static final int    SQUARE_BRACKET_OPEN_LENGTH= SQUARE_BRACKET_OPEN.length();
-	public static final String SQUARE_BRACKET_CLOSE=   "/*]*/";
-	public static final int    SQUARE_BRACKET_CLOSE_LENGTH= SQUARE_BRACKET_CLOSE.length();
-	
-	protected static final int VALID_SELECTION=     1;
-	protected static final int INVALID_SELECTION=   2;
-	protected static final int COMPARE_WITH_OUTPUT= 3;
-	
-	public AbstractSelectionTestCase(String name) {
-		super(name);
-	}
-
-	protected int[] getSelection(String source) {
-		int start= -1;
-		int end= -1;
-		int includingStart= source.indexOf(SQUARE_BRACKET_OPEN);
-		int excludingStart= source.indexOf(SQUARE_BRACKET_CLOSE);
-		int includingEnd= source.lastIndexOf(SQUARE_BRACKET_CLOSE);
-		int excludingEnd= source.lastIndexOf(SQUARE_BRACKET_OPEN);
-
-		if (includingStart > excludingStart && excludingStart != -1) {
-			includingStart= -1;
-		} else if (excludingStart > includingStart && includingStart != -1) {
-			excludingStart= -1;
-		}
-		
-		if (includingEnd < excludingEnd) {
-			includingEnd= -1;
-		} else if (excludingEnd < includingEnd) {
-			excludingEnd= -1;
-		}
-		
-		if (includingStart != -1) {
-			start= includingStart;
-		} else {
-			start= excludingStart + SQUARE_BRACKET_CLOSE_LENGTH;
-		}
-		
-		if (excludingEnd != -1) {
-			end= excludingEnd;
-		} else {
-			end= includingEnd + SQUARE_BRACKET_CLOSE_LENGTH;
-		}
-		
-		assertTrue("Selection invalid", start >= 0 && end >= 0 && end >= start);
-		
-		int[] result= new int[] { start, end - start }; 
-		// System.out.println("|"+ source.substring(result[0], result[0] + result[1]) + "|");
-		return result;
-	}
-	
-	protected ITextSelection getTextSelection(String source) {
-		int[] s= getSelection(source);
-		return new TextSelection(s[0], s[1]);
-	}
-	
-	protected InputStream getFileInputStream(String fileName) throws IOException {
-		return RefactoringTestPlugin.getDefault().getTestResourceStream(fileName);
-	}
-	
-	protected void performTest(final ICompilationUnit unit, final Refactoring refactoring, int mode, final String out, boolean doUndo) throws Exception {
-		IProgressMonitor pm= new NullProgressMonitor();
-		switch (mode) {
-			case VALID_SELECTION:
-				assertTrue(checkPreconditions(refactoring, pm).isOK());
-				break;
-			case INVALID_SELECTION:
-				assertTrue(!checkPreconditions(refactoring, pm).isOK());
-				break;
-			case COMPARE_WITH_OUTPUT:
-				IUndoManager undoManager= RefactoringCore.getUndoManager();
-				undoManager.flush();
-				String original= unit.getSource();
-				
-				PerformRefactoringOperation op= new PerformRefactoringOperation(
-					refactoring, getCheckingStyle());
-				JavaCore.run(op, new NullProgressMonitor());
-				assertTrue("Precondition check failed", !op.getConditionStatus().hasFatalError());
-				assertTrue("Validation check failed", !op.getValidationStatus().hasFatalError());
-				assertNotNull("No Undo", op.getUndoChange());
-				compareSource(unit.getSource(), out);
-				Change undo= op.getUndoChange();
-				assertNotNull("Undo doesn't exist", undo);
-				assertTrue("Undo manager is empty", undoManager.anythingToUndo());
-
-				if (doUndo) {
-					undoManager.performUndo(null, new NullProgressMonitor());
-					assertTrue("Undo manager still has undo", !undoManager.anythingToUndo());
-					assertTrue("Undo manager is empty", undoManager.anythingToRedo());
-					compareSource(original, unit.getSource());
-				}
-				break;		
-		}
-	}
-	
-	protected RefactoringStatus checkPreconditions(Refactoring refactoring, IProgressMonitor pm) throws CoreException {
-		CheckConditionsOperation op= new CheckConditionsOperation(refactoring, getCheckingStyle());
-		op.run(new NullProgressMonitor());
-		return op.getStatus();
-	}
-	
-	protected int getCheckingStyle() {
-		return CheckConditionsOperation.ALL_CONDITIONS;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllChangeTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllChangeTests.java
deleted file mode 100644
index 696e5da..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllChangeTests.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllChangeTests {
-	private static final Class clazz= AllChangeTests.class;
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite(clazz.getName());
-		suite.addTest(new TestSuite(RenameResourceChangeTests.class));
-		suite.addTest(new TestSuite(RenameSourceFolderChangeTests.class));
-		suite.addTest(new TestSuite(CopyPackageChangeTest.class));
-		return new RefactoringTestSetup(suite);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllRefactoringTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllRefactoringTests.java
deleted file mode 100644
index 0cc704e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllRefactoringTests.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class AllRefactoringTests {
-
-	private static final Class clazz= AllRefactoringTests.class;
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite(clazz.getName());
-
-		//--code
-		suite.addTest(ExtractMethodTests.suite());
-		suite.addTest(InlineMethodTests.suite());
-		suite.addTest(SefTests.suite());
-		suite.addTest(InlineTempTests.suite());
-		suite.addTest(ExtractTempTests.suite());
-		suite.addTest(RenameTempTests.suite());
-		suite.addTest(ExtractConstantTests.suite());
-		suite.addTest(PromoteTempToFieldTests.suite());
-		suite.addTest(ConvertAnonymousToNestedTests.suite());
-		suite.addTest(InlineConstantTests.suite());
-		suite.addTest(IntroduceParameterTests.suite());
-		suite.addTest(IntroduceFactoryTests.suite());
-		
-		//-- structure
-		suite.addTest(ChangeSignatureTests.suite());
-		suite.addTest(PullUpTests.suite());
-		suite.addTest(PushDownTests.suite());
-		suite.addTest(MoveMembersTests.suite());
-		suite.addTest(ExtractInterfaceTests.suite());
-		suite.addTest(MoveInnerToTopLevelTests.suite());
-		suite.addTest(UseSupertypeWherePossibleTests.suite());
-		
-		//--methods
-		suite.addTest(RenameVirtualMethodInClassTests.suite());
-		suite.addTest(RenameMethodInInterfaceTests.suite());
-		suite.addTest(RenamePrivateMethodTests.suite());	
-		suite.addTest(RenameStaticMethodTests.suite());
-		suite.addTest(RenameParametersTests.suite());
-		suite.addTest(MoveInstanceMethodTests.suite());
-		
-		//--types
-		suite.addTest(RenameTypeTests.suite());	
-		suite.addTest(RenameTypeParameterTests.suite());
-		suite.addTest(ChangeTypeRefactoringTests.suite());
-		
-		//--packages
-		suite.addTest(RenamePackageTests.suite());
-		
-		//--fields
-		suite.addTest(RenamePrivateFieldTests.suite());
-		suite.addTest(RenameNonPrivateFieldTests.suite());
-		
-		//--projects
-		suite.addTest(RenameJavaProjectTests.suite());		
-		return suite;
-	}
-}
- 

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllTests.java
deleted file mode 100644
index be38844..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllTests.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-	
-	private static final Class clazz= AllTests.class;
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite(clazz.getName());
-		suite.addTest(AllRefactoringTests.suite());
-		suite.addTest(AllChangeTests.suite());
-		suite.addTest(UndoManagerTests.suite());
-		suite.addTest(PathTransformationTests.suite());
-		suite.addTest(RefactoringScannerTests.suite());
-		suite.addTest(SurroundWithTests.suite());
-		return suite;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AugmentRawContainerClientsTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AugmentRawContainerClientsTests.java
deleted file mode 100644
index 1bc8a40..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AugmentRawContainerClientsTests.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.PerformRefactoringOperation;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-import org.eclipse.jdt.internal.corext.refactoring.generics.AugmentRawContainerClientsRefactoring;
-
-//TODO: add Test to AllTests
-public class AugmentRawContainerClientsTests extends RefactoringTest {
-
-	private static final Class clazz= AugmentRawContainerClientsTests.class;
-	private static final String REFACTORING_PATH= "AugmentRawContainerClients/";
-	
-	public static Test suite() {
-		return new Java15Setup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new Java15Setup(someTest);
-	}
-	
-	public AugmentRawContainerClientsTests(String name) {
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	private void performCu(int expectedInitialStatus, int expectedFinalStatus) throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IJavaElement[] elements= { cu };
-		AugmentRawContainerClientsRefactoring refactoring= AugmentRawContainerClientsRefactoring.create(elements);
-		
-		NullProgressMonitor pm= new NullProgressMonitor();
-		RefactoringStatus status= refactoring.checkInitialConditions(pm);
-		assertEquals("wrong initial condition status", expectedInitialStatus, status.getSeverity());
-		if (! status.isOK())
-			return;
-		
-		// set client options here (from instance variables)
-
-		status.merge(refactoring.checkFinalConditions(pm));
-		assertEquals("wrong final condition status", expectedFinalStatus, status.getSeverity());
-		if (status.getSeverity() == RefactoringStatus.FATAL)
-			return;
-		
-		PerformRefactoringOperation op= new PerformRefactoringOperation(
-				refactoring, CheckConditionsOperation.FINAL_CONDITIONS);
-		JavaCore.run(op, new NullProgressMonitor());
-		assertTrue("Validation check failed", !op.getValidationStatus().hasFatalError());
-		assertNotNull("No Undo", op.getUndoChange());
-			
-		String expected= getFileContents(getOutputTestFileName("A"));
-		String actual= cu.getSource();
-		assertEqualLines(expected, actual);
-	}
-	
-	private void performCuOK() throws Exception {
-		performCu(RefactoringStatus.OK, RefactoringStatus.OK);
-	}
-	
-	public void testCu1() throws Exception {
-		performCuOK();
-	}
-	
-	public void testCu2() throws Exception {
-		performCuOK();
-	}
-	
-	public void testCu3() throws Exception {
-		performCuOK();
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java
deleted file mode 100644
index 33582c8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java
+++ /dev/null

@@ -1,1518 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.Modifier;
-
-import org.eclipse.jdt.internal.corext.refactoring.ExceptionInfo;
-import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo;
-import org.eclipse.jdt.internal.corext.refactoring.structure.ChangeSignatureRefactoring;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.jdt.internal.corext.util.JdtFlags;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * @see org.eclipse.jdt.core.Signature for encoding of signature strings.
- */
-public class ChangeSignatureTests extends RefactoringTest {
-	private static final Class clazz= ChangeSignatureTests.class;
-	private static final String REFACTORING_PATH= "ChangeSignature/";
-	
-	private static final boolean RUN_CONSTRUCTOR_TEST= true;
-
-	public ChangeSignatureTests(String name) {
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return new RefactoringTestSetup(new TestSuite(clazz));
-		} else {
-			System.err.println("*** Running only parts of " + clazz.getName() + "!");
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ChangeSignatureTests("testAll58"));
-			return new RefactoringTestSetup(suite);
-		}
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-	
-	private String getSimpleTestFileName(boolean canReorder, boolean input){
-		String fileName = "A_" + getName();
-		if (canReorder)
-			fileName += input ? "_in": "_out";
-		return fileName + ".java"; 
-	}
-	
-	private String getTestFileName(boolean canReorder, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += (canReorder ? "canModify/": "cannotModify/");
-		return fileName + getSimpleTestFileName(canReorder, input);
-	}
-		
-	//---helpers 
-	
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean canRename, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(canRename, input), getFileContents(getTestFileName(canRename, input)));
-	}
-
-	private static ParameterInfo[] createNewParamInfos(String[] newTypes, String[] newNames, String[] newDefaultValues) {
-		if (newTypes == null)
-			return new ParameterInfo[0];
-		ParameterInfo[] result= new ParameterInfo[newTypes.length];
-		for (int i= 0; i < newDefaultValues.length; i++) {
-			result[i]= ParameterInfo.createInfoForAddedParameter();
-			result[i].setNewName(newNames[i]);
-			result[i].setNewTypeName(newTypes[i]);
-			result[i].setDefaultValue(newDefaultValues[i]);
-		}
-		return result;
-	}
-
-	private static void addInfos(List list, ParameterInfo[] newParamInfos, int[] newIndices) {
-		if (newParamInfos == null || newIndices == null)
-			return;
-		for (int i= newIndices.length - 1; i >= 0; i--) {
-			list.add(newIndices[i], newParamInfos[i]);
-		}
-	}
-		
-	private void helperAdd(String[] signature, ParameterInfo[] newParamInfos, int[] newIndices) throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		IType classA= getType(cu, "A");
-		IMethod method = classA.getMethod("m", signature);
-		assertTrue("method does not exist", method.exists());
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-		addInfos(ref.getParameterInfos(), newParamInfos, newIndices);
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("precondition was supposed to pass", null, result);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		String expectedFileContents= getFileContents(getTestFileName(true, false));
-		assertEqualLines("invalid renaming", expectedFileContents, newcu.getSource());
-	}
-	
-	/*
-	 * Rename method 'A.m(signature)' to 'A.newMethodName(signature)'
-	 */
-	private void helperRenameMethod(String[] signature, String newMethodName) throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		IType classA= getType(cu, "A");
-		IMethod method = classA.getMethod("m", signature);
-		assertTrue("method m does not exist in A", method.exists());
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-		ref.setNewMethodName(newMethodName);
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("precondition was supposed to pass", null, result);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		String expectedFileContents= getFileContents(getTestFileName(true, false));
-		assertEqualLines("invalid change of method name", expectedFileContents, newcu.getSource());
-	}
-
-	private void helperDoAll(String typeName, 
-								String methodName, 
-							  	String[] signature, 
-							  	ParameterInfo[] newParamInfos, 
-							  	int[] newIndices, 
-							  	String[] oldParamNames, 
-							  	String[] newParamNames, 
-							  	String[] newParameterTypeNames, 
-							  	int[] permutation,
-							  	int newVisibility,
-							  	int[] deleted, String returnTypeName)  throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		IType classA= getType(cu, typeName);
-		IMethod method = classA.getMethod(methodName, signature);
-		assertTrue("method " + methodName +" does not exist", method.exists());
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-		if (returnTypeName != null)
-			ref.setNewReturnTypeName(returnTypeName);
-		markAsDeleted(ref.getParameterInfos(), deleted);	
-		modifyInfos(ref.getParameterInfos(), newParamInfos, newIndices, oldParamNames, newParamNames, newParameterTypeNames, permutation);
-		if (newVisibility != JdtFlags.VISIBILITY_CODE_INVALID)
-			ref.setVisibility(newVisibility);
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("precondition was supposed to pass", null, result);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		String expectedFileContents= getFileContents(getTestFileName(true, false));
-		assertEqualLines(expectedFileContents, newcu.getSource());
-	}
-	
-	private void markAsDeleted(List list, int[] deleted) {
-		if (deleted == null)
-			return;
-		for (int i= 0; i < deleted.length; i++) {
-			((ParameterInfo)list.get(i)).markAsDeleted();
-		}
-	}
-
-	private void helper1(String[] newOrder, String[] signature) throws Exception{
-		helper1(newOrder, signature, null, null);
-	}
-	
-	private void helper1(String[] newOrder, String[] signature, String[] oldNames, String[] newNames) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		IType classA= getType(cu, "A");
-		IMethod method = classA.getMethod("m", signature);
-		assertTrue("method does not exist", method.exists());
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-		modifyInfos(ref.getParameterInfos(), newOrder, oldNames, newNames);
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("precondition was supposed to pass", null, result);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		String expectedFileContents= getFileContents(getTestFileName(true, false));
-//		assertEquals("invalid renaming", expectedFileContents, newcu.getSource());
-		assertEqualLines(expectedFileContents, newcu.getSource());
-	}
-
-	private void modifyInfos(List infos, ParameterInfo[] newParamInfos, int[] newIndices, String[] oldParamNames, String[] newParamNames, String[] newParamTypeNames, int[] permutation) {
-		addInfos(infos, newParamInfos, newIndices);
-		List swapped= new ArrayList(infos.size());
-		List oldNameList= Arrays.asList(oldParamNames);
-		List newNameList= Arrays.asList(newParamNames);
-		for (int i= 0; i < permutation.length; i++) {
-			if (((ParameterInfo)infos.get(i)).isAdded())
-				continue;
-			if (! swapped.contains(new Integer(i))){
-				swapped.add(new Integer(permutation[i]));
-
-				ParameterInfo infoI= (ParameterInfo)infos.get(i);
-				infoI.setNewName((String)newNameList.get(oldNameList.indexOf(infoI.getOldName())));
-				if (newParamTypeNames != null)
-					infoI.setNewTypeName(newParamTypeNames[oldNameList.indexOf(infoI.getOldName())]);
-
-				ParameterInfo infoI1= (ParameterInfo)infos.get(permutation[i]);
-				infoI1.setNewName((String)newNameList.get(oldNameList.indexOf(infoI1.getOldName())));
-				if (newParamTypeNames != null)
-					infoI1.setNewTypeName(newParamTypeNames[oldNameList.indexOf(infoI1.getOldName())]);
-
-				swap(infos, i, permutation[i]);
-			}	
-		}
-	}
-
-	private static void modifyInfos(List infos, String[] newOrder, String[] oldNames, String[] newNames) {
-		int[] permutation= createPermutation(infos, newOrder);
-		List swapped= new ArrayList(infos.size());
-		if (oldNames == null || newNames == null){
-			ParameterInfo[] newInfos= new  ParameterInfo[infos.size()];
-			for (int i= 0; i < permutation.length; i++) {
-				newInfos[i]= (ParameterInfo)infos.get(permutation[i]);
-			}
-			infos.clear();
-			for (int i= 0; i < newInfos.length; i++) {
-				infos.add(newInfos[i]);
-			}
-			return;
-		} else {
-			List oldNameList= Arrays.asList(oldNames);
-			List newNameList= Arrays.asList(newNames);
-			for (int i= 0; i < permutation.length; i++) {
-				if (! swapped.contains(new Integer(i))){
-					swapped.add(new Integer(permutation[i]));
-					ParameterInfo infoI= (ParameterInfo)infos.get(i);
-					infoI.setNewName((String)newNameList.get(oldNameList.indexOf(infoI.getOldName())));
-					ParameterInfo infoI1= (ParameterInfo)infos.get(permutation[i]);
-					infoI1.setNewName((String)newNameList.get(oldNameList.indexOf(infoI1.getOldName())));
-					swap(infos, i, permutation[i]);
-				}				
-			}
-		}
-	}
-
-	private static void swap(List infos, int i, int i1) {
-		Object o= infos.get(i);
-		infos.set(i, infos.get(i1));
-		infos.set(i1, o);
-	}
-
-	private static int[] createPermutation(List infos, String[] newOrder) {
-		int[] result= new int[infos.size()];
-		for (int i= 0; i < result.length; i++) {
-			result[i]= indexOfOldName(infos, newOrder[i]);
-		}
-		return result;
-	}
-
-	private static int indexOfOldName(List infos, String string) {
-		for (Iterator iter= infos.iterator(); iter.hasNext();) {
-			ParameterInfo info= (ParameterInfo) iter.next();
-			if (info.getOldName().equals(string))
-				return infos.indexOf(info);
-		}
-		assertTrue(false);
-		return -1;
-	}
-
-	private void helperFail(String[] newOrder, String[] signature, int expectedSeverity) throws Exception{
-		IType classA= getType(createCUfromTestFile(getPackageP(), false, false), "A");
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(classA.getMethod("m", signature));
-		modifyInfos(ref.getParameterInfos(), newOrder, null, null);
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);		
-		assertEquals("Severity:", expectedSeverity, result.getSeverity());
-	}
-
-	private void helperAddFail(String[] signature, ParameterInfo[] newParamInfos, int[] newIndices, int expectedSeverity) throws Exception{
-		IType classA= getType(createCUfromTestFile(getPackageP(), false, false), "A");
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(classA.getMethod("m", signature));
-		addInfos(ref.getParameterInfos(), newParamInfos, newIndices);
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);		
-		assertEquals("Severity:" + result.getMessageMatchingSeverity(result.getSeverity()), expectedSeverity, result.getSeverity());
-	}
-	
-	private void helperDoAllFail(String methodName, 
-								String[] signature, 
-							  	ParameterInfo[] newParamInfos, 
-							  	int[] newIndices, 
-							  	String[] oldParamNames, 
-							  	String[] newParamNames, 
-							  	int[] permutation, 
-							  	int newVisibility,
-							  	int[] deleted,
-							  	int expectedSeverity)  throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, false);
-		IType classA= getType(cu, "A");
-		IMethod method = classA.getMethod(methodName, signature);
-		assertTrue("method does not exist", method.exists());
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-		markAsDeleted(ref.getParameterInfos(), deleted);	
-		modifyInfos(ref.getParameterInfos(), newParamInfos, newIndices, oldParamNames, newParamNames, null, permutation);
-		if (newVisibility != JdtFlags.VISIBILITY_CODE_INVALID)
-			ref.setVisibility(newVisibility);
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);	
-		assertEquals("Severity:" + result.getMessageMatchingSeverity(result.getSeverity()), expectedSeverity, result.getSeverity());		
-	}
-	
-	private void helperDoAllWithExceptions(String typeName, 
-			String methodName, 
-		  	String[] signature, 
-		  	ParameterInfo[] newParamInfos, 
-		  	int[] newIndices, 
-		  	String[] oldParamNames, 
-		  	String[] newParamNames, 
-		  	String[] newParameterTypeNames, 
-		  	int[] permutation,
-		  	int newVisibility,
-		  	int[] deleted,
-			String returnTypeName,
-			String [] removeExceptions,
-			String[] addExceptions) throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		IType classA= getType(cu, typeName);
-		IMethod method = classA.getMethod(methodName, signature);
-		assertTrue("method " + methodName +" does not exist", method.exists());
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-		if (returnTypeName != null)
-		ref.setNewReturnTypeName(returnTypeName);
-		markAsDeleted(ref.getParameterInfos(), deleted);	
-		modifyInfos(ref.getParameterInfos(), newParamInfos, newIndices, oldParamNames, newParamNames, newParameterTypeNames, permutation);
-		if (newVisibility != JdtFlags.VISIBILITY_CODE_INVALID)
-		ref.setVisibility(newVisibility);
-
-		// from RefactoringTest#performRefactoring():
-		RefactoringStatus status= ref.checkInitialConditions(new NullProgressMonitor());
-		assertTrue("checkActivation was supposed to pass", status.isOK());
-	
-		mangleExceptions(ref.getExceptionInfos(), removeExceptions, addExceptions, method.getCompilationUnit());
-	
-		status= ref.checkFinalConditions(new NullProgressMonitor());
-		assertTrue("checkInput was supposed to pass", status.isOK());
-		Change undo= performChange(ref, true);
-		assertNotNull(undo);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		String expectedFileContents= getFileContents(getTestFileName(true, false));
-		assertEqualLines(expectedFileContents, newcu.getSource());
-	}
-
-	
-	private void helperException(String[] signature, String[] removeExceptions, String[] addExceptions) throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		IType classA= getType(cu, "A");
-		IMethod method = classA.getMethod("m", signature);
-		assertTrue("method does not exist", method.exists());
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-	
-		// from RefactoringTest#performRefactoring():
-		RefactoringStatus status= ref.checkInitialConditions(new NullProgressMonitor());
-		assertTrue("checkActivation was supposed to pass", status.isOK());
-	
-		mangleExceptions(ref.getExceptionInfos(), removeExceptions, addExceptions, method.getCompilationUnit());
-	
-		status= ref.checkFinalConditions(new NullProgressMonitor());
-		assertTrue("checkInput was supposed to pass", status.isOK());
-		Change undo= performChange(ref, true);
-		assertNotNull(undo);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		String expectedFileContents= getFileContents(getTestFileName(true, false));
-		assertEqualLines("invalid renaming", expectedFileContents, newcu.getSource());
-	}
-	
-	
-	private void mangleExceptions(List list, String[] removeExceptions, String[] addExceptions, ICompilationUnit cu) throws Exception {
-		for (Iterator iter= list.iterator(); iter.hasNext(); ) {
-			ExceptionInfo info= (ExceptionInfo) iter.next();
-			String name= JavaModelUtil.getFullyQualifiedName(info.getType());
-			for (int i= 0; i < removeExceptions.length; i++) {
-				if (name.equals(removeExceptions[i]))
-					info.markAsDeleted();
-			}
-		}
-		for (int i= 0; i < addExceptions.length; i++) {
-			IType type= JavaModelUtil.findType(cu.getJavaProject(), addExceptions[i]);
-			list.add(ExceptionInfo.createInfoForAddedException(type));
-		}
-	}
-
-	//------- tests 
-	
-	public void testFail0() throws Exception{
-		helperFail(new String[]{"j", "i"}, new String[]{"I", "I"}, RefactoringStatus.ERROR);
-	}
-	
-	public void testFail1() throws Exception{
-		helperFail(new String[0], new String[0], RefactoringStatus.FATAL);
-	}
-
-	public void testFailAdd2() throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		helperAddFail(signature, newParamInfo, newIndices, RefactoringStatus.ERROR);
-	}
-
-	public void testFailAdd3() throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"not good"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		helperAddFail(signature, newParamInfo, newIndices, RefactoringStatus.FATAL);
-	}
-
-	public void testFailAdd4() throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"not a type"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		helperAddFail(signature, newParamInfo, newIndices, RefactoringStatus.FATAL);
-	}
-	
-	public void testFailDoAll5()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"i", "j"};
-		String[] newParamNames= {"i", "j"};
-		int[] permutation= {0};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		int expectedSeverity= RefactoringStatus.ERROR;
-		helperDoAllFail("m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, permutation, newVisibility, deletedIndices, expectedSeverity);
-	}	
-	
-	public void testFailDoAll6()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"a"};
-		String[] newTypes= {"Certificate"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		int expectedSeverity= RefactoringStatus.ERROR;
-		helperDoAllFail("m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, permutation, newVisibility, deletedIndices, expectedSeverity);
-	}	
-
-	public void testFailDoAll7()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"a"};
-		String[] newTypes= {"Fred"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		int expectedSeverity= RefactoringStatus.ERROR;
-		helperDoAllFail("m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, permutation, newVisibility, deletedIndices, expectedSeverity);
-	}	
-	
-	public void testFailDoAll8()throws Exception{
-		String[] signature= {"I"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= {0};
-		
-		String[] oldParamNames= {"I"};
-		String[] newParamNames= {};
-		int[] permutation= {};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		int expectedSeverity= RefactoringStatus.ERROR;
-		helperDoAllFail("run", signature, newParamInfo, newIndices, oldParamNames, newParamNames, permutation, newVisibility, deletedIndices, expectedSeverity);
-	}	
-
-	//---------
-	public void test0() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}
-	
-	public void test1() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}
-	
-	public void test2() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}
-	
-	public void test3() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}
-	
-	public void test4() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}
-	
-	public void test5() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}
-	
-	public void test6() throws Exception{
-		helper1(new String[]{"k", "i", "j"}, new String[]{"I", "I", "I"});
-	}
-
-	public void test7() throws Exception{
-		helper1(new String[]{"i", "k", "j"}, new String[]{"I", "I", "I"});
-	}
-
-	public void test8() throws Exception{
-		helper1(new String[]{"k", "j", "i"}, new String[]{"I", "I", "I"});
-	}
-	
-	public void test9() throws Exception{
-		helper1(new String[]{"j", "i", "k"}, new String[]{"I", "I", "I"});
-	}
-
-	public void test10() throws Exception{
-		helper1(new String[]{"j", "k", "i"}, new String[]{"I", "I", "I"});
-	}
-
-	public void test11() throws Exception{
-		helper1(new String[]{"j", "k", "i"}, new String[]{"I", "I", "I"});
-	}
-
-	public void test12() throws Exception{
-		helper1(new String[]{"j", "k", "i"}, new String[]{"I", "I", "I"});
-	}
-
-	public void test13() throws Exception{
-		helper1(new String[]{"j", "k", "i"}, new String[]{"I", "I", "I"});
-	}
-	
-	public void test14() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}
-	
-	public void test15() throws Exception{
-		helper1(new String[]{"b", "i"}, new String[]{"I", "Z"});
-	}
-	
-	public void test16() throws Exception{
-		helper1(new String[]{"b", "i"}, new String[]{"I", "Z"});
-	}
-	
-	public void test17() throws Exception{
-		//exception because of bug 11151
-		helper1(new String[]{"b", "i"}, new String[]{"I", "Z"});
-	}
-	
-	public void test18() throws Exception{
-		//exception because of bug 11151
-		helper1(new String[]{"b", "i"}, new String[]{"I", "Z"});
-	}
-	
-	public void test19() throws Exception{
-//		printTestDisabledMessage("bug 7274 - reorder parameters: incorrect when parameters have more than 1 modifiers");
-		helper1(new String[]{"b", "i"}, new String[]{"I", "Z"});
-	}
-	public void test20() throws Exception{
-//		printTestDisabledMessage("bug 18147");
-		helper1(new String[]{"b", "a"}, new String[]{"I", "[I"});
-	}
-
-//constructor tests
-	public void test21() throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-		String[] signature= {"I", "I"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"a", "b"};
-		String[] newParamNames= {"a", "b"};
-		int[] permutation= {1, 0};
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		int[] deleted= null;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deleted, newReturnTypeName);
-	}
-	public void test22() throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-		String[] signature= {"I", "I"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"a", "b"};
-		String[] newParamNames= {"a", "b"};
-		int[] permutation= {1, 0};
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		int[] deleted= null;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deleted, newReturnTypeName);
-	}
-	public void test23() throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-		String[] signature= {"I", "I"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"a", "b"};
-		String[] newParamNames= {"a", "b"};
-		int[] permutation= {1, 0};
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		int[] deleted= null;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deleted, newReturnTypeName);
-	}
-	public void test24() throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-//		if (true){
-//			printTestDisabledMessage("Bug 24230");
-//			return;
-//		}	
-		String[] signature= {"I", "I"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"a", "b"};
-		String[] newParamNames= {"a", "b"};
-		int[] permutation= {1, 0};
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		int[] deleted= null;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deleted, newReturnTypeName);
-	}
-	public void test25() throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-		String[] signature= {"I", "I"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"a", "b"};
-		String[] newParamNames= {"a", "b"};
-		int[] permutation= {1, 0};
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		int[] deleted= null;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deleted, newReturnTypeName);
-	}
-	public void test26() throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-		String[] signature= {"I", "I"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"a", "b"};
-		String[] newParamNames= {"a", "b"};
-		int[] permutation= {1, 0};
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		int[] deleted= null;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deleted, newReturnTypeName);
-	}
-
-	public void testRenameReorder26() throws Exception{
-		helper1(new String[]{"a", "y"}, new String[]{"Z", "I"}, new String[]{"y", "a"}, new String[]{"zzz", "bb"});
-	}
-	
-	public void testRenameReorder27() throws Exception{
-		helper1(new String[]{"a", "y"}, new String[]{"Z", "I"}, new String[]{"y", "a"}, new String[]{"yyy", "a"});
-	}
-
-	public void testAdd28()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-
-	public void testAdd29()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-
-	public void testAdd30()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-	
-	public void testAdd31()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-
-	public void testAdd32()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-
-	public void testAdd33()throws Exception{
-		String[] signature= {};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-
-	public void testAddReorderRename34()throws Exception{
-		String[] signature= {"I", "Z"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"Object"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-		
-		String[] oldParamNames= {"iii", "j"};
-		String[] newParamNames= {"i", "jj"};
-		int[] permutation= {2, -1, 0};
-		int[] deletedIndices= null;
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll35()throws Exception{
-		String[] signature= {"I", "Z"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"iii", "j"};
-		String[] newParamNames= oldParamNames;
-		int[] permutation= {0, 1};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll36()throws Exception{
-		String[] signature= {"I", "Z"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"iii", "j"};
-		String[] newParamNames= oldParamNames;
-		int[] permutation= {0, 1};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.PRIVATE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll37()throws Exception{
-		String[] signature= {"I", "Z"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"iii", "j"};
-		String[] newParamNames= oldParamNames;
-		int[] permutation= {0, 1};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.PROTECTED;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll38()throws Exception{
-		String[] signature= {"I", "Z"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"iii", "j"};
-		String[] newParamNames= oldParamNames;
-		int[] permutation= {0, 1};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.PROTECTED;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll39()throws Exception{
-		String[] signature= {"I", "Z"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"Object"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-		
-		String[] oldParamNames= {"iii", "j"};
-		String[] newParamNames= {"i", "jj"};
-		int[] permutation= {2, -1, 0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll40()throws Exception{
-		String[] signature= {"I", "Z"};
-		String[] newNames= {"x"};
-		String[] newTypes= {"int[]"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-		
-		String[] oldParamNames= {"iii", "j"};
-		String[] newParamNames= {"i", "jj"};
-		int[] permutation= {2, -1, 0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll41()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"i"};
-		String[] newParamNames= {"i"};
-		int[] permutation= {0};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll42()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"i"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-		
-		String[] oldParamNames= {"i"};
-		String[] newParamNames= {"i"};
-		int[] permutation= {0, -1};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll43()throws Exception{
-		String[] signature= {"I", "I"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"i", "j"};
-		String[] newParamNames= {"i", "j"};
-		int[] permutation= {1, 0};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll44()throws Exception{
-		if (true){
-			printTestDisabledMessage("need to decide how to treat compile errors");
-			return;
-		}
-		String[] signature= {"I", "I"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"i", "j"};
-		String[] newParamNames= {"i", "j"};
-		int[] permutation= {0, 1};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= "boolean";
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAll45()throws Exception{
-		if (true){
-			printTestDisabledMessage("need to decide how to treat compile errors");
-			return;
-		}
-		
-		String[] signature= {"I", "I"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"i", "j"};
-		String[] newParamNames= {"i", "j"};
-		String[] newParamTypeNames= {"int", "boolean"};
-		int[] permutation= {0, 1};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, newParamTypeNames, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-	
-	public void testAll46()throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-
-		String[] signature= {};
-		String[] newNames= {"i"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"1"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll47()throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-
-		String[] signature= {};
-		String[] newNames= {"i"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"1"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll48()throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-
-		String[] signature= {};
-		String[] newNames= {"i"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"1"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll49()throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-
-		String[] signature= {};
-		String[] newNames= {"i"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"1"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll50()throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-
-		String[] signature= {};
-		String[] newNames= {"i"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"1"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll51()throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-
-		String[] signature= {};
-		String[] newNames= {"i"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"1"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll52()throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-
-		String[] signature= {};
-		String[] newNames= {"i"};
-		String[] newTypes= {"int"};
-		String[] newDefaultValues= {"1"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "A", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll53()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"a"};
-		String[] newTypes= {"HashSet"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll54()throws Exception{
-		String[] signature= {"I"};
-		String[] newNames= {"a"};
-		String[] newTypes= {"List"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {0};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll55()throws Exception{
-//		printTestDisabledMessage("test for bug 32654 [Refactoring] Change method signature with problems");
-		String[] signature= {"[QObject;", "I", "Z"};
-		String[] newNames= {"e"};
-		String[] newTypes= {"boolean"};
-		String[] newDefaultValues= {"true"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {2};
-		helperAdd(signature, newParamInfo, newIndices);
-
-	}
-
-	public void testAll56()throws Exception{
-		if (! RUN_CONSTRUCTOR_TEST){
-			printTestDisabledMessage("disabled for constructors for now");
-			return;
-		}
-			
-//		printTestDisabledMessage("test for 38366 ArrayIndexOutOfBoundsException in change signeture [refactoring] ");
-		String[] signature= {"QEvaViewPart;", "I"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {};
-
-		String[] oldParamNames= {"part", "title"};
-		String[] newParamNames= {"part", "title"};
-		int[] permutation= {0, 1};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= null;
-		helperDoAll("HistoryFrame", "HistoryFrame", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll57()throws Exception{
-//		printTestDisabledMessage("test for 39633 classcast exception when refactoring change method signature [refactoring]");
-//		if (true)
-//			return;
-		String[] signature= {"I", "QString;", "QString;"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-
-		String[] oldParamNames= {"i", "hello", "goodbye"};
-		String[] newParamNames= oldParamNames;
-		int[] permutation= {0, 2, 1};
-		int[] deletedIndices= {};
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= null;
-		helperDoAll("TEST.X", "method", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll58()throws Exception{
-		String[] signature= {"I", "[[[QString;"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= null;
-
-		String[] oldParamNames= {"a", "b"};
-		String[] newParamNames= {"abb", "bbb"};
-		int[] permutation= {1, 0};
-		int[] deletedIndices= {};
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testAll59() throws Exception{
-		String[] signature= {"I", "J"};
-		String[] newNames= {"really"};
-		String[] newTypes= {"boolean"};
-		String[] newDefaultValues= {"true"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-
-		String[] oldParamNames= {"from", "to"};
-		String[] newParamNames= {"f", "t"};
-		String[] newParameterTypeNames= {"int", "char"};
-		int[] permutation= {0, 1, 2};
-		int[] deletedIndices= {};
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= "java.util.List";
-		helperDoAll("A", "getList", signature, newParamInfo, newIndices, oldParamNames, newParamNames, newParameterTypeNames, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-	
-	public void testAll60() throws Exception{
-		String[] signature= {"I", "J"};
-		String[] newNames= {"l"};
-		String[] newTypes= {"java.util.List"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-
-		String[] oldParamNames= {"from", "to"};
-		String[] newParamNames= {"to", "tho"};
-		String[] newParameterTypeNames= {"int", "long"};
-		int[] permutation= {2, 1, 0};
-		int[] deletedIndices= {};
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= "java.util.List";
-		String[] removeExceptions= {"java.io.IOException"};
-		String[] addExceptions= {"java.lang.Exception"};
-		helperDoAllWithExceptions("I", "getList", signature, newParamInfo, newIndices,
-				oldParamNames, newParamNames, newParameterTypeNames, permutation, newVisibility,
-				deletedIndices, newReturnTypeName, removeExceptions, addExceptions);
-	}
-
-	public void testAll61()throws Exception{ //bug 51634
-		String[] signature= {};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {};
-		String[] newParamNames= oldParamNames;
-		int[] permutation= {};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= "Object";
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}	
-
-	public void testAddRecursive1()throws Exception{ //bug 42100
-		String[] signature= {"I"};
-		String[] newNames= {"bool"};
-		String[] newTypes= {"boolean"};
-		String[] newDefaultValues= {"true"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {1};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-	
-	public void testException01() throws Exception {
-		String[] signature= {"J"};
-		String[] remove= {};
-		String[] add= {"java.util.zip.ZipException"};
-		helperException(signature, remove, add);
-	}
-	
-	public void testException02() throws Exception {
-		String[] add= new String[] {"java.lang.RuntimeException"};
-		helperException(new String[0], new String[0], add);
-	}
-
-	public void testException03() throws Exception { //bug 52091
-		String[] remove= new String[] {"java.lang.RuntimeException"};
-		helperException(new String[0], remove, new String[0]);
-	}
-
-	public void testException04() throws Exception { //bug 52058
-		String[] add= new String[] {"java.io.IOException", "java.lang.ClassNotFoundException"};
-		helperException(new String[0], new String[0], add);
-	}
-	
-	public void testException05() throws Exception { //bug 56132
-		String[] remove= new String[] {"java.lang.IllegalArgumentException", "java.io.IOException"};
-		helperException(new String[0], remove, new String[0]);
-	}
-
-	public void testInStatic01() throws Exception { //bug 47062
-		String[] signature= {"QString;", "QString;"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"arg1", "arg2"};
-		String[] newParamNames= {"a", "b"};
-		int[] permutation= {1, 0};
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		int[] deleted= null;
-		String newReturnTypeName= null;
-		helperDoAll("Example", "Example", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deleted, newReturnTypeName);
-	}
-
-	public void testInStatic02() throws Exception { //bug 47062
-		String[] signature= {"QString;", "QString;"};
-		ParameterInfo[] newParamInfo= null;
-		int[] newIndices= null;
-		
-		String[] oldParamNames= {"arg1", "arg2"};
-		String[] newParamNames= {"a", "b"};
-		int[] permutation= {1, 0};
-		int newVisibility= JdtFlags.VISIBILITY_CODE_INVALID;//retain
-		int[] deleted= null;
-		String newReturnTypeName= null;
-		helperDoAll("Example", "getExample", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deleted, newReturnTypeName);
-	}
-	
-	public void testName01() throws Exception {
-		String[] signature= {"QString;"};
-		helperRenameMethod(signature, "newName");
-	}
-
-	public void testName02() throws Exception {
-		String[] signature= {"QString;"};
-		helperRenameMethod(signature, "newName");
-	}
-	
-	public void testFailImport01() throws Exception {
-		String[] signature= {};
-		String[] newTypes= {"Permission"};
-		String[] newNames= {"p"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		helperAddFail(signature, newParamInfo, newIndices, RefactoringStatus.ERROR);
-	}
-
-	public void testImport01() throws Exception {
-		String[] signature= {};
-		String[] newTypes= {"java.security.acl.Permission", "Permission"};
-		String[] newNames= {"acl", "p"};
-		String[] newDefaultValues= {"null", "perm"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0, 0};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-
-	public void testImport02() throws Exception {
-		String[] signature= {};
-		String[] newTypes= {"Permission", "java.security.acl.Permission"};
-		String[] newNames= {"p", "acl"};
-		String[] newDefaultValues= {"null", "null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0, 0};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-
-	public void testImport03() throws Exception {
-		String[] signature= {};
-		String[] newTypes= {"java.security.acl.Permission", "java.security.Permission"};
-		String[] newNames= {"p", "pp"};
-		String[] newDefaultValues= {"0", "0"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0, 0};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-
-	public void testImport04() throws Exception {
-		String[] signature= {};
-		String[] newTypes= {"Object"};
-		String[] newNames= {"o"};
-		String[] newDefaultValues= {"null"};
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {0};
-		helperAdd(signature, newParamInfo, newIndices);
-	}
-	
-	public void testImport05() throws Exception {
-		// printTestDisabledMessage("49772: Change method signature: remove unused imports [refactoring]");
-		String[] signature= {};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {};
-
-		String[] oldParamNames= {};
-		String[] newParamNames= {};
-		int[] permutation= {};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= "Object";
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, null, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testImport06() throws Exception {
-		String[] signature= {"QPermission;", "Qjava.security.acl.Permission;"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {};
-
-		String[] oldParamNames= {"perm", "acl"};
-		String[] newParamNames= {"xacl", "xperm"};
-		String[] newParamTypeNames= {"java.security.acl.Permission [] []", "java.security.Permission"};
-		int[] permutation= {1, 0};
-		int[] deletedIndices= null;
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= "java.security.acl.Permission";
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, newParamTypeNames, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-
-	public void testImport07() throws Exception {
-		// printTestDisabledMessage("49772: Change method signature: remove unused imports [refactoring]");
-		String[] signature= {"QList;"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {};
-
-		String[] oldParamNames= {"list"};
-		String[] newParamNames= oldParamNames;
-		String[] newParamTypeNames= null;
-		int[] permutation= {0};
-		int[] deletedIndices= {0};
-		int newVisibility= Modifier.NONE;
-		String newReturnTypeName= null;
-		helperDoAll("A", "m", signature, newParamInfo, newIndices, oldParamNames, newParamNames, newParamTypeNames, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-	
-	public void testImport08() throws Exception {
-		// printTestDisabledMessage("68504: Refactor -> Change Method Signature removes import [refactoring]");
-		String[] signature= {"QString;", "QVector;"};
-		String[] newNames= null;
-		String[] newTypes= null;
-		String[] newDefaultValues= null;
-		ParameterInfo[] newParamInfo= createNewParamInfos(newTypes, newNames, newDefaultValues);
-		int[] newIndices= {};
-
-		String[] oldParamNames= {"text", "v"};
-		String[] newParamNames= oldParamNames;
-		String[] newParamTypeNames= null;
-		int[] permutation= {1, 0};
-		int[] deletedIndices= {};
-		int newVisibility= Modifier.PUBLIC;
-		String newReturnTypeName= null;
-		helperDoAll("A", "textContains", signature, newParamInfo, newIndices, oldParamNames, newParamNames, newParamTypeNames, permutation, newVisibility, deletedIndices, newReturnTypeName);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeTypeRefactoringTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeTypeRefactoringTests.java
deleted file mode 100644
index 48491ca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeTypeRefactoringTests.java
+++ /dev/null

@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Collection;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.corext.refactoring.structure.ChangeTypeRefactoring;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * @author rfuhrer, tip
- *
- */
-public class ChangeTypeRefactoringTests extends RefactoringTest {
-	private static final Class clazz= ChangeTypeRefactoringTests.class;
-	private static final String REFACTORING_PATH= "ChangeTypeRefactoring/";
-
-	public ChangeTypeRefactoringTests(String name) {
-		super(name);
-	} 
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-	
-	private String getSimpleTestFileName(boolean input) {
-		String fileName= "A_" + getName() + (input ? "_in" : "_out") + ".java";
-
-		return fileName;
-	}
-	
-	private String getTestFileName(boolean positive, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-
-		fileName += (positive ? "positive/": "negative/");
-		fileName += getSimpleTestFileName(input);
-		return fileName;
-	}
-	
-	private ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean positive, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(input), getFileContents(getTestFileName(positive, input)));
-	}
-	
-	private ICompilationUnit createAdditionalCU(String fileName, IPackageFragment pack) throws Exception {
-		String fullName= TEST_PATH_PREFIX + getRefactoringPath() + "positive/" + fileName + ".java";
-		return createCU(pack, fileName + ".java", getFileContents(fullName));
-	}
-
-	private ChangeTypeRefactoring helper1(int startLine, int startColumn, int endLine, int endColumn, String selectedTypeName)
-		throws Exception {
-		ICompilationUnit	cu= createCUfromTestFile(getPackageP(), true, true);
-		IType selectedType= getType(selectedTypeName, cu);
-		
-		ISourceRange		selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ChangeTypeRefactoring		ref= ChangeTypeRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-												   selectedType);
-	
-		// TODO Set parameters on your refactoring instance from arguments...
-	
-		RefactoringStatus	activationResult= ref.checkInitialConditions(new NullProgressMonitor());	
-	
-		assertTrue("activation was supposed to be successful:" + activationResult.toString(), activationResult.isOK());																
-	
-		RefactoringStatus	checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-	
-		assertTrue("precondition was supposed to pass but was " + checkInputResult.toString(), checkInputResult.isOK());
-	
-		performChange(ref, false);	
-		
-		String newSource= cu.getSource();
-	
-		assertEqualLines(getName() + ": ", getFileContents(getTestFileName(true, false)), newSource);
-	
-		
-		return ref;
-	}
-
-	private void failHelper1(int startLine, int startColumn, int endLine, int endColumn,
-							 int expectedStatus, String selectedTypeName) throws Exception {
-		ICompilationUnit	cu= createCUfromTestFile(getPackageP(), false, true);
-		IType selectedType= getType(selectedTypeName, cu);
-		ISourceRange		selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ChangeTypeRefactoring	ref= ChangeTypeRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-												   selectedType);
-		RefactoringStatus	result= performRefactoring(ref);
-
-		assertNotNull("precondition was supposed to fail", result);
-		assertEquals("status", expectedStatus, result.getSeverity());
-
-		String	canonAfterSrcName= getTestFileName(false, false);
-
-		assertEqualLines(getFileContents(canonAfterSrcName), cu.getSource());
-	}	
-	
-
-	public IType getType(String fullyQualifiedName, ICompilationUnit icu) throws JavaModelException {
-		return JavaModelUtil.findType(icu.getJavaProject(), fullyQualifiedName);
-	}
-
-	//--- TESTS
-	public void testLocalVarName() throws Exception {
-		System.out.println("running testLocalVarName()");
-		Collection types= helper1(5, 19, 5, 24, "java.util.Map").getValidTypeNames();
-		Assert.assertTrue(types.size() == 1);
-		Assert.assertTrue(types.contains("java.util.Map"));
-	}
-	public void testLocalVarType() throws Exception {
-		System.out.println("running testLocalVarType()");
-		Collection types= helper1(5, 9, 5, 18, "java.util.Map").getValidTypeNames();
-		Assert.assertTrue(types.size() == 1);
-		Assert.assertTrue(types.contains("java.util.Map"));		
-	}
-	public void testLocalVarDecl() throws Exception {
-		System.out.println("running testLocalVarDecl()");
-		Collection types= helper1(8, 9, 8, 23, "java.util.Map").getValidTypeNames();
-		Assert.assertTrue(types.size() == 1);
-		Assert.assertTrue(types.contains("java.util.Map")); 		
-	}
-	public void testLocalSuperTypesOfArrayList() throws Exception {
-		System.out.println("running testLocalSuperTypesOfArrayList()");
-		Collection types= helper1(5, 19, 5, 23, "java.util.List").getValidTypeNames();
-		Assert.assertTrue(types.size() == 7);
-		Assert.assertTrue(types.contains("java.lang.Object"));
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.AbstractCollection"));
-		Assert.assertTrue(types.contains("java.util.List"));
-		Assert.assertTrue(types.contains("java.util.Collection"));
-		Assert.assertTrue(types.contains("java.io.Serializable"));
-		Assert.assertTrue(types.contains("java.lang.Cloneable"));		
-	}
-	public void testParameterName() throws Exception {
-		System.out.println("running testParameterName()");
-		Collection types= helper1(4, 31, 4, 36, "java.util.Map").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.Map"));
-		Assert.assertTrue(types.contains("java.util.Dictionary"));		
-	}
-	public void testParameterType() throws Exception {
-		System.out.println("running testParameterType()");
-		Collection types= helper1(4, 21, 4, 29, "java.util.Dictionary").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.Map"));
-		Assert.assertTrue(types.contains("java.util.Dictionary"));				
-	}
-	public void testParameterDecl() throws Exception {
-		System.out.println("running testParameterDecl()");
-		Collection types= helper1(4, 21, 4, 36, "java.util.Map").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.Map"));
-		Assert.assertTrue(types.contains("java.util.Dictionary"));				
-	}
-	public void testFieldName() throws Exception {
-		System.out.println("running testFieldName()");
-		Collection types= helper1(10, 29, 10, 33, "java.util.AbstractList").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.List"));
-	}
-	public void testFieldType() throws Exception {
-		System.out.println("running testFieldType()");
-		Collection types= helper1(10, 19, 10, 27, "java.util.AbstractList").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.List"));
-	}
-	public void testFieldDecl() throws Exception {
-		System.out.println("running testFieldDecl()");
-		Collection types= helper1(10, 19, 10, 32, "java.util.AbstractList").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.List"));
-	}
-	public void testFieldUseSubtypesOfList() throws Exception {
-		System.out.println("running testFieldUseSubtypesOfList()");
-		Collection types= helper1(5, 22, 5, 26, "java.util.List").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.List"));
-	}
-	public void testFieldDeclSubtypesOfList() throws Exception {
-		System.out.println("running testFieldDeclSubtypesOfList()");
-		Collection types= helper1(8, 12, 8, 25, "java.util.List").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.List"));		
-	}
-	public void testLocalVarUse() throws Exception {
-		System.out.println("running testLocalVarUse()");
-		Collection types= helper1(6, 22, 6, 26, "java.util.AbstractList").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.List"));
-	}
-	public void testReturnTypeWithCall() throws Exception {
-		System.out.println("running testReturnTypeWithCall()");
-		Collection types= helper1(4, 12, 4, 20, "java.util.AbstractList").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.List"));		
-	}
-	public void testParameterNameWithOverride() throws Exception {
-		System.out.println("running testParameterNameWithOverride()");
-		Collection types= helper1(5, 38, 5, 40, "java.util.Collection").getValidTypeNames();
-		Assert.assertTrue(types.size() == 3);
-		Assert.assertTrue(types.contains("java.util.AbstractCollection"));
-//		Assert.assertTrue(types.contains("java.util.ArrayList"));
-		Assert.assertTrue(types.contains("java.util.List"));
-		Assert.assertTrue(types.contains("java.util.Collection"));		
-	}
-	public void testParameterTypeWithOverride() throws Exception {
-		System.out.println("running testParameterTypeWithOverride()");
-		Collection types= helper1(10, 25, 10, 36, "java.util.List").getValidTypeNames();
-		Assert.assertTrue(types.size() == 3);
-		Assert.assertTrue(types.contains("java.util.AbstractCollection"));
-//		Assert.assertTrue(types.contains("java.util.ArrayList"));
-		Assert.assertTrue(types.contains("java.util.List"));
-		Assert.assertTrue(types.contains("java.util.Collection"));		
-	}
-	public void testParameterDeclWithOverride() throws Exception {
-		System.out.println("running testParameterDeclWithOverride()");
-		Collection types= helper1(10, 25, 10, 39, "java.util.ArrayList").getValidTypeNames();
-		Assert.assertTrue(types.size() == 3);
-		Assert.assertTrue(types.contains("java.util.AbstractCollection"));
-//		Assert.assertTrue(types.contains("java.util.ArrayList"));
-		Assert.assertTrue(types.contains("java.util.List"));
-		Assert.assertTrue(types.contains("java.util.Collection"));		
-	}
-	public void testLocalVarCast() throws Exception {
-		System.out.println("running testLocalVarCast()");
-		Collection types= helper1(7, 24, 7, 24, "java.util.List").getValidTypeNames();
-		Assert.assertTrue(types.size() == 7);
-		Assert.assertTrue(types.contains("java.io.Serializable"));
-		Assert.assertTrue(types.contains("java.util.Collection"));		
-		Assert.assertTrue(types.contains("java.util.List"));
-		Assert.assertTrue(types.contains("java.util.AbstractList"));		
-		Assert.assertTrue(types.contains("java.lang.Object"));
-		Assert.assertTrue(types.contains("java.lang.Cloneable"));
-		Assert.assertTrue(types.contains("java.util.AbstractCollection"));		
-	}
-	public void testReturnType() throws Exception {
-		System.out.println("running testReturnType()");
-		createAdditionalCU("A_testReturnType2", getPackageP());
-		Collection types= helper1(6, 12, 6, 15, "java.util.Collection").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.Collection"));
-		Assert.assertTrue(types.contains("java.lang.Object"));
-	}	
-	public void testFieldWithAccess() throws Exception {
-		System.out.println("running testFieldWithAccess()");
-		createAdditionalCU("A_testFieldWithAccess2", getPackageP());
-		Collection types= helper1(6, 12, 6, 21, "java.util.Collection").getValidTypeNames();
-		Assert.assertTrue(types.size() == 1);
-		Assert.assertTrue(types.contains("java.util.Collection"));
-	}	
-	public void testParameterTypeWithOverriding() throws Exception {
-		System.out.println("running testParameterTypeWithOverriding()");
-		createAdditionalCU("A_testParameterTypeWithOverriding2", getPackageP());
-		Collection types= helper1(6, 21, 6, 24, "java.util.Collection").getValidTypeNames();
-		Assert.assertTrue(types.size() == 1);
-		Assert.assertTrue(types.contains("java.util.Collection"));
-	}
-	public void testMultiCU() throws Exception {
-		System.out.println("running testMultiCU()");
-		createAdditionalCU("A_testMultiCUInterface1", getPackageP());
-		createAdditionalCU("A_testMultiCUInterface2", getPackageP());
-		createAdditionalCU("A_testMultiCUClass1", getPackageP());
-		createAdditionalCU("A_testMultiCUClass2", getPackageP());
-		Collection types= helper1(6, 21, 6, 26, "java.util.Collection").getValidTypeNames();
-		Assert.assertTrue(types.size() == 1);
-		Assert.assertTrue(types.contains("java.util.Collection"));
-	}
-	public void testHashMap() throws Exception {
-		System.out.println("running testHashMap()");
-		Collection types= helper1(15, 17, 15, 19, "java.util.AbstractMap").getValidTypeNames();
-		Assert.assertTrue(types.size() == 2);
-		Assert.assertTrue(types.contains("java.util.AbstractMap"));
-		Assert.assertTrue(types.contains("java.util.Map"));
-	}
-	public void testString() throws Exception {
-		System.out.println("running testString()");
-		Collection types= helper1(4, 9, 4, 14, "java.lang.Object").getValidTypeNames();
-		Assert.assertTrue(types.size() == 3);
-		Assert.assertTrue(types.contains("java.lang.Object"));
-//		Assert.assertTrue(types.contains("java.lang.CharSequence")); // not in rtstubs.jar
-		Assert.assertTrue(types.contains("java.lang.Comparable"));
-		Assert.assertTrue(types.contains("java.io.Serializable"));	
-	}
-	public void testInterfaceTypes() throws Exception {
-		System.out.println("running testInterfaceTypes()");
-		Collection types= helper1(4, 11, 4, 11, "p.I").getValidTypeNames();
-		Assert.assertTrue(types.size() == 3);
-		Assert.assertTrue(types.contains("java.lang.Object"));
-		Assert.assertTrue(types.contains("p.I"));
-		Assert.assertTrue(types.contains("p.A"));
-	}
-	public void testImport() throws Exception {
-		System.out.println("running testImport()");
-		Collection types= helper1(11, 9, 11, 17, "java.util.List").getValidTypeNames();
-		Assert.assertTrue(types.size() == 7);
-		Assert.assertTrue(types.contains("java.io.Serializable"));
-		Assert.assertTrue(types.contains("java.lang.Cloneable"));
-		Assert.assertTrue(types.contains("java.lang.Object"));
-		Assert.assertTrue(types.contains("java.util.List"));
-		Assert.assertTrue(types.contains("java.util.AbstractList"));
-		Assert.assertTrue(types.contains("java.util.Collection"));
-		Assert.assertTrue(types.contains("java.util.AbstractCollection"));
-	}
-	
-	
-	// tests that are supposed to fail
-	
-	public void testInvalidSelection() throws Exception {
-		System.out.println("running testInvalidSelection()");
-		failHelper1(5, 23, 5, 37, 4, "java.lang.Object");
-	}
-	public void testBogusSelection() throws Exception {
-		System.out.println("running testBogusSelection()");
-		failHelper1(6, 23, 6, 35, 4, "java.lang.Object");
-	}
-	public void testMultiDeclaration() throws Exception {
-		System.out.println("running testMultiDeclaration()");
-		failHelper1(8, 22, 8, 26, 4, "java.util.List");		
-	}
-	public void testUpdateNotPossible() throws Exception {
-		System.out.println("running testUpdateNotPossible()");
-		failHelper1(5, 19, 5, 20, 4, "java.util.Hashtable");
-	}
-	public void testArray() throws Exception {
-		System.out.println("running testArray()");
-		failHelper1(5, 18, 5, 19, 4, "java.util.Object[]");
-	}
-	public void testPrimitive() throws Exception {
-		System.out.println("running testPrimitive()");
-		failHelper1(5, 13, 5, 13, 4, "java.util.Object");
-	}
-	public void testOverriddenBinaryMethod() throws Exception {
-		System.out.println("running testOverriddenBinaryMethod()");
-		failHelper1(3, 12, 3, 17, 4, "java.lang.Object");
-	}
-	public void testFieldOfLocalType() throws Exception {
-		System.out.println("running testFieldOfLocalType()");
-		failHelper1(5, 21, 5, 45, 4, "java.lang.Object");
-	}
-	public void testObjectReturnType() throws Exception {
-		System.out.println("running testObjectReturnType()");
-		failHelper1(3, 17, 3, 22, 4, "java.lang.Object");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ConvertAnonymousToNestedTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ConvertAnonymousToNestedTests.java
deleted file mode 100644
index a2182f5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ConvertAnonymousToNestedTests.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     N.Metchev@teamphone.com - contributed fixes for
- *     - convert anonymous to nested should sometimes declare class as static [refactoring] 
- *       (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=43360)
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.jdt.internal.corext.refactoring.code.ConvertAnonymousToNestedRefactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class ConvertAnonymousToNestedTests extends RefactoringTest {
-
-	private static final Class clazz= ConvertAnonymousToNestedTests.class;
-	private static final String REFACTORING_PATH= "ConvertAnonymousToNested/";
-
-	private Object fCompactPref; 
-		
-	public ConvertAnonymousToNestedTests(String name) {
-		super(name);
-	} 
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-	    return new RefactoringTestSetup(someTest);
-	}
-	
-	private String getSimpleTestFileName(boolean canInline, boolean input){
-		String fileName = "A_" + getName();
-		if (canInline)
-			fileName += input ? "_in": "_out";
-		return fileName + ".java"; 
-	}
-	
-	private String getTestFileName(boolean canConvert, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += (canConvert ? "canConvert/": "cannotConvert/");
-		return fileName + getSimpleTestFileName(canConvert, input);
-	}
-	
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean canConvert, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(canConvert, input), getFileContents(getTestFileName(canConvert, input)));
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		Hashtable options= JavaCore.getOptions();
-		
-		String setting= DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR;
-		fCompactPref= options.get(setting);
-		options.put(setting, DefaultCodeFormatterConstants.TRUE);
-		JavaCore.setOptions(options);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		Hashtable options= JavaCore.getOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, fCompactPref);
-		JavaCore.setOptions(options);	
-	}
-
-	private void helper1(int startLine, int startColumn, int endLine, int endColumn, boolean makeFinal, String className, int visibility) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ConvertAnonymousToNestedRefactoring ref= ConvertAnonymousToNestedRefactoring.create(cu, selection.getOffset(), selection.getLength());
-
-		RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());	
-		if (preconditionResult.isOK())
-			preconditionResult= null;
-		assertEquals("activation was supposed to be successful", null, preconditionResult);
-
-		ref.setClassName(className);
-		ref.setDeclareFinal(makeFinal);
-		ref.setVisibility(visibility);
-		
-		if (preconditionResult == null)
-			preconditionResult= ref.checkFinalConditions(new NullProgressMonitor());
-		else	
-			preconditionResult.merge(ref.checkFinalConditions(new NullProgressMonitor()));
-		if (preconditionResult.isOK())
-			preconditionResult= null;
-		assertEquals("precondition was supposed to pass", null, preconditionResult);
-		
-		performChange(ref, false);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		assertEqualLines(getFileContents(getTestFileName(true, false)), newcu.getSource());
-	}
-	
-	private void failHelper1(int startLine, int startColumn, int endLine, int endColumn, boolean makeFinal, String className, int visibility, int expectedSeverity) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ConvertAnonymousToNestedRefactoring ref= ConvertAnonymousToNestedRefactoring.create(cu, selection.getOffset(), selection.getLength());
-
-		RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());	
-		if (preconditionResult.isOK())
-			preconditionResult= null;
-		assertEquals("activation was supposed to be successful", null, preconditionResult);
-
-		ref.setClassName(className);
-		ref.setDeclareFinal(makeFinal);
-		ref.setVisibility(visibility);
-		
-		if (preconditionResult == null)
-			preconditionResult= ref.checkFinalConditions(new NullProgressMonitor());
-		else	
-			preconditionResult.merge(ref.checkFinalConditions(new NullProgressMonitor()));
-		if (preconditionResult.isOK())
-			preconditionResult= null;
-		assertNotNull("precondition was supposed to fail",preconditionResult);
-
-		assertEquals("incorrect severity:", expectedSeverity, preconditionResult.getSeverity());
-	}	
-
-	private void failActivationHelper(int startLine, int startColumn, int endLine, int endColumn, boolean makeFinal, String className, int visibility, int expectedSeverity) throws Exception{
-	    ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);
-	    ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-	    ConvertAnonymousToNestedRefactoring ref= ConvertAnonymousToNestedRefactoring.create(cu, selection.getOffset(), selection.getLength());
-
-	    RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());	
-	    assertEquals("activation was supposed to fail", expectedSeverity, preconditionResult.getSeverity());
-	}	
-
-	//--- TESTS
-
-	public void testFail0() throws Exception{
-		printTestDisabledMessage("corner case - local types");
-//		failHelper1(6, 14, 6, 16, true, "Inner", Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-
-	public void testFail1() throws Exception{
-		failHelper1(5, 17, 5, 17, true, "Inner", Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-
-	public void testFail2() throws Exception{
-		failHelper1(5, 17, 5, 18, true, "Inner", Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-	
-	public void testFail3() throws Exception{
-	    failActivationHelper(10, 27, 10, 27, true, "Inner", Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-	
-	public void testFail4() throws Exception{
-	    failHelper1(8, 31, 8, 31, true, "Inner", Modifier.PRIVATE, RefactoringStatus.ERROR);
-	}
-	
-	public void test0() throws Exception{
-		helper1(5, 17, 5, 17, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test1() throws Exception{
-		helper1(5, 17, 5, 17, true, "Inner", Modifier.PUBLIC);
-	}
-
-	public void test2() throws Exception{
-		helper1(5, 17, 5, 17, true, "Inner", Modifier.PUBLIC);
-	}
-
-	public void test3() throws Exception{
-		helper1(5, 17, 5, 17, false, "Inner", Modifier.PUBLIC);
-	}
-
-	public void test4() throws Exception{
-		helper1(7, 17, 7, 17, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test5() throws Exception{
-		helper1(7, 17, 7, 19, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test6() throws Exception{
-		helper1(8, 13, 9, 14, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test7() throws Exception{
-		helper1(7, 18, 7, 18, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test8() throws Exception{
-		helper1(8, 14, 8, 15, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test9() throws Exception{
-		helper1(8, 13, 8, 14, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test10() throws Exception{
-		helper1(7, 13, 7, 14, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test11() throws Exception{
-		helper1(5, 15, 5, 17, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test12() throws Exception{
-		helper1(8, 9, 10, 10, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test13() throws Exception{
-		helper1(6, 28, 6, 28, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test14() throws Exception{
-		helper1(5, 13, 5, 23, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test15() throws Exception{
-		helper1(7, 26, 7, 26, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test16() throws Exception{
-		helper1(4, 10, 4, 26, true, "Inner", Modifier.PRIVATE);
-	}
-	
-	public void test17() throws Exception{
-		helper1(6, 14, 6, 15, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test18() throws Exception{
-		helper1(5, 15, 5, 17, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test19() throws Exception{
-		helper1(5, 12, 6, 21, true, "Inner", Modifier.PRIVATE);
-	}
-
-	public void test20() throws Exception{
-		helper1(4, 25, 4, 25, true, "Inner", Modifier.PRIVATE);
-	}
-
-    public void test21() throws Exception{
-        helper1(4, 25, 4, 25, true, "Inner", Modifier.PRIVATE);   
-    }
-
-    public void test22() throws Exception{
-    	helper1(9, 34, 9, 34, true, "Inner", Modifier.PRIVATE);   
-    }
-    
-    public void test23() throws Exception{
-    	helper1(6, 33, 6, 33, true, "Inner", Modifier.PRIVATE);   
-    }
-    
-    public void test24() throws Exception{
-    	helper1(3, 26, 3, 26, true, "Inner", Modifier.PRIVATE);   
-    }
-
-    public void test25() throws Exception{
-    	helper1(8, 28, 8, 28, true, "Inner", Modifier.PRIVATE);   
-    }
-
-    public void test26() throws Exception{
-    	helper1(8, 28, 8, 28, true, "Inner", Modifier.PRIVATE);   
-    }
-
-    public void test27() throws Exception{
-    	helper1(11, 39, 11, 39, true, "Inner", Modifier.PRIVATE);   
-    }
-
-    public void test28() throws Exception{
-//        printTestDisabledMessage("disabled: bug 43360");
-    	helper1(10, 27, 10, 27, true, "Inner", Modifier.PRIVATE);   
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/CopyPackageChangeTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/CopyPackageChangeTest.java
deleted file mode 100644
index f76e463..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/CopyPackageChangeTest.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.internal.corext.refactoring.changes.CopyPackageChange;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-public class CopyPackageChangeTest extends RefactoringTest {
-
-	private static final String REFACTORING_PATH= "CopyPackageChange/";
-	private static final Class clazz= CopyPackageChangeTest.class;
-	
-	public CopyPackageChangeTest(String name) {
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public void test0() throws Exception{
-		createCU(getPackageP(), "A.java", getFileContents(getRefactoringPath() + "A.java"));
-		
-		IPackageFragmentRoot newRoot= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "newName");
-		
-		String packName= getPackageP().getElementName();
-		CopyPackageChange change= new CopyPackageChange(getPackageP(), newRoot, null);
-		change.initializeValidationData(new NullProgressMonitor());
-		performChange(change);
-		IPackageFragment copied= newRoot.getPackageFragment(packName);
-		assertTrue("copied.exists()", copied.exists());
-		assertTrue(copied.getChildren().length == 1);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractConstantTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractConstantTests.java
deleted file mode 100644
index 26eaf84..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractConstantTests.java
+++ /dev/null

@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatusCodes;
-import org.eclipse.jdt.internal.corext.refactoring.code.ExtractConstantRefactoring;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class ExtractConstantTests extends RefactoringTest {
-
-	private static final Class clazz = ExtractConstantTests.class;
-	private static final String REFACTORING_PATH = "ExtractConstant/";
-
-	private Object fCompactPref; 
-		
-	public ExtractConstantTests(String name) {
-		super(name);
-	} 
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	private String getSimpleTestFileName(boolean canInline, boolean input){
-		String fileName = "A_" + getName();
-		if (canInline)
-			fileName += input ? "_in": "_out";
-		return fileName + ".java"; 
-	}
-	
-	private String getTestFileName(boolean canExtract, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += (canExtract ? "canExtract/": "cannotExtract/");
-		return fileName + getSimpleTestFileName(canExtract, input);
-	}
-	
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean canExtract, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(canExtract, input), getFileContents(getTestFileName(canExtract, input)));
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		Hashtable options= JavaCore.getOptions();
-		
-		String setting= DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR;
-		fCompactPref= options.get(setting);
-		options.put(setting, DefaultCodeFormatterConstants.TRUE);
-		JavaCore.setOptions(options);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		Hashtable options= JavaCore.getOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, fCompactPref);
-		JavaCore.setOptions(options);	
-	}
-
-	private void guessHelper(int startLine, int startColumn, int endLine, int endColumn, String expectedGuessedName) throws Exception {
-		ICompilationUnit cu= createCU(getPackageP(), getName()+".java", getFileContents(TEST_PATH_PREFIX + getRefactoringPath() + "nameGuessing/" + getName()+".java"));
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ExtractConstantRefactoring ref= ExtractConstantRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-																									JavaPreferencesSettings.getCodeGenerationSettings());		
-		RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());
-		assertTrue("activation was supposed to be successful" + preconditionResult.toString(), preconditionResult.isOK());
-		assertEquals("contant name not guessed", expectedGuessedName, ref.guessConstantName());
-	}
-
-	private void helper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean allowLoadtime, boolean qualifyReferencesWithConstantName, String constantName, String guessedConstantName) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ExtractConstantRefactoring ref= ExtractConstantRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-																									JavaPreferencesSettings.getCodeGenerationSettings());
-		RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());
-		assertTrue("activation was supposed to be successful" + preconditionResult.toString(), preconditionResult.isOK());
-
-		if(!allowLoadtime)
-			assertTrue("The selected expression has been erroneously reported to contain references to non-static or non-final fields.", ref.selectionAllStaticFinal());		
-		
-		ref.setReplaceAllOccurrences(replaceAll);
-		ref.setQualifyReferencesWithDeclaringClassName(qualifyReferencesWithConstantName);
-		ref.setConstantName(constantName);
-
-		assertEquals("constant name incorrectly guessed", guessedConstantName, ref.guessConstantName());
-
-		RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-		assertTrue("precondition was supposed to pass", checkInputResult.isOK());	
-		
-		performChange(ref, false);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		assertEqualLines(getFileContents(getTestFileName(true, false)), newcu.getSource());
-	}
-
-	private void helper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean allowLoadtime, String constantName, String guessedConstantName) throws Exception{	
-		helper1(startLine, startColumn, endLine, endColumn, replaceAll, allowLoadtime, false, constantName, guessedConstantName);
-	}
-	
-	private void helper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean allowLoadtime, boolean qualifyReferencesWithConstantName, String constantName) throws Exception{	
-		helper1(startLine, startColumn, endLine, endColumn, replaceAll, allowLoadtime, qualifyReferencesWithConstantName, constantName, constantName);
-	}
-	
-	private void helper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean allowLoadtime, String constantName) throws Exception{
-		helper1(startLine, startColumn, endLine, endColumn, replaceAll, allowLoadtime, false, constantName);
-	}	
-	
-	private void failHelper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean allowLoadtime, String constantName) throws Exception {
-		failHelper1(startLine, startColumn, endLine, endColumn, replaceAll, allowLoadtime, constantName, 0, false);	
-	}
-	private void failHelper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean allowLoadtime, String constantName, int errorCode, boolean checkCode) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ExtractConstantRefactoring ref= ExtractConstantRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-																									JavaPreferencesSettings.getCodeGenerationSettings());
-		ref.setReplaceAllOccurrences(replaceAll);
-		ref.setConstantName(constantName);
-		RefactoringStatus result= performRefactoring(ref);
-		
-		if(!allowLoadtime && !ref.selectionAllStaticFinal())
-			return;
-			
-		assertNotNull("precondition was supposed to fail", result);
-		if(checkCode)
-			assertEquals(errorCode, result.getEntryMatchingSeverity(RefactoringStatus.ERROR).getCode());
-	}
-
-	//--- TESTS
-	
-	public void test0() throws Exception {
-		helper1(5, 16, 5, 17, true, false, "CONSTANT");
-	}
-	
-	public void test1() throws Exception {
-		helper1(5, 16, 5, 21, false, false, "CONSTANT");	
-	}
-	
-	public void test2() throws Exception {
-		helper1(8, 16, 8, 27, false, false, "CONSTANT");
-	}
-	
-	public void test3() throws Exception {
-		helper1(8, 16, 8, 27, true, false, "CONSTANT");	
-	}
-		
-	public void test4() throws Exception {
-		helper1(5, 23, 5, 34, true, false, "CONSTANT");
-	}
-	
-	public void test5() throws Exception {
-		helper1(11, 20, 11, 26, true, true, "CONSTANT");		
-	}	
-	
-	public void test6() throws Exception {
-		helper1(13, 20, 13, 35, true, true, "CONSTANT");		
-	}
-		
-	public void test7() throws Exception {
-		helper1(12, 20, 12, 28, true, true, "CONSTANT");		
-	}
-		
-	public void test8() throws Exception {
-		helper1(8, 16, 8, 22, true, true, "CONSTANT");	
-	}
-	
-	public void test9() throws Exception {
-		helper1(6, 24, 6, 29, true, true, "CONSTANT");	
-	}
-
-	public void test10() throws Exception {
-		helper1(8, 17, 8, 22, true, true, "CONSTANT");	
-	}			
-	
-	public void test11() throws Exception {
-		helper1(10, 37, 10, 43, true, true, "CONSTANT");	
-	}
-	
-	public void test12() throws Exception {
-		helper1(9, 19, 9, 24, true, true, "CONSTANT");	
-	}
-	
-	public void test13() throws Exception{
-		helper1(9, 16, 9, 28, true, true, "CONSTANT");		
-	}
-		
-	public void test14() throws Exception{
-		helper1(10, 28, 10, 44, true, true, "CONSTANT");
-	}	
-
-	public void test15() throws Exception{
-		helper1(5, 16, 5, 25, true, false, "CONSTANT", "FRED");
-	}	
-
-	public void test16() throws Exception{
-		helper1(5, 20, 5, 27, true, false, "CONSTANT", "RED");
-	}	
-
-	public void test17() throws Exception{
-		helper1(5, 16, 5, 35, true, false, "CONSTANT", "YET_ANOTHER_FRED");
-	}
-	
-	public void test18() throws Exception {
-		helper1(5, 16, 5, 17, true, false, true, "CONSTANT");	
-	}
-	
-	public void test19() throws Exception {
-		helper1(5, 23, 5, 38, false, false, "CONSTANT");
-	}
-	
-	public void test20() throws Exception {
-		helper1(7, 19, 7, 28, false, false, "CONSTANT");
-	}
-	
-	public void test21() throws Exception {
-		helper1(4, 28, 4, 37, false, false, "CONSTANT");	
-	}
-
-	public void testZeroLengthSelection0() throws Exception {
-		helper1(5, 18, 5, 18, false, false, "CONSTANT");	
-	}
-	
-	// -- testing failing preconditions
-	public void testFail0() throws Exception{
-		failHelper1(8, 16, 8, 21, true, true, "CONSTANT");		
-	}
-	
-	public void testFail1() throws Exception{
-		failHelper1(8, 16, 8, 26 , true, true, "CONSTANT");		
-	}
-	
-	public void testFail2() throws Exception{
-		failHelper1(9, 20, 9, 21 , true, true, "CONSTANT");	
-	}
-		
-	public void testFail3() throws Exception{
-		failHelper1(9, 18, 9, 25, true, true, "CONSTANT");	
-	}
-		
-	public void testFail4() throws Exception{
-		failHelper1(6, 16, 6, 20, true, true, "CONSTANT");	
-	}
-		
-	public void testFail5() throws Exception{
-		failHelper1(9, 16, 9, 25, true, true, "CONSTANT");	
-	}
-		
-	public void testFail6() throws Exception{
-		failHelper1(11, 20, 11, 24, true, true, "CONSTANT");	
-	}
-		
-	public void testFail7() throws Exception{
-		failHelper1(11, 20, 11, 34, true, true, "CONSTANT");	
-	}
-		
-	public void testFail10() throws Exception{
-		failHelper1(15, 20, 15, 37, true, false, "CONSTANT");	
-	}
-		
-	public void testFail11() throws Exception{
-		failHelper1(8, 16, 8, 22, true, false, "CONSTANT");
-	}
-	
-	public void testFail12() throws Exception{
-		failHelper1(4, 7, 4, 8, true, true, "CONSTANT", RefactoringStatusCodes.EXPRESSION_NOT_RVALUE, true);
-	}
-	
-	public void testFail13() throws Exception {
-		failHelper1(2, 9, 2, 10, true, true, "CONSTANT", RefactoringStatusCodes.EXPRESSION_NOT_RVALUE, true);	
-	}
-	
-	public void testFail14() throws Exception {
-		failHelper1(5, 9, 5, 11, true, true, "CONSTANT");	
-	}
-	
-	public void testFail15() throws Exception {
-		failHelper1(5, 10, 5, 13, true, true, "CONSTANT");	
-	}
-	
-	public void testGuessStringLiteral0() throws Exception {
-		//test for bug 37377
-		guessHelper(4, 19, 4, 32, "FOO_HASHMAP") ;
-	}
-
-	public void testGuessStringLiteral1() throws Exception {
-		//test for bug 37377
-		guessHelper(4, 19, 4, 33, "FOO_HASH_MAP") ;
-	}
-
-	public void testGuessFromGetterName0() throws Exception {
-		guessHelper(4, 19, 4, 30, "FOO_BAR") ;
-	}
-
-	public void testGuessFromGetterName1() throws Exception {
-		guessHelper(4, 23, 4, 33, "FOO_BAR") ;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractInterfaceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractInterfaceTests.java
deleted file mode 100644
index 2372eef..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractInterfaceTests.java
+++ /dev/null

@@ -1,854 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceRefactoring;
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class ExtractInterfaceTests extends RefactoringTest {
-
-	private static final Class clazz= ExtractInterfaceTests.class;
-	private static final String REFACTORING_PATH= "ExtractInterface/";
-    private Hashtable fOldOptions;
-	
-	public ExtractInterfaceTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.NEWTYPE).setPattern(
-			"${package_declaration}" + 
-				System.getProperty("line.separator", "\n") +
-			"${"+ CodeTemplateContextType.TYPECOMMENT+"}" + 
-			System.getProperty("line.separator", "\n") +
-			"${type_declaration}");
-
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.TYPECOMMENT).setPattern("/** typecomment template*/");
-		
-		fOldOptions= JavaCore.getOptions();
-		
-	    Hashtable options= TestOptions.getFormatterOptions();
-	    options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, DefaultCodeFormatterConstants.TRUE);
-	    options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-	    options.put(JavaCore.FORMATTER_TAB_CHAR, JavaCore.TAB);
-
-	    JavaCore.setOptions(options);
-	}
-	    
-    protected void tearDown() throws Exception {
-    	super.tearDown();
-    	JavaCore.setOptions(fOldOptions);	
-    }
-	
-	private static String getTopLevelTypeName(String typeQualifiedTyperName){
-		int dotIndex= typeQualifiedTyperName.indexOf('.');
-		if (dotIndex == -1)
-			return typeQualifiedTyperName;
-		return typeQualifiedTyperName.substring(0, dotIndex);
-	}
-	
-	private IType getClassFromTestFile(IPackageFragment pack, String className) throws Exception{
-		return getType(createCUfromTestFile(pack, getTopLevelTypeName(className)), className);
-	}
-
-	private void validatePassingTest(String className, String[] cuNames, String newInterfaceName, boolean replaceOccurrences, String[] extractedMethodNames, String[][] extractedSignatures, String[] extractedFieldNames) throws Exception {
-		IType clas= getClassFromTestFile(getPackageP(), className);
-				
-		ExtractInterfaceRefactoring ref= ExtractInterfaceRefactoring.create(clas, JavaPreferencesSettings.getCodeGenerationSettings());
-		ref.setNewInterfaceName(newInterfaceName);
-		assertEquals("interface name should be accepted", RefactoringStatus.OK, ref.checkNewInterfaceName(newInterfaceName).getSeverity());
-		
-		ICompilationUnit[] cus= new ICompilationUnit[cuNames.length];
-		for (int i= 0; i < cuNames.length; i++) {
-			cus[i]= createCUfromTestFile(clas.getPackageFragment(), cuNames[i]);			
-		}
-		ref.setReplaceOccurrences(replaceOccurrences);	
-		IMethod[] extractedMethods= getMethods(clas, extractedMethodNames, extractedSignatures);
-	    IField[] extractedFields= getFields(clas, extractedFieldNames);
-		ref.setExtractedMembers(merge(extractedMethods, extractedFields));
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-
-		for (int i= 0; i < cus.length; i++) {
-			String expected= getFileContents(getOutputTestFileName(cuNames[i]));
-			String actual= cus[i].getSource();
-			assertEqualLines("(" + cus[i].getElementName() +")", expected, actual);
-		}
-
-		ICompilationUnit interfaceCu= clas.getPackageFragment().getCompilationUnit(newInterfaceName + ".java");
-		assertEqualLines("(interface cu)", getFileContents(getOutputTestFileName(newInterfaceName)), interfaceCu.getSource());
-	}
-	
-	private void validatePassingTest(String className, String newInterfaceName, boolean extractAll, boolean replaceOccurrences) throws Exception {
-		IType clas= getClassFromTestFile(getPackageP(), className);
-		ICompilationUnit cu= clas.getCompilationUnit();
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-				
-		ExtractInterfaceRefactoring ref= ExtractInterfaceRefactoring.create(clas, JavaPreferencesSettings.getCodeGenerationSettings());
-		ref.setNewInterfaceName(newInterfaceName);
-		assertEquals("interface name should be accepted", RefactoringStatus.OK, ref.checkNewInterfaceName(newInterfaceName).getSeverity());
-		
-		if (extractAll)
-			ref.setExtractedMembers(ref.getExtractableMembers());
-		ref.setReplaceOccurrences(replaceOccurrences);	
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		assertEqualLines("incorrect changes in " + className,
-			getFileContents(getOutputTestFileName(className)),
-			cu.getSource());
-
-		ICompilationUnit interfaceCu= pack.getCompilationUnit(newInterfaceName + ".java");
-		assertEqualLines("incorrect interface created",
-			getFileContents(getOutputTestFileName(newInterfaceName)),
-			interfaceCu.getSource());
-	}
-
-	private void validateFailingTest(String className, String newInterfaceName, boolean extractAll, int expectedSeverity) throws Exception {
-		IType clas= getClassFromTestFile(getPackageP(), className);
-		ExtractInterfaceRefactoring ref= ExtractInterfaceRefactoring.create(clas, JavaPreferencesSettings.getCodeGenerationSettings());
-		
-		ref.setNewInterfaceName(newInterfaceName);
-		if (extractAll)
-			ref.setExtractedMembers(ref.getExtractableMembers());
-		assertTrue("was not supposed to pass", performRefactoring(ref) != null);	
-		assertEquals("was not supposed to fail with different severity", expectedSeverity, performRefactoring(ref).getSeverity());
-	}
-
-	private void standardPassingTest() throws Exception{
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, null);
-	}
-	//---------------tests ----------------------
-	
-	public void test0() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test1() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test2() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test3() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test4() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test5() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test6() throws Exception{
-		printTestDisabledMessage("needs Organize Import");
-//		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test7() throws Exception{
-		printTestDisabledMessage("needs Organize Import");
-//		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test8() throws Exception{
-		printTestDisabledMessage("needs Organize Import");
-//		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test9() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test10() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test11() throws Exception{
-		validatePassingTest("A", "I", true, false);
-	}
-
-	public void test12() throws Exception{
-		validatePassingTest("A", "I", true, true);
-	}
-
-	public void test13() throws Exception{
-		validatePassingTest("A", "I", true, true);
-	}
-
-	public void test14() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test15() throws Exception{
-		String[] names= new String[]{"m", "m1"};
-		String[][] signatures= new String[][]{new String[0], new String[0]};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, null);
-	}
-
-	public void test16() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test17() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test18() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test19() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test20() throws Exception{
-		String[] names= new String[]{"m", "m1"};
-		String[][] signatures= new String[][]{new String[0], new String[0]};
-		validatePassingTest("A", new String[]{"A"},"I", true, names, signatures, null);
-	}
-	
-//	public void test21() throws Exception{
-		//disable for Exceptions
-//		validatePassingTest("A", "I", true, true);
-//	}
-
-	public void test22() throws Exception{
-		validatePassingTest("A", "I", true, true);
-	}
-
-	public void test23() throws Exception{
-		validatePassingTest("A", "I", true, true);
-	}
-
-	public void test24() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test25() throws Exception{
-		validatePassingTest("A", "I", true, true);
-	}
-
-	public void test26() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test27() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test28() throws Exception{
-		printTestDisabledMessage("bug 22883");
-//		standardPassingTest();
-	}
-
-	public void test29() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test30() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test31() throws Exception{
-		standardPassingTest();
-	}
-	
-	public void test32() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test33() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test34() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test35() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test36() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test37() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test38() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test39() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test40() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test41() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test42() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test43() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test44() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test45() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test46() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test47() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test48() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test49() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test50() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test51() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test52() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test53() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test54() throws Exception{
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "A1"}, "I", true, names, signatures, null);
-	}
-
-	public void test55() throws Exception{
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "A1"}, "I", true, names, signatures, null);
-	}
-
-	public void test56() throws Exception{
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "A1"}, "I", true, names, signatures, null);
-	}
-
-	public void test57() throws Exception{
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "A1"}, "I", true, names, signatures, null);
-	}
-
-	public void test58() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test59() throws Exception{
-//		printTestDisabledMessage("bug 22946 ");
-		standardPassingTest();
-	}
-
-	public void test60() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test61() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test62() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test63() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test64() throws Exception{
-//		printTestDisabledMessage("test for 23105");
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "Inter"}, "I", true, names, signatures, null);
-	}
-
-	public void test65() throws Exception{
-//		printTestDisabledMessage("test for 23105");
-		standardPassingTest();
-	}
-
-	public void test66() throws Exception{
-		standardPassingTest();
-	}
-
-	public void test67() throws Exception{
-//		printTestDisabledMessage("test for 23105");
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "Outer", "Inter"}, "I", true, names, signatures, null);
-	}
-	
-	public void test68() throws Exception{
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "As"}, "I", true, names, signatures, null);
-	}
-
-	public void test69() throws Exception{
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "As"}, "I", true, names, signatures, null);
-	}
-
-	public void test70() throws Exception{
-		standardPassingTest();
-	}
-	
-	public void test71() throws Exception{
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "As"}, "I", true, names, signatures, null);
-	}
-
-	public void test72() throws Exception{
-//		printTestDisabledMessage("bug 23705");		
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[]{"QA;"}};
-		validatePassingTest("A", new String[]{"A", "As"}, "I", true, names, signatures, null);
-	}
-
-	public void test73() throws Exception{
-//		printTestDisabledMessage("bug 23953");		
-		String[] names= new String[]{"amount"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "B", "OldInterface"}, "I", true, names, signatures, null);
-	}
-
-	public void test74() throws Exception{
-//		printTestDisabledMessage("bug 23953");		
-		String[] names= new String[]{"amount"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "B", "OldInterface"}, "I", true, names, signatures, null);
-	}
-
-	public void test75() throws Exception{
-//		printTestDisabledMessage("bug 23953");		
-		String[] names= new String[]{"amount"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "B", "C"}, "I", true, names, signatures, null);
-	}
-
-	public void test76() throws Exception{
-//		printTestDisabledMessage("bug 23953");		
-		String[] names= new String[]{"amount"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("A", new String[]{"A", "B", "C"}, "I", true, names, signatures, null);
-	}
-
-	public void test77() throws Exception{
-		printTestDisabledMessage("bug 23699");
-//		String[] names= new String[]{"amount"};
-//		String[][] signatures= new String[][]{new String[0]};
-//		validatePassingTest("A.Inner", new String[]{"A", "B"}, "I", names, signatures, true);
-	}
-
-	public void test78() throws Exception{
-//		printTestDisabledMessage("bug 23705");		
-		String[] names= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[]{"QA;"}};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, null);
-	}
-
-    public void test79() throws Exception{
-//		printTestDisabledMessage("bug 23697");
-        String[] names= new String[]{"getFoo", "foo"};
-        String[][] signatures= new String[][]{new String[0], new String[]{"QA;"}};
-        validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, null);
-    }
-
-	public void test80() throws Exception{
-//		printTestDisabledMessage("bug 33223");
-		String[] names= new String[]{"f", "fz", "f1", "f1z", "f11", "f2"};
-		String[][] signatures= new String[][]{new String[0], new String[0], new String[0], new String[0], new String[0], new String[0]};
-		String[] fieldNames= {"I1", "I1z", "I2", "I2z", "I3", "I4"};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test81() throws Exception{
-//		printTestDisabledMessage("bug 33878 extract interface: incorrect handling of arrays ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test82() throws Exception{
-//		printTestDisabledMessage("bug 33878 extract interface: incorrect handling of arrays ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test83() throws Exception{
-//		printTestDisabledMessage("bug 33878 extract interface: incorrect handling of arrays ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test84() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-	
-	public void test85() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test86() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test87() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test88() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test89() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test90() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test91() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test92() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test93() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test94() throws Exception{
-//		printTestDisabledMessage("bug 34931 Extract Interface does not update all references ");
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test95() throws Exception{
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test96() throws Exception{
-		String[] names= {};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test97() throws Exception{
-		//printTestDisabledMessage("bug 40373");
-		String[] names= {"foo"};
-		String[][] signatures= {{}};
-		String[] fieldNames= {};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void test98() throws Exception{
-		//test for 41464
-		String[] names= new String[]{"foo"};
-		String[][] signatures= new String[][]{new String[0]};
-		validatePassingTest("Foo", new String[]{"Foo", "Bar"}, "IFoo", true, names, signatures, null);
-	}
-
-	public void test99() throws Exception{
-		String[] names= new String[]{};
-		String[][] signatures= new String[][]{};
-		validatePassingTest("C", new String[]{"A", "B", "C"}, "I", true, names, signatures, null);
-	}
-
-	public void test100() throws Exception{
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=47785
-		validatePassingTest("A", "I", true, false);
-	}
-	
-	public void testPaperExample0() throws Exception{
-		String[] names= new String[]{"add", "addAll", "iterator"};
-		String[][] signatures= new String[][]{new String[]{"QComparable;"}, new String[]{"QA;"}, new String[0]};
-		String[] fieldNames= null;
-		validatePassingTest("A", new String[]{"A"}, "Bag", true, names, signatures, fieldNames);
-	}
-
-	public void testPaperExample1() throws Exception{
-		String[] names= new String[]{"add", "addAll", "iterator"};
-		String[][] signatures= new String[][]{new String[]{"QComparable;"}, new String[]{"QA;"}, new String[0]};
-		String[] fieldNames= null;
-		validatePassingTest("A", new String[]{"A"}, "Bag", true, names, signatures, fieldNames);
-	}
-
-	public void testPaperExampleSimplified0() throws Exception{
-		String[] names= new String[]{};
-		String[][] signatures= {{}};
-		String[] fieldNames= null;
-		validatePassingTest("A", new String[]{"A"}, "Bag", true, names, signatures, fieldNames);
-	}
-
-	
-	public void testConditional1() throws Exception {
-		String[] names= new String[]{};
-		String[][] signatures= {{}};
-		String[] fieldNames= null;
-		validatePassingTest("X", new String[]{"A", "X"}, "I", true, names, signatures, fieldNames);			
-	}
-	
-	public void testConditional2() throws Exception {
-		String[] names= new String[]{ "dot" };
-		String[][] signatures= {new String[]{"QX;"}};
-		String[] fieldNames= null;
-		validatePassingTest("X", new String[]{"A", "X"}, "I", true, names, signatures, fieldNames);			
-	}
-	
-    public void testConstant80() throws Exception{
-        String[] names= null;
-        String[][] signatures= null;
-        String[] fieldNames= {"X"};
-        validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-    }
-
-    public void testConstant81() throws Exception{
-        String[] names= null;
-        String[][] signatures= null;
-        String[] fieldNames= {"X"};
-        validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-    }
-
-    public void testConstant82() throws Exception{
-        String[] names= null;
-        String[][] signatures= null;
-        String[] fieldNames= {"X"};
-        validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-    }
-
-    public void testConstant83() throws Exception{
-        String[] names= null;
-        String[][] signatures= null;
-        String[] fieldNames= {"X"};
-        validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-    }
-
-	public void testConstant84() throws Exception{
-		String[] names= null;
-		String[][] signatures= null;
-		String[] fieldNames= {"X"};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void testConstant85() throws Exception{
-		String[] names= null;
-		String[][] signatures= null;
-		String[] fieldNames= {"X"};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void testConstant86() throws Exception{
-		String[] names= null;
-		String[][] signatures= null;
-		String[] fieldNames= {"X", "Y"};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void testConstant87() throws Exception{
-		String[] names= null;
-		String[][] signatures= null;
-		String[] fieldNames= {"X", "Y"};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void testConstant88() throws Exception{
-		String[] names= null;
-		String[][] signatures= null;
-		String[] fieldNames= {"X", "Y"};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void testInterface0() throws Exception{
-		String[] names= {"m"};
-		String[][] signatures= {new String[0]};
-		String[] fieldNames= null;
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void testInterface1() throws Exception{
-		String[] names= {"m"};
-		String[][] signatures= {new String[0]};
-		String[] fieldNames= null;
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void testInterface2() throws Exception{
-		String[] names= {"m"};
-		String[][] signatures= {new String[0]};
-		String[] fieldNames= {"i", "j"};
-		validatePassingTest("A", new String[]{"A"}, "I", true, names, signatures, fieldNames);
-	}
-
-	public void testInterface3() throws Exception{
-		String[] methodNames= {"m", "m1", "m2", "m4", "m5"};
-		String[][] signatures= {new String[0], new String[0], new String[0], new String[0], new String[0]};
-		String[] fieldNames= {"I", "I1", "I2", "I4", "I5"};
-		validatePassingTest("A", new String[]{"A"}, "I", true, methodNames, signatures, fieldNames);
-	}
-
-	public void testInterface4() throws Exception{
-		printTestDisabledMessage("cannot yet update refs (in methods) to itself if it's an interface");
-//		String[] methodNames= {"a"};
-//		String[][] signatures= {{"QA;", "QA;"}};
-//		String[] fieldNames= null;
-//		validatePassingTest("A", new String[]{"A"}, "I", true, methodNames, signatures, fieldNames);
-	}
-
-	public void testInterface5() throws Exception{
-		String[] methodNames= {"a"};
-		String[][] signatures= {new String[0]};
-		String[] fieldNames= null;
-		validatePassingTest("A", new String[]{"A"}, "I", true, methodNames, signatures, fieldNames);
-	}
-
-	public void testInterface6() throws Exception{
-		String[] methodNames= {"foo0", "foo1", "foo2", "foo3"};
-		String[][] signatures= {new String[0], new String[0], new String[0], new String[0]};
-		String[] fieldNames= null;
-		validatePassingTest("A", new String[]{"A"}, "I", true, methodNames, signatures, fieldNames);
-	}
-
-//disabled - can extract interface from interface
-//	public void testFail0() throws Exception{
-//		validateFailingTest("A", "I", true, RefactoringStatus.FATAL);
-//	}
-
-	public void testFail1() throws Exception{
-		validateFailingTest("A", "I", true, RefactoringStatus.FATAL);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTestSetup.java
deleted file mode 100644
index caf48f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTestSetup.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-
-public class ExtractMethodTestSetup extends TestSetup {
-	
-	private IJavaProject fJavaProject;
-	private IPackageFragmentRoot fRoot;
-	private static final String CONTAINER= "src";
-
-	private IPackageFragment fSelectionPackage;
-	private IPackageFragment fInvalidSelectionPackage;
-	private IPackageFragment fValidSelectionPackage;
-	private IPackageFragment fValidSelectionCheckedPackage;
-	private IPackageFragment fSemicolonPackage;
-	private IPackageFragment fTryPackage;
-	private IPackageFragment fLocalsPackage;
-	private IPackageFragment fExpressionPackage;
-	private IPackageFragment fNestedPackage;
-	private IPackageFragment fReturnPackage;
-	private IPackageFragment fBranchPackage;
-	private IPackageFragment fErrorPackage;
-	private IPackageFragment fWikiPackage;
-	private IPackageFragment fParameterNamePackage;
-	private IPackageFragment fDuplicatesPackage;
-	private IPackageFragment fInitializerPackage;
-	private IPackageFragment fDestinationPackage;
-	
-	public ExtractMethodTestSetup(Test test) {
-		super(test);
-	}	
-	
-	public IPackageFragmentRoot getRoot() {
-		return fRoot;
-	}
-		
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);
-		TestOptions.initializeCodeGenerationOptions();
-		JavaPlugin.getDefault().getCodeTemplateStore().load();		
-		
-		fJavaProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
-		JavaProjectHelper.addRTJar(fJavaProject);
-		fRoot= JavaProjectHelper.addSourceContainer(fJavaProject, CONTAINER);
-		
-		RefactoringCore.getUndoManager().flush();
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IWorkspaceDescription description= workspace.getDescription();
-		description.setAutoBuilding(false);
-		workspace.setDescription(description);
-		
-		fSelectionPackage= getRoot().createPackageFragment("selection", true, null);
-		fInvalidSelectionPackage= fRoot.createPackageFragment("invalidSelection", true, null);
-		fValidSelectionPackage= fRoot.createPackageFragment("validSelection", true, null);
-		fValidSelectionCheckedPackage= fRoot.createPackageFragment("validSelection_in", true, null);
-		fSemicolonPackage= getRoot().createPackageFragment("semicolon_in", true, null);
-		fTryPackage= getRoot().createPackageFragment("try_in", true, null);
-		fLocalsPackage= getRoot().createPackageFragment("locals_in", true, null);
-		fExpressionPackage= getRoot().createPackageFragment("expression_in", true, null);
-		fNestedPackage= getRoot().createPackageFragment("nested_in", true, null);
-		fReturnPackage= getRoot().createPackageFragment("return_in", true, null);
-		fBranchPackage= getRoot().createPackageFragment("branch_in", true, null);
-		fErrorPackage= getRoot().createPackageFragment("error_in", true, null);
-		fWikiPackage= getRoot().createPackageFragment("wiki_in", true, null);
-		fParameterNamePackage= getRoot().createPackageFragment("parameterName_in", true, null);
-		fDuplicatesPackage= getRoot().createPackageFragment("duplicates_in", true, null);
-		fInitializerPackage= getRoot().createPackageFragment("initializer_in", true, null);
-		fDestinationPackage= getRoot().createPackageFragment("destination_in", true, null);
-		
-		ICompilationUnit cu= fExpressionPackage.createCompilationUnit(
-			"A.java", 
-			"package expression_in; import java.io.File; class A { public File getFile() { return null; } public void useFile(File file) { } }",
-			true, null);
-			
-		cu= fExpressionPackage.createCompilationUnit(
-			"B.java", 
-			"package expression_in; import java.util.List; public class B { public List[] foo() { return null; } }",
-			true, null);
-		cu.save(null, true);
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		RefactoringTest.performDummySearch(fJavaProject);
-		JavaProjectHelper.delete(fJavaProject);
-	}
-	
-	public IPackageFragment getExpressionPackage() {
-		return fExpressionPackage;
-	}
-	
-	public IPackageFragment getInvalidSelectionPackage() {
-		return fInvalidSelectionPackage;
-	}
-	
-	public IPackageFragment getLocalsPackage() {
-		return fLocalsPackage;
-	}
-	
-	public IPackageFragment getNestedPackage() {
-		return fNestedPackage;
-	}
-	
-	public IPackageFragment getReturnPackage() {
-		return fReturnPackage;
-	}
-	
-	public IPackageFragment getSelectionPackage() {
-		return fSelectionPackage;
-	}
-	
-	public IPackageFragment getSemicolonPackage() {
-		return fSemicolonPackage;
-	}
-	
-	public IPackageFragment getTryPackage() {
-		return fTryPackage;
-	}
-	
-	public IPackageFragment getValidSelectionPackage() {
-		return fValidSelectionPackage;
-	}
-
-	public IPackageFragment getValidSelectionCheckedPackage() {
-		return fValidSelectionCheckedPackage;
-	}
-	
-	public IPackageFragment getBranchPackage() {
-		return fBranchPackage;
-	}
-
-	public IPackageFragment getErrorPackage() {
-		return fErrorPackage;
-	}
-
-	public IPackageFragment getWikiPackage() {
-		return fWikiPackage;
-	}	
-
-	public IPackageFragment getParameterNamePackage() {
-		return fParameterNamePackage;
-	}
-
-	public IPackageFragment getDuplicatesPackage() {
-		return fDuplicatesPackage;
-	}
-
-	public IPackageFragment getInitializerPackage() {
-		return fInitializerPackage;
-	}
-
-	public IPackageFragment getDestinationPackage() {
-		return fDestinationPackage;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java
deleted file mode 100644
index c0f862d..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java
+++ /dev/null

@@ -1,1656 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo;
-import org.eclipse.jdt.internal.corext.refactoring.code.ExtractMethodRefactoring;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class ExtractMethodTests extends AbstractSelectionTestCase {
-
-	private static ExtractMethodTestSetup fgTestSetup;
-	
-	public ExtractMethodTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		fgTestSetup= new ExtractMethodTestSetup(new TestSuite(ExtractMethodTests.class));
-		return fgTestSetup;
-	}
-
-	protected IPackageFragmentRoot getRoot() {
-		return fgTestSetup.getRoot();
-	}
-	
-	protected String getResourceLocation() {
-		return "ExtractMethodWorkSpace/ExtractMethodTests/";
-	}
-	
-	protected String adaptName(String name) {
-		return name + "_" + getName() + ".java";
-	}	
-	
-	protected void selectionTest(int startLine, int startColumn, int endLine, int endColumn) throws Exception{
-		ICompilationUnit unit= createCU(getSelectionPackage(), "A");
-		String source= unit.getSource();
-		int[] selection= getSelection(source);
-		ISourceRange expected= TextRangeUtil.getSelection(unit, startLine, startColumn, endLine, endColumn);
-		assertEquals(expected.getOffset(), selection[0]);
-		assertEquals(expected.getLength(), selection[1]);
-	}
-	
-	private IPackageFragment getSelectionPackage() throws JavaModelException {
-		return fgTestSetup.getSelectionPackage();
- 	}
-	
-	protected void performTest(IPackageFragment packageFragment, String id, int mode, String outputFolder) throws Exception {
-		performTest(packageFragment, id, mode, outputFolder, null, null, 0);
-	}
-	
-	protected void performTest(IPackageFragment packageFragment, String id, int mode, String outputFolder, String[] newNames, int[] newOrder, int destination) throws Exception {
-		ICompilationUnit unit= createCU(packageFragment, id);
-		String source= unit.getSource();
-		int[] selection= getSelection(source);
-		ExtractMethodRefactoring refactoring= ExtractMethodRefactoring.create(
-			unit, selection[0], selection[1],
-			JavaPreferencesSettings.getCodeGenerationSettings());
-		refactoring.setMethodName("extracted");
-		refactoring.setVisibility(Modifier.PROTECTED);
-		RefactoringStatus status= refactoring.checkInitialConditions(new NullProgressMonitor());
-		switch (mode) {
-			case VALID_SELECTION:
-				assertTrue(status.isOK());
-				break;
-			case INVALID_SELECTION:
-				if (!status.isOK())
-					return;
-		}
-		List parameters= refactoring.getParameterInfos();
-		if (newNames != null && newNames.length > 0) {
-			for (int i= 0; i < newNames.length; i++) {
-				if (newNames[i] != null)
-					((ParameterInfo)parameters.get(i)).setNewName(newNames[i]);
-			}
-		}
-		if (newOrder != null && newOrder.length > 0) {
-			assertTrue(newOrder.length == parameters.size());
-			List current= new ArrayList(parameters);
-			for (int i= 0; i < newOrder.length; i++) {
-				parameters.set(newOrder[i], current.get(i));
-			}
-		}
-		refactoring.setDestination(destination);
-		
-		String out= null;
-		switch (mode) {
-			case COMPARE_WITH_OUTPUT:
-				out= getProofedContent(outputFolder, id);
-				break;		
-		}
-		performTest(unit, refactoring, mode, out, true);
-	}
-	
-	protected int getCheckingStyle() {
-		return CheckConditionsOperation.FINAL_CONDITIONS;
-	}
-	
-	protected void invalidSelectionTest() throws Exception {
-		performTest(fgTestSetup.getInvalidSelectionPackage(), "A", INVALID_SELECTION, null);
-	}
-	
-	protected void validSelectionTest() throws Exception {
-		performTest(fgTestSetup.getValidSelectionPackage(), "A", VALID_SELECTION, null);
-	}
-	
-	protected void validSelectionTestChecked() throws Exception {
-		performTest(fgTestSetup.getValidSelectionCheckedPackage(), "A", COMPARE_WITH_OUTPUT, "validSelection_out");
-	}
-	
-	protected void semicolonTest() throws Exception {
-		performTest(fgTestSetup.getSemicolonPackage(), "A", COMPARE_WITH_OUTPUT, "semicolon_out");
-	}
-	
-	protected void tryTest() throws Exception {
-		performTest(fgTestSetup.getTryPackage(), "A", COMPARE_WITH_OUTPUT, "try_out");
-	}
-	
-	protected void localsTest() throws Exception {
-		performTest(fgTestSetup.getLocalsPackage(), "A", COMPARE_WITH_OUTPUT, "locals_out");
-	}
-	
-	protected void expressionTest() throws Exception {
-		performTest(fgTestSetup.getExpressionPackage(), "A", COMPARE_WITH_OUTPUT, "expression_out");
-	}
-	
-	protected void nestedTest() throws Exception {
-		performTest(fgTestSetup.getNestedPackage(), "A", COMPARE_WITH_OUTPUT, "nested_out");
-	}
-	
-	protected void returnTest() throws Exception {
-		performTest(fgTestSetup.getReturnPackage(), "A", COMPARE_WITH_OUTPUT, "return_out");
-	}
-	
-	protected void branchTest() throws Exception {
-		performTest(fgTestSetup.getBranchPackage(), "A", COMPARE_WITH_OUTPUT, "branch_out");
-	}
-	
-	protected void errorTest() throws Exception {
-		performTest(fgTestSetup.getErrorPackage(), "A", COMPARE_WITH_OUTPUT, "error_out");
-	}
-	
-	protected void wikiTest() throws Exception {
-		performTest(fgTestSetup.getWikiPackage(), "A", COMPARE_WITH_OUTPUT, "wiki_out");
-	}
-	
-	protected void duplicatesTest() throws Exception {
-		performTest(fgTestSetup.getDuplicatesPackage(), "A", COMPARE_WITH_OUTPUT, "duplicates_out");
-	}
-	
-	protected void initializerTest() throws Exception {
-		performTest(fgTestSetup.getInitializerPackage(), "A", COMPARE_WITH_OUTPUT, "initializer_out");
-	}
-	
-	protected void destinationTest(int destination) throws Exception {
-		performTest(fgTestSetup.getDestinationPackage(), "A", COMPARE_WITH_OUTPUT, "destination_out",
-			null, null, destination);
-	}
-	
-	//=====================================================================================
-	// Testing selections
-	//=====================================================================================
-	
-
-	public void test1() throws Exception {
-		selectionTest(5, 9, 5, 24);
-	}
-	
-	public void test2() throws Exception {
-		selectionTest(5, 9, 5, 19);
-	}
-	
-	public void test3() throws Exception {
-		selectionTest(5, 14, 5, 24);
-	}
-	
-	public void test4() throws Exception {
-		selectionTest(5, 14, 5, 19);
-	}
-	
-	//=====================================================================================
-	// Testing invalid selections
-	//=====================================================================================
-	
-	//---- Misc
-	
-	public void test010() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test011() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test012() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test013() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test014() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- Switch / Case
-	
-	public void test020() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test021() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test022() throws Exception {
-		invalidSelectionTest();
-	}
-
-	//---- Block
-	
-	public void test030() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test031() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- For
-	
-	public void test040() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test041() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test042() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test043() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test044() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test045() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test046() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test047() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test048() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- While
-	
-	public void test050() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test051() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test052() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- do / While
-	
-	public void test060() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test061() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test062() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test063() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- switch
-	
-	public void test070() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test071() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test072() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test073() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- if then else
-	
-	public void test080() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test081() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test082() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test083() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test084() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test085() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- Break
-	
-	public void test090() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test091() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test092() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test093() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test094() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test095() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test096() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- Try / catch / finally
-	
-	public void test100() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test101() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test102() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test103() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test104() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test105() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test106() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test107() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test108() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test109() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test110() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test111() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test112() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test113() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test114() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test115() throws Exception {
-		invalidSelectionTest();
-	}
-
-	//---- invalid local var selection
-	
-	public void test120() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test121() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test122() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test123() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- invalid local type selection
-	
-	public void test130() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test131() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- invalid return statement selection
-	
-	public void test140() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test141() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test142() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test143() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test144() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test145() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test146() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test147() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test148() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test149() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- Synchronized statement
-	
-	public void test150() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test151() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test152() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test153() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test160() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test161() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//----- local declarations
-	
-	public void test170() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test171() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test172() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test173() throws Exception {
-		invalidSelectionTest();
-	}
-
-	//---- Constructor
-	
-	public void test180() throws Exception {
-		// System.out.println(getClass().getName() + "::"+  getName() + " disabled - see bug 11853");
-		invalidSelectionTest();
-	}
-	
-	public void test181() throws Exception {
-		// System.out.println(getClass().getName() + "::"+  getName() + " disabled - see bug 11853");
-		invalidSelectionTest();
-	}
-	
-	//---- More return statement handling
-	
-	public void test190() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test191() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- Assignment
-	
-	public void test192() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	public void test193() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//---- single names
-	
-	public void test194() throws Exception {
-		invalidSelectionTest();
-	}
-	
-	//====================================================================================
-	// Testing valid selections
-	//=====================================================================================
-	
-	//---- Misc
-	
-	public void test200() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test201() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test202() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test203() throws Exception {
-		validSelectionTest();
-	}
-	
-	//---- Block
-	
-	public void test230() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test231() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test232() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test233() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test234() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test235() throws Exception {
-		validSelectionTest();
-	}
-	
-	//---- For statement
-	
-	public void test240() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test241() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test244() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test245() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test246() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test247() throws Exception {
-		validSelectionTest();
-	}
-			
-	public void test248() throws Exception {
-		validSelectionTest();
-	}
-			
-	public void test249() throws Exception {
-		validSelectionTest();
-	}
-			
-	//---- While statement
-	
-	public void test250() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test251() throws Exception {
-		validSelectionTest();
-	}	
-	
-	public void test252() throws Exception {
-		validSelectionTest();
-	}	
-	
-	public void test253() throws Exception {
-		validSelectionTest();
-	}
-		
-	public void test254() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test255() throws Exception {
-		validSelectionTest();
-	}
-	
-	//---- do while statement
-	
-	public void test260() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test261() throws Exception {
-		validSelectionTest();
-	}	
-		
-	public void test262() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test263() throws Exception {
-		validSelectionTest();
-	}
-	
-	//---- switch
-	
-	public void test270() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test271() throws Exception {
-		validSelectionTest();
-	}	
-	
-	public void test272() throws Exception {
-		validSelectionTest();
-	}	
-	
-	public void test273() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test274() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test275() throws Exception {
-		validSelectionTest();
-	}
-	
-	//---- if then else
-	
-	public void test280() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test281() throws Exception {
-		validSelectionTest();
-	}	
-	
-	public void test282() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test283() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test284() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test285() throws Exception {
-		validSelectionTest();
-	}
-	
-	//---- try / catch / finally
-	
-	public void test300() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test301() throws Exception {
-		validSelectionTest();
-	}	
-	
-	public void test302() throws Exception {
-		validSelectionTest();
-	}				
-	
-	public void test304() throws Exception {
-		validSelectionTest();
-	}				
-	
-	public void test305() throws Exception {
-		validSelectionTest();
-	}				
-	
-	public void test306() throws Exception {
-		validSelectionTest();
-	}				
-	
-	public void test307() throws Exception {
-		validSelectionTest();
-	}				
-	
-	public void test308() throws Exception {
-		validSelectionTest();
-	}				
-	
-	public void test309() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test310() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test311() throws Exception {
-		validSelectionTest();
-	}
-	
-	//---- Synchronized statement
-	
-	public void test350() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test351() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test352() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test353() throws Exception {
-		validSelectionTest();
-	}
-	
-	public void test360() throws Exception {
-		validSelectionTestChecked();
-	}
-	
-	public void test361() throws Exception {
-		validSelectionTestChecked();
-	}
-	
-	public void test362() throws Exception {
-		validSelectionTestChecked();
-	}
-	
-	public void test363() throws Exception {
-		validSelectionTestChecked();
-	}
-	
-	public void test364() throws Exception {
-		validSelectionTestChecked();
-	}
-	
-	public void test365() throws Exception {
-		validSelectionTestChecked();
-	}
-	
-	//====================================================================================
-	// Testing Extracted result
-	//====================================================================================
-
-	//---- Test semicolon
-	
-	public void test400() throws Exception {
-		semicolonTest();
-	}
-	
-	public void test401() throws Exception {
-		semicolonTest();
-	}
-	
-	public void test402() throws Exception {
-		semicolonTest();
-	}
-	
-	public void test403() throws Exception {
-		semicolonTest();
-	}	
-	
-	public void test404() throws Exception {
-		semicolonTest();
-	}	
-	
-	public void test406() throws Exception {
-		semicolonTest();
-	}	
-	
-	public void test407() throws Exception {
-		semicolonTest();
-	}	
-	
-	public void test409() throws Exception {
-		semicolonTest();
-	}	
-	
-	//---- Test Try / catch block
-
-	public void test450() throws Exception {
-		tryTest();
-	}
-	
-	public void test451() throws Exception {
-		tryTest();
-	}
-	
-	public void test452() throws Exception {
-		tryTest();
-	}
-	
-	public void test453() throws Exception {
-		tryTest();
-	}
-	
-	public void test454() throws Exception {
-		tryTest();
-	}
-	
-	public void test455() throws Exception {
-		tryTest();
-	}
-	
-	public void test456() throws Exception {
-		tryTest();
-	}
-	
-	public void test457() throws Exception {
-		tryTest();
-	}
-	
-	public void test458() throws Exception {
-		tryTest();
-	}
-	
-	public void test459() throws Exception {
-		tryTest();
-	}
-	
-	public void test460() throws Exception {
-		tryTest();
-	}
-	
-	public void test461() throws Exception {
-		tryTest();
-	}
-	
-	public void test462() throws Exception {
-		tryTest();
-	}
-	
-	//---- Test local vars and types
-	
-	public void test500() throws Exception {
-		localsTest();
-	}
-	
-	public void test501() throws Exception {
-		localsTest();
-	}
-	
-	public void test502() throws Exception {
-		localsTest();
-	}
-	
-	public void test503() throws Exception {
-		localsTest();
-	}
-	
-	public void test504() throws Exception {
-		localsTest();
-	}
-	
-	public void test505() throws Exception {
-		localsTest();
-	}
-	
-	public void test506() throws Exception {
-		localsTest();
-	}
-	
-	public void test507() throws Exception {
-		localsTest();
-	}
-	
-	public void test508() throws Exception {
-		localsTest();
-	}
-	
-	public void test509() throws Exception {
-		localsTest();
-	}
-	
-	public void test510() throws Exception {
-		localsTest();
-	}
-	
-	public void test511() throws Exception {
-		localsTest();
-	}
-		
-	public void test512() throws Exception {
-		localsTest();
-	}
-	
-	public void test513() throws Exception {
-		localsTest();
-	}
-	
-	public void test514() throws Exception {
-		localsTest();
-	}
-	
-	public void test515() throws Exception {
-		localsTest();
-	}
-	
-	public void test516() throws Exception {
-		localsTest();
-	}
-	
-	public void test517() throws Exception {
-		localsTest();
-	}
-	
-	public void test518() throws Exception {
-		localsTest();
-	}
-	
-	public void test519() throws Exception {
-		localsTest();
-	}
-	
-	public void test520() throws Exception {
-		localsTest();
-	}
-	
-	public void test521() throws Exception {
-		localsTest();
-	}
-	
-	public void test522() throws Exception {
-		localsTest();
-	}
-	
-	public void test523() throws Exception {
-		localsTest();
-	}
-	
-	public void test524() throws Exception {
-		localsTest();
-	}
-	
-	public void test525() throws Exception {
-		localsTest();
-	}
-	
-	public void test526() throws Exception {
-		localsTest();
-	}
-	
-	public void test527() throws Exception {
-		localsTest();
-	}
-	
-	public void test528() throws Exception {
-		localsTest();
-	}
-	
-	public void test530() throws Exception {
-		localsTest();
-	}
-	
-	public void test531() throws Exception {
-		localsTest();
-	}
-	
-	public void test532() throws Exception {
-		localsTest();
-	}
-	
-	public void test533() throws Exception {
-		localsTest();
-	}
-	
-	public void test534() throws Exception {
-		localsTest();
-	}
-	
-	public void test535() throws Exception {
-		localsTest();
-	}
-	
-	public void test536() throws Exception {
-		localsTest();
-	}
-	
-	public void test537() throws Exception {
-		localsTest();
-	}
-	
-	public void test538() throws Exception {
-		localsTest();
-	}
-	
-	public void test539() throws Exception {
-		localsTest();
-	}
-	
-	public void test540() throws Exception {
-		localsTest();
-	}
-	
-	public void test541() throws Exception {
-		localsTest();
-	}
-	
-	public void test542() throws Exception {
-		localsTest();
-	}
-	
-	public void test543() throws Exception {
-		localsTest();
-	}
-	
-	public void test550() throws Exception {
-		localsTest();
-	}
-	
-	public void test551() throws Exception {
-		localsTest();
-	}
-	
-	public void test552() throws Exception {
-		localsTest();
-	}
-	
-	public void test553() throws Exception {
-		localsTest();
-	}
-	
-	public void test554() throws Exception {
-		localsTest();
-	}
-	
-	public void test555() throws Exception {
-		localsTest();
-	}
-	
-	public void test556() throws Exception {
-		localsTest();
-	}
-	
-	public void test557() throws Exception {
-		localsTest();
-	}
-	
-	public void test558() throws Exception {
-		localsTest();
-	}
-	
-	public void test559() throws Exception {
-		localsTest();
-	}
-	
-	public void test560() throws Exception {
-		localsTest();
-	}
-	
-	public void test561() throws Exception {
-		localsTest();
-	}
-	
-	public void test562() throws Exception {
-		localsTest();
-	}
-	
-	public void test563() throws Exception {
-		localsTest();
-	}
-	
-	public void test564() throws Exception {
-		localsTest();
-	}
-	
-	public void test565() throws Exception {
-		localsTest();
-	}
-	
-	public void test566() throws Exception {
-		localsTest();
-	}
-	
-	public void test567() throws Exception {
-		localsTest();
-	}
-	
-	public void test568() throws Exception {
-		localsTest();
-	}
-	
-	public void test569() throws Exception {
-		localsTest();
-	}
-	
-	//---- Test expressions
-	
-	public void test600() throws Exception {
-		expressionTest();
-	}
-	
-	public void test601() throws Exception {
-		expressionTest();
-	}
-	
-	public void test602() throws Exception {
-		expressionTest();
-	}
-	
-	public void test603() throws Exception {
-		expressionTest();
-	}
-	
-	public void test604() throws Exception {
-		expressionTest();
-	}
-	
-	public void test605() throws Exception {
-		expressionTest();
-	}
-	
-	public void test606() throws Exception {
-		expressionTest();
-	}
-	
-	public void test607() throws Exception {
-		expressionTest();
-	}
-	
-	public void test608() throws Exception {
-		expressionTest();
-	}
-	
-	public void test609() throws Exception {
-		expressionTest();
-	}
-	
-	public void test610() throws Exception {
-		expressionTest();
-	}
-	
-	public void test611() throws Exception {
-		expressionTest();
-	}
-	
-	public void test612() throws Exception {
-		expressionTest();
-	}
-	
-	public void test613() throws Exception {
-		expressionTest();
-	}
-	
-	public void test614() throws Exception {
-		expressionTest();
-	}
-	
-	public void test615() throws Exception {
-		expressionTest();
-	}
-	
-	public void test616() throws Exception {
-		expressionTest();
-	}
-	
-	public void test617() throws Exception {
-		expressionTest();
-	}
-	
-	public void test618() throws Exception {
-		expressionTest();
-	}
-	
-	public void test619() throws Exception {
-		expressionTest();
-	}
-	
-	public void test620() throws Exception {
-		expressionTest();
-	}
-	
-	public void test621() throws Exception {
-		expressionTest();
-	}
-	
-	public void test622() throws Exception {
-		expressionTest();
-	}
-	
-	//---- Test nested methods and constructor
-	
-	public void test650() throws Exception {
-		nestedTest();
-	}
-	
-	public void test651() throws Exception {
-		nestedTest();
-	}
-	
-	public void test652() throws Exception {
-		nestedTest();
-	}
-
-	public void test653() throws Exception {
-		nestedTest();
-	}
-	
-	public void test654() throws Exception {
-		nestedTest();
-	}
-	
-	//---- Extracting method containing a return statement.
-	
-	public void test700() throws Exception {
-		returnTest();
-	}	
-	
-	public void test701() throws Exception {
-		returnTest();
-	}	
-	
-	public void test702() throws Exception {
-		returnTest();
-	}	
-	
-	public void test703() throws Exception {
-		returnTest();
-	}	
-	
-	public void test704() throws Exception {
-		returnTest();
-	}	
-	
-	public void test705() throws Exception {
-		returnTest();
-	}	
-	
-	public void test706() throws Exception {
-		returnTest();
-	}	
-	
-	public void test707() throws Exception {
-		returnTest();
-	}
-		
-	public void test708() throws Exception {
-		returnTest();
-	}	
-	
-	public void test709() throws Exception {
-		returnTest();
-	}	
-	
-	public void test710() throws Exception {
-		returnTest();
-	}	
-	
-	public void test711() throws Exception {
-		returnTest();
-	}	
-	
-	public void test712() throws Exception {
-		returnTest();
-	}	
-	
-	public void test713() throws Exception {
-		returnTest();
-	}	
-	
-	public void test714() throws Exception {
-		returnTest();
-	}	
-	
-	public void test715() throws Exception {
-		returnTest();
-	}	
-	
-	public void test716() throws Exception {
-		returnTest();
-	}	
-	
-	public void test717() throws Exception {
-		returnTest();
-	}	
-	
-	public void test718() throws Exception {
-		returnTest();
-	}	
-	
-	public void test719() throws Exception {
-		returnTest();
-	}
-	
-	public void test720() throws Exception {
-		returnTest();
-	}
-	
-	public void test721() throws Exception {
-		returnTest();
-	}
-	
-	public void test722() throws Exception {
-		returnTest();
-	}
-	
-	public void test723() throws Exception {
-		returnTest();
-	}
-	
-	public void test724() throws Exception {
-		returnTest();
-	}
-	
-	public void test725() throws Exception {
-		returnTest();
-	}
-	
-	public void test726() throws Exception {
-		returnTest();
-	}
-	
-	public void test727() throws Exception {
-		returnTest();
-	}
-	
-	public void test728() throws Exception {
-		returnTest();
-	}
-	
-	//---- Branch statements
-	
-	public void test750() throws Exception {
-		branchTest();
-	}
-	
-	public void test751() throws Exception {
-		branchTest();
-	}
-	
-	public void test752() throws Exception {
-		branchTest();
-	}
-	
-	public void test753() throws Exception {
-		branchTest();
-	}
-	
-	public void test754() throws Exception {
-		branchTest();
-	}
-	
-	public void test755() throws Exception {
-		branchTest();
-	}
-	
-	//---- Test for CUs with compiler errors
-	
-	public void test800() throws Exception {
-		errorTest();
-	}
-	
-	public void test801() throws Exception {
-		errorTest();
-	}
-	
-	public void test802() throws Exception {
-		errorTest();
-	}
-	
-	//---- Test parameter name changes
-	
-	private void invalidParameterNameTest(String[] newNames) throws Exception {
-		performTest(fgTestSetup.getParameterNamePackage(), "A", INVALID_SELECTION, null, newNames, null, 0);
-	}
-	
-	private void parameterNameTest(String[] newNames, int[] newOrder) throws Exception {
-		performTest(fgTestSetup.getParameterNamePackage(), "A", COMPARE_WITH_OUTPUT, "parameterName_out", newNames, newOrder, 0);
-	}
-	
-	public void test900() throws Exception {
-		invalidParameterNameTest(new String[] {"y"});
-	}
-	
-	public void test901() throws Exception {
-		invalidParameterNameTest(new String[] {null, "i"});
-	}
-	
-	public void test902() throws Exception {
-		invalidParameterNameTest(new String[] {"System"});
-	}
-	
-	public void test903() throws Exception {
-		parameterNameTest(new String[] {"xxx", "yyyy"}, null);
-	}
-	
-	public void test904() throws Exception {
-		parameterNameTest(new String[] {"xx", "zz"}, new int[] {1, 0});
-	}
-	
-	public void test905() throws Exception {
-		parameterNameTest(new String[] {"message"}, null);
-	}
-	
-	public void test906() throws Exception {
-		parameterNameTest(new String[] {"xxx"}, null);
-	}
-	
-	//---- Test duplicate code snippets ----------------------------------------
-	
-	public void test950() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test951() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test952() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test953() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test954() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test955() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test956() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test957() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test958() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test959() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test960() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test961() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test962() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test963() throws Exception {
-		duplicatesTest();
-	}
-	
-	public void test964() throws Exception {
-		duplicatesTest();
-	}
-	
-	//---- Test code in initializers -----------------------------------------------
-	
-	public void test1000() throws Exception {
-		initializerTest();
-	}
-	
-	public void test1001() throws Exception {
-		initializerTest();
-	}
-	
-	public void test1002() throws Exception {
-		initializerTest();
-	}
-	
-	public void test1003() throws Exception {
-		initializerTest();
-	}
-	
-	//---- Test destination -----------------------------------------------
-	
-	public void test1050() throws Exception {
-		destinationTest(1);
-	}
-	
-	public void test1051() throws Exception {
-		destinationTest(1);
-	}
-	
-	//---- Test copied from http://c2.com/cgi/wiki?RefactoringBenchmarksForExtractMethod
-	
-	public void test2001() throws Exception {
-		wikiTest();
-	}	
-	
-	public void test2002() throws Exception {
-		wikiTest();
-	}	
-	
-	public void test2003() throws Exception {
-		wikiTest();
-	}	
-	
-	public void test2004() throws Exception {
-		wikiTest();
-	}	
-	
-	public void test2005() throws Exception {
-		wikiTest();
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractTempTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractTempTests.java
deleted file mode 100644
index f9eadee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractTempTests.java
+++ /dev/null

@@ -1,726 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.corext.refactoring.code.ExtractTempRefactoring;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class ExtractTempTests extends RefactoringTest {
-
-	private static final Class clazz= ExtractTempTests.class;
-	private static final String REFACTORING_PATH= "ExtractTemp/";
-
-	private Object fCompactPref; 
-		
-	public ExtractTempTests(String name) {
-		super(name);
-	} 
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-
-	private String getSimpleTestFileName(boolean canExtract, boolean input){
-		String fileName = "A_" + getName();
-		if (canExtract)
-			fileName += input ? "_in": "_out";
-		return fileName + ".java"; 
-	}
-	
-	private String getTestFileName(boolean canExtract, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += (canExtract ? "canExtract/": "cannotExtract/");
-		return fileName + getSimpleTestFileName(canExtract, input);
-	}
-	
-	private ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean canExtract, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(canExtract, input), getFileContents(getTestFileName(canExtract, input)));
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		Hashtable options= JavaCore.getOptions();
-		
-		String setting= DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR;
-		fCompactPref= options.get(setting);
-		options.put(setting, DefaultCodeFormatterConstants.TRUE);
-		JavaCore.setOptions(options);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		Hashtable options= JavaCore.getOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, fCompactPref);
-		JavaCore.setOptions(options);	
-	}
-
-	private void helper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean makeFinal, String tempName, String guessedTempName) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ExtractTempRefactoring ref= ExtractTempRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-		                                                       JavaPreferencesSettings.getCodeGenerationSettings());
-																
-		RefactoringStatus activationResult= ref.checkInitialConditions(new NullProgressMonitor());	
-		assertTrue("activation was supposed to be successful", activationResult.isOK());																
-																									
-		ref.setReplaceAllOccurrences(replaceAll);
-		ref.setDeclareFinal(makeFinal);
-		ref.setTempName(tempName);
-
-		assertEquals("temp name incorrectly guessed", guessedTempName, ref.guessTempName());
-
-		RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-		assertTrue("precondition was supposed to pass but was " + checkInputResult.toString(), checkInputResult.isOK());
-	
-		performChange(ref, false);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		assertEqualLines(getFileContents(getTestFileName(true, false)), newcu.getSource());
-	}
-	
-	private void warningHelper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean makeFinal, String tempName, String guessedTempName, int expectedStatus) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ExtractTempRefactoring ref= ExtractTempRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-															   JavaPreferencesSettings.getCodeGenerationSettings());
-																
-		RefactoringStatus activationResult= ref.checkInitialConditions(new NullProgressMonitor());	
-		assertTrue("activation was supposed to be successful", activationResult.isOK());																
-																									
-		ref.setReplaceAllOccurrences(replaceAll);
-		ref.setDeclareFinal(makeFinal);
-		ref.setTempName(tempName);
-
-		assertEquals("temp name incorrectly guessed", guessedTempName, ref.guessTempName());
-
-		RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-		assertEquals("status", expectedStatus, checkInputResult.getSeverity());
-	
-		performChange(ref, false);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		assertEqualLines(getFileContents(getTestFileName(true, false)), newcu.getSource());
-	}
-
-	private void failHelper1(int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean makeFinal, String tempName, int expectedStatus) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		ExtractTempRefactoring ref= ExtractTempRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-																									JavaPreferencesSettings.getCodeGenerationSettings());
-		
-		ref.setReplaceAllOccurrences(replaceAll);
-		ref.setDeclareFinal(makeFinal);
-		ref.setTempName(tempName);
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);
-		assertEquals("status", expectedStatus, result.getSeverity());
-	}	
-
-	//--- TESTS
-	
-	public void test0() throws Exception{
-		helper1(4, 16, 4, 17, false, false, "temp", "j");
-	}
-	
-	public void test1() throws Exception{
-		helper1(4, 16, 4, 17, true, false, "temp", "j");
-	}
-	
-	public void test2() throws Exception{
-		helper1(4, 16, 4, 17, true, true, "temp", "j");
-	}
-	
-	public void test3() throws Exception{
-		helper1(4, 16, 4, 17, false, true, "temp", "j");
-	}	
-	
-	public void test4() throws Exception{
-		helper1(4, 16, 4, 21, false, false, "temp", "j");
-	}	
-	
-	public void test5() throws Exception{
-		helper1(4, 16, 4, 21, true, false, "temp", "j");
-	}	
-	
-	public void test6() throws Exception{
-		helper1(4, 16, 4, 21, true, true, "temp", "j");
-	}	
-	
-	public void test7() throws Exception{
-		helper1(4, 16, 4, 21, false, true, "temp", "j");
-	}	
-
-	public void test8() throws Exception{
-		helper1(5, 20, 5, 25, true, false, "temp", "j");
-	}	
-
-	public void test9() throws Exception{
-		helper1(5, 20, 5, 25, false, false, "temp", "j");
-	}	
-
-	public void test10() throws Exception{
-		helper1(5, 20, 5, 25, true, false, "temp", "i");
-	}	
-
-	public void test11() throws Exception{
-		helper1(5, 20, 5, 25, true, false, "temp", "i");
-	}	
-
-	public void test12() throws Exception{
-		helper1(5, 17, 5, 22, true, false, "temp", "i");
-	}	
-
-	public void test13() throws Exception{
-		helper1(7, 16, 7, 42, true, false, "temp", "iterator");
-	}	
-
-	public void test14() throws Exception{
-		helper1(6, 15, 6, 20, false, false, "temp", "i");
-	}	
-	
-	public void test15() throws Exception{
-		helper1(7, 23, 7, 28, false, false, "temp", "i");
-	}	
-
-	public void test16() throws Exception{
-		helper1(7, 23, 7, 28, false, false, "temp", "i");
-	}	
-	
-	public void test17() throws Exception{
-		helper1(5, 20, 5, 25, true, false, "temp", "j");
-	}	
-	
-	public void test18() throws Exception{
-		helper1(6, 20, 6, 25, true, false, "temp", "i");
-	}	
-	
-	public void test19() throws Exception{
-		helper1(5, 20, 5, 23, true, false, "temp", "f");
-	}	
-
-//cannot do it - see testFail16
-//	public void test20() throws Exception{
-//		printTestDisabledMessage("regression test for bug#11474");
-//		helper1(5, 9, 5, 12, false, false, "temp", "temp");
-//	}	
-	
-	public void test21() throws Exception{
-		helper1(5, 16, 5, 17, false, false, "temp", "j");
-	}	
-
-//cannot do it - see testFail17
-//	public void test22() throws Exception{
-//		printTestDisabledMessage("regression test for bug#11474");
-//		helper1(6, 13, 6, 16, false, false, "temp", "temp");
-//	}	
-
-	public void test23() throws Exception{
-		helper1(7, 17, 7, 20, false, false, "temp", "b");
-	}		
-	
-//	public void test24() throws Exception{
-//test disabled - trainling semicolons are disallowed now
-//		//regression test for bug#8116
-//		helper1(4, 16, 4, 18, false, false, "temp", "temp");
-//	}
-	
-	public void test25() throws Exception{
-//		printTestDisabledMessage("regression test for bug#8895");
-		helper1(4, 17, 4, 22, true, false, "temp", "i");
-	}
-	
-	public void test26() throws Exception{
-//		printTestDisabledMessage("regression test for 9905");
-		helper1(5, 19, 5, 23, true, false, "temp", "i");
-	}
-	
-	public void test27() throws Exception{
-//		printTestDisabledMessage("regression test for 8123");
-		helper1(4, 15, 4, 19, true, false, "temp", "j");
-	}
-	
-	public void test28() throws Exception{
-//		printTestDisabledMessage("regression test for 11026");
-		helper1(4, 16, 4, 31, true, false, "temp", "b");
-	}
-	
-	public void test29() throws Exception{
-		helper1(4, 19, 4, 22, true, false, "temp", "string");
-	}
-	
-	public void test30() throws Exception{
-		helper1(5, 16, 5, 20, true, false, "temp", "i");
-	}
-
-	public void test31() throws Exception{
-		helper1(5, 16, 5, 20, true, false, "temp", "j");
-	}
-
-	public void test32() throws Exception{
-		helper1(4, 16, 4, 22, true, false, "temp", "j");
-	}
-	
-	public void test33() throws Exception{
-//		printTestDisabledMessage("regression test for bug#11449");
-		helper1(4, 19, 4, 33, true, false, "temp", "object");
-	}
-
-	public void test34() throws Exception{
-//		printTestDisabledMessage("another regression test for bug#11449");
-		helper1(4, 19, 4, 46, true, false, "temp", "arrayList");
-	}
-
-	public void test35() throws Exception{
-//		printTestDisabledMessage("another regression test for bug#11622");
-		helper1(8, 19, 8, 28, true, false, "temp", "lists");
-	}
-
-	public void test36() throws Exception{
-//		printTestDisabledMessage("another regression test for bug#12205");
-		helper1(11, 15, 11, 25, true, false, "temp", "foo");
-	}
-
-	public void test37() throws Exception{
-//		printTestDisabledMessage("another regression test for bug#15196");
-		helper1(8, 20, 8, 25, true, false, "temp", "j");
-	}
-
-	public void test38() throws Exception{
-//		printTestDisabledMessage("regression test for bug#17473");
-		helper1(5, 28, 5, 32, true, false, "temp1", "i");
-	}
-
-	public void test39() throws Exception{
-//		printTestDisabledMessage("regression test for bug#20520 ");
-		helper1(4, 14, 4, 26, true, false, "temp", "object");
-	}
-	
-	public void test40() throws Exception{
-//		printTestDisabledMessage("test for bug 21815");
-		helper1(4, 9, 4, 16, true, false, "temp", "a");
-	}
-
-	public void test41() throws Exception{
-//		printTestDisabledMessage("test for bug 21815");
-		helper1(4, 9, 4, 36, true, false, "temp", "length");
-	}
-
-	public void test42() throws Exception{
-//		printTestDisabledMessage("test for bug 19930");
-		helper1(5, 16, 5, 35, true, false, "temp", "length");
-	}
-
-	public void test43() throws Exception{
-//		printTestDisabledMessage("test for bug 19930");
-		helper1(5, 20, 5, 36, true, false, "temp", "fred");
-	}
-
-	public void test44() throws Exception{
-		//21939
-		helper1(5, 20, 5, 28, true, false, "temp", "fred");
-	}
-
-	public void test45() throws Exception{
-		//21939
-		helper1(4, 16, 4, 19, true, false, "temp", "f");
-	}
-
-	public void test46() throws Exception{
-//		printTestDisabledMessage("test for bug 21815");
-		helper1(4, 9, 4, 12, true, false, "temp", "f");
-	}
-
-	public void test47() throws Exception{
-		helper1(5, 9, 5, 12, true, false, "temp", "r");
-	}
-
-	public void test48() throws Exception{
-//		printTestDisabledMessage("test for bug#22054");
-		helper1(4, 16, 4, 32, true, false, "temp", "string");
-	}
-
-	public void test49() throws Exception{
-//		printTestDisabledMessage("test for bug#23282 ");
-		helper1(5, 15, 5, 19, true, false, "temp", "b");
-	}
-
-	public void test50() throws Exception{
-//		printTestDisabledMessage("test for bug#23283 ");
-		helper1(5, 15, 5, 19, true, false, "temp", "b");
-	}
-
-	public void test51() throws Exception{
-//		printTestDisabledMessage("test for bug#23281");
-		helper1(5, 15, 5, 18, true, false, "temp", "i");
-	}
-
-	public void test52() throws Exception{
-//		printTestDisabledMessage("test for bug#26036");
-		helper1(15, 47, 15, 60, true, false, "valueOnIndexI", "object");
-	}
-
-	public void test53() throws Exception{
-		helper1(6, 17, 6, 22, true, false, "temp", "i");
-	}
-	
-	public void test54() throws Exception{
-		helper1(6, 37, 6, 43, true, false, "temp", "i");
-	}
-
-	public void test55() throws Exception{
-		helper1(6, 19, 6, 24, true, false, "temp", "i");
-	}
-	
-	public void test56() throws Exception{
-		helper1(6, 24, 6, 29, true, false, "temp", "i");
-	}	
-
-	public void test57() throws Exception{
-//		printTestDisabledMessage("test for bug 24808");
-		helper1(8, 30, 8, 54, true, false, "newVariable", "string");
-	}	
-
-	public void test58() throws Exception{
-//		printTestDisabledMessage("test for bug 30304");
-		helper1(7, 14, 7, 30, true, false, "temp", "equals");
-	}	
-
-	public void test59() throws Exception{
-//		printTestDisabledMessage("test for bug 30304");
-		helper1(7, 17, 7, 18, true, false, "temp", "i");
-	}	
-
-	public void test60() throws Exception{
-//		printTestDisabledMessage("test for bug 30304");
-		helper1(7, 17, 7, 18, true, false, "temp", "i");
-	}	
-
-	public void test61() throws Exception{
-//		printTestDisabledMessage("test for bug 30304");
-		helper1(7, 17, 7, 18, true, false, "temp", "i");
-	}	
-		
-	public void test62() throws Exception{
-//		printTestDisabledMessage("test for bug 33405 Refactoring extract local variable fails in nested if statements");
-		helper1(10, 17, 10, 28, true, false, "temp", "string");
-	}	
-
-	public void test63() throws Exception{
-//		printTestDisabledMessage("test for bug 33405 Refactoring extract local variable fails in nested if statements");
-		helper1(9, 20, 9, 23, true, false, "temp", "string");
-	}	
-
-	public void test64() throws Exception{
-//		printTestDisabledMessage("test for bug 33405 Refactoring extract local variable fails in nested if statements");
-		helper1(10, 17, 10, 28, true, false, "temp", "string");
-	}	
-
-	public void test65() throws Exception{
-//		printTestDisabledMessage("test for bug 35981 extract local variable causing exception [refactoring] ");
-		helper1(6, 19, 6, 22, true, false, "temp", "string");
-	}	
-
-	public void test66() throws Exception{
-		helper1(7, 32, 7, 33, true, false, "temp", "exception");
-	}	
-
-	public void test67() throws Exception{
-//		printTestDisabledMessage("test for bug 37834");
-		helper1(6, 16, 6, 21, true, false, "temp", "integer");
-	}	
-
-	public void test68() throws Exception{
-//		printTestDisabledMessage("test for bug 37834");
-		helper1(6, 14, 6, 21, true, false, "temp", "d2");
-	}	
-
-	public void test69() throws Exception{
-		helper1(5, 24, 5, 26, true, false, "temp", "string2");
-	}	
-
-	public void test70() throws Exception{
-//		printTestDisabledMessage("test for bug 40353");
-		helper1(7, 28, 7, 42, true, true, "temp", "j");
-	}	
-
-	public void test71() throws Exception{
-//		printTestDisabledMessage("test for bug 40353");
-		helper1(8, 24, 8, 34, true, false, "temp", "string");
-	}	
-
-	public void test72() throws Exception{
-//		printTestDisabledMessage("test for bug 40353");
-		helper1(8, 32, 8, 33, true, false, "temp", "j");
-	}	
-
-	public void test73() throws Exception{
-//		printTestDisabledMessage("test for bug 40353");
-		warningHelper1(6, 39, 6, 40, true, false, "temp", "j", RefactoringStatus.WARNING);
-		// (warning is superfluous, but detection would need flow analysis)
-	}	
-
-	public void test74() throws Exception{
-//		printTestDisabledMessage("test for bug 40353");
-		helper1(7, 36, 7, 49, true, false, "temp", "string");
-	}	
-
-	public void test75() throws Exception{
-//		printTestDisabledMessage("test for bug 40353");
-		helper1(7, 36, 7, 39, true, false, "temp", "j");
-	}	
-
-	public void test76() throws Exception{
-//		printTestDisabledMessage("test for bug 40353");
-		helper1(7, 48, 7, 49, true, false, "temp", "j");
-	}	
-
-	public void test77() throws Exception {
-//		printTestDisabledMessage("test for bug 40353: extracting fragment which matches for_initializer");
-		helper1(10, 13, 10, 17, true, false, "temp", "f");
-	}
-
-	public void test78() throws Exception {
-//		printTestDisabledMessage("test for bug 50971: Extract temp: index out of bounds error [refactoring]");
-		helper1(5, 21, 5, 27, true, false, "o2", "o");
-	}
-	
-	public void test79() throws Exception {
-		helper1(10, 40, 10, 60, true, false, "strong", "string");
-	}
-
-	public void test80() throws Exception {
-		helper1(5, 37, 5, 45, true, false, "name", "string");
-	}
-
-	public void test81() throws Exception {
-		helper1(7, 18, 7, 23, true, false, "k", "i");
-	}
-	
-	public void test82() throws Exception {
-		helper1(5, 1, 6, 1, true, false, "one", "integer");
-	}
-	
-	public void testZeroLengthSelection0() throws Exception {
-//		printTestDisabledMessage("test for bug 30146");
-		helper1(4, 18, 4, 18, true, false, "temp", "j");
-	}
-
-	// -- testing failing preconditions
-	public void testFail0() throws Exception{
-		failHelper1(5, 16, 5, 17, false, false, "temp", RefactoringStatus.ERROR);
-	}	
-
-	public void testFail1() throws Exception{
-		failHelper1(4, 9, 5, 13, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail2() throws Exception{
-		failHelper1(4, 9, 4, 20, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail3() throws Exception{
-		failHelper1(4, 9, 4, 20, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail4() throws Exception{
-		failHelper1(5, 9, 5, 12, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-	
-	public void testFail5() throws Exception{
-		failHelper1(3, 12, 3, 15, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail6() throws Exception{
-		failHelper1(4, 14, 4, 19, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail7() throws Exception{
-		failHelper1(4, 15, 4, 20, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-//	public void testFail8() throws Exception{
-//		printTestDisabledMessage("removed");
-//		failHelper1(5, 16, 5, 20, false, false, "temp", RefactoringStatus.FATAL);
-//	}	
-
-	public void testFail9() throws Exception{
-		failHelper1(4, 19, 4, 23, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail10() throws Exception{
-		failHelper1(4, 33, 4, 39, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail11() throws Exception{
-//		printTestDisabledMessage("regression test for bug#13061");
-		failHelper1(4, 18, 4, 19, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail12() throws Exception{
-		failHelper1(4, 16, 4, 29, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-//removed
-//	public void testFail13() throws Exception{
-//		failHelper1(5, 16, 5, 20, false, false, "temp", RefactoringStatus.FATAL);
-//	}	
-
-//removed
-//	public void testFail14() throws Exception{
-//		failHelper1(4, 16, 4, 22, false, false, "temp", RefactoringStatus.FATAL);
-//	}	
-
-//removed
-//	public void testFail15() throws Exception{
-//		failHelper1(4, 19, 4, 22, false, false, "temp", RefactoringStatus.FATAL);
-//	}	
-
-//removed - allowed now (see bug 21815)
-//	public void testFail16() throws Exception{
-//		failHelper1(5, 9, 5, 12, false, false, "temp", RefactoringStatus.FATAL);
-//	}	
-//
-//	public void testFail17() throws Exception{
-//		failHelper1(6, 13, 6, 16, false, false, "temp", RefactoringStatus.FATAL);
-//	}	
-
-	public void testFail18() throws Exception{
-//		printTestDisabledMessage("regression test for bug#8149");
-//		printTestDisabledMessage("regression test for bug#37547");
-		// test for bug 40353: is now FATAL"
-		failHelper1(4, 27, 4, 28, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail19() throws Exception{
-//		printTestDisabledMessage("regression test for bug#8149");
-		failHelper1(6, 16, 6, 18, false, false, "temp", RefactoringStatus.WARNING);
-	}	
-
-	public void testFail20() throws Exception{
-//		printTestDisabledMessage("regression test for bug#13249");
-		failHelper1(3, 9, 3, 41, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-	
-	public void testFail21() throws Exception{
-		//test for bug 19851
-		failHelper1(6, 9, 6, 24, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail22() throws Exception{
-//		printTestDisabledMessage("test for bug 21815");
-		failHelper1(5, 9, 5, 12, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-	
-	public void testFail23() throws Exception{
-//		printTestDisabledMessage("test for bug 24265");
-		failHelper1(4, 13, 4, 14, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail24() throws Exception{
-//		printTestDisabledMessage("test for bug 24265");
-		failHelper1(4, 13, 4, 14, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail25() throws Exception{
-		failHelper1(4, 16, 4, 18, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail26() throws Exception{
-		failHelper1(4, 15, 4, 20, false, false, "temp", RefactoringStatus.FATAL);
-	}	
-	
-	public void testFail27() throws Exception{
-//		printTestDisabledMessage("test for bug 29513");
-		failHelper1(7, 13, 7, 24, true, false, "temp", RefactoringStatus.WARNING);
-	}	
-
-	public void testFail28() throws Exception{
-//		printTestDisabledMessage("test for bug 29513");
-		failHelper1(7, 17, 7, 28, true, false, "temp", RefactoringStatus.WARNING);
-	}	
-
-	public void testFail29() throws Exception {
-//		printTestDisabledMessage("test for bug 40353: extracting for_updater referring to loop variable");
-		failHelper1(5, 32, 5, 35, true, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail30() throws Exception {
-//		printTestDisabledMessage("test for bug 40353: extracting for_test referring to loop variable");
-		failHelper1(5, 25, 5, 30, true, false, "temp", RefactoringStatus.FATAL);
-	}	
-
-	public void testFail31() throws Exception {
-//		printTestDisabledMessage("test for bug 40353: extracting for_test referring to loop variable");
-		failHelper1(5, 31, 5, 32, true, false, "temp", RefactoringStatus.FATAL);
-	}
-
-	public void testFail32() throws Exception {
-//		printTestDisabledMessage("test for bug 40353: extracting for_test referring to loop variable");
-		failHelper1(6, 35, 6, 36, true, false, "temp", RefactoringStatus.FATAL);
-	}
-
-	public void testFail33() throws Exception {
-//		printTestDisabledMessage("test for bug 40353: extracting for_updater");
-		failHelper1(6, 17, 6, 21, true, false, "temp", RefactoringStatus.FATAL);
-	}
-
-	public void testFail34() throws Exception {
-//		printTestDisabledMessage("test for bug 40353: extracting for_initializer");
-		failHelper1(9, 20, 9, 24, true, false, "temp", RefactoringStatus.FATAL);
-	}
-
-	public void testFail35() throws Exception {
-//		printTestDisabledMessage("test for bug 45007: QualifiedName");
-		failHelper1(6, 33, 6, 38, true, false, "temp", RefactoringStatus.FATAL);
-	}
-
-	public void testFail36() throws Exception {
-//		printTestDisabledMessage("test for bug 45007: FieldAccess");
-		failHelper1(6, 33, 6, 38, true, false, "temp", RefactoringStatus.FATAL);
-	}
-
-	public void testFail37() throws Exception {
-//		printTestDisabledMessage("test for bug 45007: QualifiedName (nested)");
-		failHelper1(5, 40, 5, 51, true, false, "temp", RefactoringStatus.FATAL);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineConstantTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineConstantTests.java
deleted file mode 100644
index 32c4bf1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineConstantTests.java
+++ /dev/null

@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.ISourceRange;
-
-import org.eclipse.jdt.internal.corext.Assert;
-import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatusCodes;
-import org.eclipse.jdt.internal.corext.refactoring.code.InlineConstantRefactoring;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class InlineConstantTests extends RefactoringTest {
-
-	private static final Class clazz = InlineConstantTests.class;
-	private static final String REFACTORING_PATH = "InlineConstant/";
-
-	private boolean toSucceed;
-
-	public InlineConstantTests(String name) {
-		super(name);
-	} 
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH + successPath();
-	}
-	
-	private String successPath() {
-		return toSucceed ? "/canInline/" : "/cannotInline/";
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	private String getSimpleName(String qualifiedName) {
-		return qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
-	}
-	
-	private String getQualifier(String qualifiedName) {
-		int dot= qualifiedName.lastIndexOf('.');
-		return qualifiedName.substring(0, dot != -1 ? dot : 0);
-	}
-
-	private ICompilationUnit[] createCUs(String[] qualifiedNames) throws Exception {
-		ICompilationUnit[] cus= new ICompilationUnit[qualifiedNames.length];
-		for(int i= 0; i < qualifiedNames.length; i++) {
-			Assert.isNotNull(qualifiedNames[i]);
-			
-			cus[i]= createCUfromTestFile(getRoot().createPackageFragment(getQualifier(qualifiedNames[i]), true, null),
-			                                          getSimpleName(qualifiedNames[i]));
-		}
-		return cus;
-	}
-
-	private int firstIndexOf(String one, String[] others) {
-		for(int i= 0; i < others.length; i++)
-			if(one == null && others[i] == null || one.equals(others[i]))
-				return i;
-		return -1;
-	}
-	private void helper1(String cuQName, int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean removeDeclaration) throws Exception{
-		helper1(new String[] {cuQName}, cuQName, startLine, startColumn, endLine, endColumn, replaceAll, removeDeclaration);
-	}
-	private void helper1(String[] cuQNames, String selectionCuQName, int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean removeDeclaration) throws Exception{
-		int selectionCuIndex= firstIndexOf(selectionCuQName, cuQNames);
-		Assert.isTrue(selectionCuIndex != -1, "parameter selectionCuQName must match some String in cuQNames.");
-		helper1(cuQNames, selectionCuIndex, startLine, startColumn, endLine, endColumn, replaceAll, removeDeclaration);
-	}
-	private void helper1(String[] cuQNames, int selectionCuIndex, int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean removeDeclaration) throws Exception{
-		Assert.isTrue(0 <= selectionCuIndex && selectionCuIndex < cuQNames.length);
-		
-		toSucceed= true;
-		
-		ICompilationUnit[] cus= createCUs(cuQNames);
-		ICompilationUnit selectionCu= cus[selectionCuIndex];
-		
-		ISourceRange selection= TextRangeUtil.getSelection(selectionCu, startLine, startColumn, endLine, endColumn);
-		InlineConstantRefactoring ref= InlineConstantRefactoring.create(selectionCu, selection.getOffset(), selection.getLength(), JavaPreferencesSettings.getCodeGenerationSettings());
-
-		RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());	
-
-		assertTrue("activation was supposed to be successful", preconditionResult.isOK());
-
-		ref.setReplaceAllReferences(replaceAll);
-		ref.setRemoveDeclaration(removeDeclaration);
-		
-		preconditionResult.merge(ref.checkFinalConditions(new NullProgressMonitor()));
-
-		assertTrue("precondition was supposed to pass",preconditionResult.isOK());
-
-		performChange(ref, false);
-
-		for(int i= 0; i < cus.length; i++){
-			String outputTestFileName= getOutputTestFileName(getSimpleName(cuQNames[i]));
-			assertEqualLines("Incorrect inline in " + outputTestFileName, getFileContents(outputTestFileName), cus[i].getSource());				
-		}	
-	}
-
-	private void failHelper1(String cuQName, int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean removeDeclaration, int errorCode) throws Exception{
-		failHelper1(new String[] {cuQName}, cuQName, startLine, startColumn, endLine, endColumn, replaceAll, removeDeclaration, errorCode);
-	}	
-	private void failHelper1(String[] cuQNames, String selectionCuQName, int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean removeDeclaration, int errorCode) throws Exception{
-		int selectionCuIndex= firstIndexOf(selectionCuQName, cuQNames);
-		Assert.isTrue(selectionCuIndex != -1, "parameter selectionCuQName must match some String in cuQNames.");
-		failHelper1(cuQNames, selectionCuIndex, startLine, startColumn, endLine, endColumn, replaceAll, removeDeclaration, errorCode);
-	}
-	private void failHelper1(String[] cuQNames, int selectionCuIndex, int startLine, int startColumn, int endLine, int endColumn, boolean replaceAll, boolean removeDeclaration, int errorCode) throws Exception{
-		Assert.isTrue(0 <= selectionCuIndex && selectionCuIndex < cuQNames.length);
-		
-		toSucceed= false;
-		
-		ICompilationUnit[] cus= createCUs(cuQNames);
-		ICompilationUnit selectionCu= cus[selectionCuIndex];
-			
-		ISourceRange selection= TextRangeUtil.getSelection(selectionCu, startLine, startColumn, endLine, endColumn);
-		InlineConstantRefactoring ref= InlineConstantRefactoring.create(selectionCu, selection.getOffset(), selection.getLength(), 
-										
-		JavaPreferencesSettings.getCodeGenerationSettings());
-		if (ref == null)
-			return;
-		RefactoringStatus result= ref.checkInitialConditions(new NullProgressMonitor());	
-
-		if(!result.isOK()) {
-			assertEquals(errorCode, result.getEntryMatchingSeverity(RefactoringStatus.ERROR).getCode());
-			return;				
-		} else {
-
-			ref.setReplaceAllReferences(replaceAll);
-			ref.setRemoveDeclaration(removeDeclaration);
-			
-			result.merge(ref.checkFinalConditions(new NullProgressMonitor()));
-	
-			assertTrue("precondition checking is expected to fail.", !result.isOK());
-			assertEquals(errorCode, result.getEntryMatchingSeverity(RefactoringStatus.ERROR).getCode());
-		}
-	}
-
-	//--- TESTS
-	
-	public void test0() throws Exception {
-		helper1("p.C", 5, 30, 5, 36, true, false);
-	}
-	
-	public void test1() throws Exception {
-		helper1("C", 3, 33, 3, 40, true, false);
-	}	
-
-	public void test2() throws Exception {
-		helper1("p.Klass", 10, 22, 10, 30, false, false);
-	}
-	
-	public void test3() throws Exception {
-		helper1("p.LeVinSuperieure", 5, 32, 5, 43, true, true);
-	}		
-
-	public void test4() throws Exception {
-		helper1("p.Klus", 5, 36, 5, 36, true, false);
-	}		
-
-	public void test5() throws Exception {
-		helper1("p.PartOfDeclNameSelected", 5, 32, 5, 34, true, true);
-	}		
-	
-	public void test6() throws Exception {
-		helper1("p.CursorPositionedInReference", 8, 57, 8, 57, false, false);
-	}		
-	
-	public void test7() throws Exception {
-		helper1("p.PartOfReferenceSelected", 8, 52, 8, 62, false, false);
-	}
-	
-	public void test8() throws Exception {
-		helper1(new String[] {"p1.C", "p2.D"}, "p1.C", 5, 29, 5, 37, true, false);	
-	}
-	
-	public void test9() throws Exception {
-		helper1(new String[] {"p1.C", "p2.D", "p3.E"}, "p2.D", 8, 18, 8, 26, true, true);	
-	}
-	
-	public void test10() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B"}, "p2.B", 9, 28, 9, 37, false, false);
-	}
-	
-	public void test11() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B", "p3.C"}, "p1.A", 8, 25, 8, 25, false, false);	
-	}
-	
-	public void test12() throws Exception {
-		helper1(new String[] {"p1.Declarer", "p2.InlineSite"}, "p2.InlineSite", 7, 37, 7, 43, true, false);	
-	}
-	
-	public void test13() throws Exception {
-		helper1(new String[] {"p1.A", "p2.InlineSite"}, "p2.InlineSite", 8, 19, 8, 29, false, false);
-	}
-	
-	public void test14() throws Exception {
-		helper1("cantonzuerich.GrueziWohl", 7, 35, 7, 35, true, false);
-	}
-	
-	public void test15() throws Exception {
-		helper1("schweiz.zuerich.zuerich.Froehlichkeit", 14, 16, 14, 32, true, false);
-	}
-		
-	// -- testing failing preconditions
-	
-	public void testFail0() throws Exception {
-		failHelper1("foo.NeueZuercherZeitung", 5, 27, 5, 28, true, false, RefactoringStatusCodes.NOT_STATIC_FINAL_SELECTED);
-	}
-	
-	public void testFail1() throws Exception {
-		failHelper1("fun.Fun", 8, 35, 8, 35, false, false, RefactoringStatusCodes.DECLARED_IN_CLASSFILE);	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup.java
deleted file mode 100644
index 966aa05..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTestSetup.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-
-public class InlineMethodTestSetup extends TestSetup {
-
-	private IJavaProject fJavaProject;
-	private IPackageFragmentRoot fRoot;
-	private static final String CONTAINER= "src";
-
-	private IPackageFragment fInvalid;
-	private IPackageFragment fSimple;
-	private IPackageFragment fArgument;
-	private IPackageFragment fNameConflict;
-	private IPackageFragment fCall;
-	private IPackageFragment fExpression;
-	private IPackageFragment fControlStatement;
-	private IPackageFragment fReceiver;
-	private IPackageFragment fImport;
-	private IPackageFragment fCast;
-
-	public InlineMethodTestSetup(Test test) {
-		super(test);
-	}
-
-	public IPackageFragmentRoot getRoot() {
-		return fRoot;
-	}
-		
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);
-		TestOptions.initializeCodeGenerationOptions();
-		JavaPlugin.getDefault().getCodeTemplateStore().load();		
-		
-		fJavaProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
-		JavaProjectHelper.addRTJar(fJavaProject);
-		fRoot= JavaProjectHelper.addSourceContainer(fJavaProject, CONTAINER);
-		
-		RefactoringCore.getUndoManager().flush();
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IWorkspaceDescription description= workspace.getDescription();
-		description.setAutoBuilding(false);
-		workspace.setDescription(description);
-		
-		fInvalid= fRoot.createPackageFragment("invalid", true, null);
-		fSimple= fRoot.createPackageFragment("simple_in", true, null);		
-		fArgument= fRoot.createPackageFragment("argument_in", true, null);
-		fNameConflict= fRoot.createPackageFragment("nameconflict_in", true, null);
-		fCall= fRoot.createPackageFragment("call_in", true, null);
-		fExpression= fRoot.createPackageFragment("expression_in", true, null);
-		fControlStatement= fRoot.createPackageFragment("controlStatement_in", true, null);
-		fReceiver= fRoot.createPackageFragment("receiver_in", true, null);
-		fImport= fRoot.createPackageFragment("import_in", true, null);
-		fCast= fRoot.createPackageFragment("cast_in", true, null);
-		
-		fImport.createCompilationUnit(
-			"Provider.java",
-			"package import_in;\n" +
-			"\n" +
-			"import import_use.List;\n" +
-			"import java.io.File;\n" +
-			"import java.util.ArrayList;\n" +
-			"import java.util.Map;\n" +
-			"\n" +
-			"public class Provider {\n" +
-			"	public File useAsReturn() {\n" +
-			"		return null;\n" +
-			"	}\n" +
-			"	public void useInArgument(File file) {\n" +
-			"		file= null;\n" +
-			"	}\n" +
-			"	public void useInDecl() {\n" +
-			"		List list= null;\n" +
-			"	}\n" +
-			"	public int useInDecl2() {\n" +
-		  	"		return new ArrayList().size();\n" +
-			"	}\n" +	
-			"	public Object useInDecl3() {\n" +
-		  	"		return new java.util.HashMap();\n" +
-			"	}\n" +	
-			"	public void useInClassLiteral() {\n" +
-			"		Class clazz= File.class;\n" +
-			"	}\n" +
-			"	public void useArray() {\n" +
-			"		List[] lists= null;\n" +
-			"	}\n" +
-			"	public void useInLocalClass() {\n" +
-			"		class Local extends File implements Comparable {\n" +
-			"			public Local(String s) {\n" +
-			"				super(s);\n" +
-			"			}\n" +
-			"			public void foo(Map map) {\n" +
-			"			}\n" +
-			"			public int compareTo(Object o) {\n" +
-			"				return 0;\n" +
-			"			}\n" +
-			"		}\n" +
-			"	}\n" +
-			"}\n", 
-			true, null);
-			
-			IPackageFragment importUse= fRoot.createPackageFragment("import_use", true, null);
-			importUse.createCompilationUnit("List.java",
-			"package import_use;" +
-			"" +
-			"public class List {" +
-			"}", 
-			true, null);
-			
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		RefactoringTest.performDummySearch(fJavaProject);
-		JavaProjectHelper.delete(fJavaProject);
-	}
-	
-	public IPackageFragment getInvalidPackage() {
-		return fInvalid;
-	}
-
-	public IPackageFragment getSimplePackage() {
-		return fSimple;
-	}
-
-	public IPackageFragment getArgumentPackage() {
-		return fArgument;
-	}
-
-	public IPackageFragment getNameConflictPackage() {
-		return fNameConflict;
-	}
-
-	public IPackageFragment getCallPackage() {
-		return fCall;
-	}
-
-	public IPackageFragment getExpressionPackage() {
-		return fExpression;
-	}
-	
-	public IPackageFragment getControlStatementPackage() {
-		return fControlStatement;
-	}
-	
-	public IPackageFragment getReceiverPackage() {
-		return fReceiver;
-	}
-	
-	public IPackageFragment getImportPackage() {
-		return fImport;
-	}	
-
-	public IPackageFragment getCastPackage() {
-		return fCast;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java
deleted file mode 100644
index 3367118..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java
+++ /dev/null

@@ -1,516 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Dmitry Stalnov (dstalnov@fusionone.com) - contributed fixes for:
- *       o bug "inline method - doesn't handle implicit cast" (see
- *         https://bugs.eclipse.org/bugs/show_bug.cgi?id=24941).
- *       o bug inline method: compile error (array related) [refactoring] 
- *         (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=38471)
- * 	     o bug "Inline refactoring showed bogus error" (see bugzilla
- *         https://bugs.eclipse.org/bugs/show_bug.cgi?id=42753)
- *       o inline call that is used in a field initializer 
- *         (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=38137)
- *       o inline call a field initializer: could detect self reference 
- *         (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=44417)
- *       o Allow 'this' constructor to be inlined  
- *         (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=38093)
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.internal.corext.refactoring.code.InlineMethodRefactoring;
-
-public class InlineMethodTests extends AbstractSelectionTestCase {
-
-	private static InlineMethodTestSetup fgTestSetup;
-	
-	public InlineMethodTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		fgTestSetup= new InlineMethodTestSetup(new TestSuite(InlineMethodTests.class));
-		return fgTestSetup;
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}	
-	
-	protected String getResourceLocation() {
-		return "InlineMethodWorkspace/TestCases/";
-	}
-	
-	protected String adaptName(String name) {
-		return Character.toUpperCase(name.charAt(0)) + name.substring(1) + ".java";
-	}
-	
-	protected void performTest(IPackageFragment packageFragment, String id, int mode, String outputFolder) throws Exception {
-		ICompilationUnit unit= createCU(packageFragment, id);
-		String source= unit.getSource();
-		int[] selection= getSelection(source);
-		InlineMethodRefactoring refactoring= InlineMethodRefactoring.create(
-			unit, selection[0], selection[1],
-			JavaPreferencesSettings.getCodeGenerationSettings());
-		String out= null;
-		switch (mode) {
-			case COMPARE_WITH_OUTPUT:
-				out= getProofedContent(outputFolder, id);
-				break;		
-		}
-		performTest(unit, refactoring, mode, out, true);
-	}
-
-	/* *********************** Invalid Tests ******************************* */
-		
-	protected void performInvalidTest() throws Exception {
-		performTest(fgTestSetup.getInvalidPackage(), getName(), INVALID_SELECTION, null);
-	}
-	
-	public void testRecursion() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testInvalidFieldInitializer1() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testInvalidFieldInitializer2() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testInvalidFieldInitializer3() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testLocalInitializer() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testInterruptedStatement() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testMultiLocal() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testComplexBody() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testCompileError1() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testCompileError2() throws Exception {
-		performInvalidTest();
-	}
-	
-	public void testCompileError3() throws Exception {
-		performInvalidTest();
-	}
-	
-	/* *********************** Simple Tests ******************************* */
-		
-	private void performSimpleTest() throws Exception {
-		performTest(fgTestSetup.getSimplePackage(), getName(), COMPARE_WITH_OUTPUT, "simple_out");
-	}
-	
-	public void testBasic1() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testBasic2() throws Exception {
-		performSimpleTest();
-	}	
-	
-	public void testEmptyBody() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testPrimitiveArray() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testTypeArray() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testInitializer() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testSuper() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testFieldInitializer1() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testFieldInitializer2() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testLabeledStatement() throws Exception {
-		performSimpleTest();
-	}	
-
-	public void testConstructor1() throws Exception {
-		performSimpleTest();
-	}	
-
-	/* *********************** Argument Tests ******************************* */
-		
-	private void performArgumentTest() throws Exception {
-		performTest(fgTestSetup.getArgumentPackage(), getName(), COMPARE_WITH_OUTPUT, "argument_out");
-	}
-	
-	public void testFieldReference() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testLocalReferenceUnused() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testLocalReferenceRead() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testLocalReferenceRead2() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testLocalReferenceWrite() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testLocalReferenceLoop() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testLocalReferencePrefix() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testLiteralReferenceRead() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testLiteralReferenceWrite() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testParameterNameUsed1() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testParameterNameUsed2() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testParameterNameUsed3() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testParameterNameUsed4() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testParameterNameUnused1() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testParameterNameUnused2() throws Exception {
-		performArgumentTest();
-	}	
-	
-	public void testParameterNameUnused3() throws Exception {
-		performArgumentTest();
-	}
-	
-	public void testOneRead() throws Exception {
-		performArgumentTest();
-	}
-	
-	public void testTwoReads() throws Exception {
-		performArgumentTest();
-	}
-	
-	public void testWrite() throws Exception {
-		performArgumentTest();
-	}
-	
-	public void testArray() throws Exception {
-		performArgumentTest();
-	}
-	
-	/* *********************** Name Conflict Tests ******************************* */
-		
-	private void performNameConflictTest() throws Exception {
-		performTest(fgTestSetup.getNameConflictPackage(), getName(), COMPARE_WITH_OUTPUT, "nameconflict_out");
-	}
-	
-	public void testSameLocal() throws Exception {
-		performNameConflictTest();
-	}
-	
-	public void testSameType() throws Exception {
-		performNameConflictTest();
-	}
-	
-	public void testSameTypeAfter() throws Exception {
-		performNameConflictTest();
-	}
-	
-	public void testSameTypeInSibling() throws Exception {
-		performNameConflictTest();
-	}
-	
-	public void testLocalInType() throws Exception {
-		performNameConflictTest();
-	}
-	
-	public void testFieldInType() throws Exception {
-		performNameConflictTest();
-	}
-
-	public void testSwitchStatement() throws Exception {
-		performNameConflictTest();
-	}
-
-	public void testBlocks() throws Exception {
-		performNameConflictTest();
-	}
-
-	/* *********************** Call Tests ******************************* */
-		
-	private void performCallTest() throws Exception {
-		performTest(fgTestSetup.getCallPackage(), getName(), COMPARE_WITH_OUTPUT, "call_out");
-	}
-	
-	public void testExpressionStatement() throws Exception {
-		performCallTest();
-	}
-
-	public void testExpressionStatementWithReturn() throws Exception {
-		performCallTest();
-	}
-	
-	public void testStatementWithFunction1() throws Exception {
-		performCallTest();
-	}
-	
-	public void testStatementWithFunction2() throws Exception {
-		performCallTest();
-	}
-	
-	public void testParenthesis() throws Exception {
-		performCallTest();
-	}
-	
-	/* *********************** Expression Tests ******************************* */
-		
-	private void performExpressionTest() throws Exception {
-		performTest(fgTestSetup.getExpressionPackage(), getName(), COMPARE_WITH_OUTPUT, "expression_out");
-	}
-	
-	public void testSimpleExpression() throws Exception {
-		performExpressionTest();
-	}
-	
-	public void testSimpleExpressionWithStatements() throws Exception {
-		performExpressionTest();
-	}
-	
-	public void testSimpleBody() throws Exception {
-		performExpressionTest();
-	}
-	
-	public void testAssignment() throws Exception {
-		performExpressionTest();
-	}
-	
-	public void testReturnStatement() throws Exception {
-		performExpressionTest();
-	}
-	
-	public void testConditionalExpression() throws Exception {
-		performExpressionTest();
-	}
-	
-	/* *********************** Control Statements Tests ******************************* */
-		
-	private void performControlStatementTest() throws Exception {
-		performTest(fgTestSetup.getControlStatementPackage(), getName(), COMPARE_WITH_OUTPUT, "controlStatement_out");
-	}
-	
-	public void testForEmpty() throws Exception {
-		performControlStatementTest();
-	}
-	
-	public void testForOne() throws Exception {
-		performControlStatementTest();
-	}
-	
-	public void testForTwo() throws Exception {
-		performControlStatementTest();
-	}
-	
-	public void testIfThenTwo() throws Exception {
-		performControlStatementTest();
-	}
-	
-	public void testIfElseTwo() throws Exception {
-		performControlStatementTest();
-	}
-	
-	public void testForAssignmentOne() throws Exception {
-		performControlStatementTest();
-	}
-	
-	public void testForAssignmentTwo() throws Exception {
-		performControlStatementTest();
-	}
-
-	/* *********************** Receiver Tests ******************************* */
-		
-	private void performReceiverTest() throws Exception {
-		performTest(fgTestSetup.getReceiverPackage(), getName(), COMPARE_WITH_OUTPUT, "receiver_out");
-	}
-	
-	public void testNoImplicitReceiver() throws Exception {
-		performReceiverTest();
-	}
-
-	public void testNameThisReceiver() throws Exception {
-		performReceiverTest();
-	}
-
-	public void testNameImplicitReceiver() throws Exception {
-		performReceiverTest();
-	}
-
-	public void testExpressionZeroImplicitReceiver() throws Exception {
-		performReceiverTest();
-	}
-
-	public void testExpressionOneImplicitReceiver() throws Exception {
-		performReceiverTest();
-	}
-
-	public void testExpressionTwoImplicitReceiver() throws Exception {
-		performReceiverTest();
-	}
-
-	public void testStaticReceiver() throws Exception {
-		performReceiverTest();
-	}
-
-	public void testReceiverWithStatic() throws Exception {
-		performReceiverTest();
-	}
-	
-	public void testThisExpression() throws Exception {
-		performReceiverTest();
-	}
-	
-	public void testFieldReceiver() throws Exception {
-		performReceiverTest();
-	}
-	
-	/* *********************** Import Tests ******************************* */
-		
-	private void performImportTest() throws Exception {
-		performTest(fgTestSetup.getImportPackage(), getName(), COMPARE_WITH_OUTPUT, "import_out");
-	}
-		
-	public void testUseArray() throws Exception {
-		performImportTest();
-	}	
-		
-	public void testUseInArgument() throws Exception {
-		performImportTest();
-	}	
-		
-	public void testUseInClassLiteral() throws Exception {
-		performImportTest();
-	}	
-		
-	public void testUseInDecl() throws Exception {
-		performImportTest();
-	}	
-		
-	public void testUseInDecl2() throws Exception {
-		performImportTest();
-	}	
-		
-	public void testUseInDecl3() throws Exception {
-		performImportTest();
-	}	
-		
-	public void testUseInDeclClash() throws Exception {
-		performImportTest();
-	}	
-		
-	public void testUseInLocalClass() throws Exception {
-		performImportTest();
-	}	
-
-	/* *********************** Cast Tests ******************************* */
-
-	private void performCastTest() throws Exception {
-		performTest(fgTestSetup.getCastPackage(), getName(), COMPARE_WITH_OUTPUT, "cast_out");
-	}
-	
-	public void testNotOverloaded() throws Exception {
-		performCastTest();
-	}
-
-	public void testOverloadedPrimitives() throws Exception {
-		performCastTest();
-	}
-
-	public void testNotCastableOverloaded() throws Exception {
-		performCastTest();
-	}
-
-	public void testOverloaded() throws Exception {
-		performCastTest();
-	}
-
-	public void testHierarchyOverloadedPrimitives() throws Exception {
-		performCastTest();
-	}
-
-	public void testHierarchyOverloaded() throws Exception {
-		performCastTest();
-	}
-
-	public void testHierarchyOverloadedPrivate() throws Exception {
-		performCastTest();
-	}
-
-	public void testReceiverCast() throws Exception {
-		performCastTest();
-	}
-	
-	public void testNoCast() throws Exception {
-		performCastTest();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineTempTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineTempTests.java
deleted file mode 100644
index a6e73d3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineTempTests.java
+++ /dev/null

@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.jdt.internal.corext.SourceRange;
-import org.eclipse.jdt.internal.corext.refactoring.code.InlineTempRefactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class InlineTempTests extends RefactoringTest {
-
-	private static final Class clazz= InlineTempTests.class;
-	private static final String REFACTORING_PATH= "InlineTemp/";
-	
-	public InlineTempTests(String name) {
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	private String getSimpleTestFileName(boolean canInline, boolean input){
-		String fileName = "A_" + getName();
-		if (canInline)
-			fileName += input ? "_in": "_out";
-		return fileName + ".java"; 
-	}
-	
-	private String getTestFileName(boolean canInline, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += (canInline ? "canInline/": "cannotInline/");
-		return fileName + getSimpleTestFileName(canInline, input);
-	}
-	
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean canInline, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(canInline, input), getFileContents(getTestFileName(canInline, input)));
-	}
-	
-	private ISourceRange getSelection(ICompilationUnit cu) throws Exception{
-		String source= cu.getSource();
-		int offset= source.indexOf(AbstractSelectionTestCase.SQUARE_BRACKET_OPEN);
-		int end= source.indexOf(AbstractSelectionTestCase.SQUARE_BRACKET_CLOSE);
-		return new SourceRange(offset, end - offset);
-	}
-	
-	private void helper1(ICompilationUnit cu, ISourceRange selection) throws Exception{
-		InlineTempRefactoring ref= InlineTempRefactoring.create(cu, selection.getOffset(), selection.getLength());
-		
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("precondition was supposed to pass", null, result);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		assertEqualLines("incorrect inlining", getFileContents(getTestFileName(true, false)), newcu.getSource());
-	}
-	
-	private void helper1(int startLine, int startColumn, int endLine, int endColumn) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		helper1(cu, selection);
-	}
-		
-	private void helper2() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);
-		helper2(cu, getSelection(cu));
-	}
-	
-	private void helper2(ICompilationUnit cu, ISourceRange selection) throws Exception{
-		InlineTempRefactoring ref= InlineTempRefactoring.create(cu, selection.getOffset(), selection.getLength());
-		
-		if (ref != null){
-			RefactoringStatus result= performRefactoring(ref);
-			assertNotNull("precondition was supposed to fail", result);		
-		}
-	}
-	
-	private void helper2(int startLine, int startColumn, int endLine, int endColumn) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		helper2(cu, selection);
-	}
-	
-	
-	//--- tests 
-	
-	public void test0() throws Exception{
-		helper1(4, 9, 4, 18);
-	}
-
-	public void test1() throws Exception{
-		helper1(4, 9, 4, 18);
-	}
-
-	public void test2() throws Exception{
-		helper1(4, 9, 4, 18);
-	}
-	
-	public void test3() throws Exception{
-		helper1(4, 9, 4, 22);
-	}
-
-	public void test4() throws Exception{
-		helper1(4, 9, 4, 22);
-	}
-
-	public void test5() throws Exception{
-		helper1(4, 9, 4, 22);
-	}
-
-	public void test6() throws Exception{
-		//printTestDisabledMessage("bug#6429 declaration source start incorrect on local variable");
-		helper1(9, 13, 9, 14);
-	}
-
-	public void test7() throws Exception{
-		helper1(9, 9, 9, 18);
-	}
-	
-	public void test8() throws Exception{
-		//printTestDisabledMessage("bug#6429 declaration source start incorrect on local variable");
-		helper1(5, 13, 5, 14);
-	}
-	
-	public void test9() throws Exception{
-		helper1(5, 9, 5, 21);
-	}
-	
-	public void test10() throws Exception{
-//		printTestDisabledMessage("regression test for bug#9001");
-		helper1(4, 21, 4, 25);
-	}
-	
-	public void test11() throws Exception{
-		helper1(5, 21, 5, 25);
-	}	
-
-	public void test12() throws Exception{
-		helper1(5, 15, 5, 19);
-	}	
-
-	public void test13() throws Exception{
-		helper1(5, 17, 5, 18);
-	}	
-	
-	public void test14() throws Exception{
-		printTestDisabledMessage("regression for bug 11664");		
-//		helper1(4, 13, 4, 14);
-	}	
-	
-	public void test15() throws Exception{
-		printTestDisabledMessage("regression for bug 11664");		
-//		helper1(4, 19, 4, 20);
-	}	
-	
-	public void test16() throws Exception{
-//		printTestDisabledMessage("regression test for 10751");		
-		helper1(5, 17, 5, 24);
-	}	
-	
-	public void test17() throws Exception{
-//		printTestDisabledMessage("regression test for 12200");		
-		helper1(8, 18, 8, 21);
-	}	
-
-	public void test18() throws Exception{
-//		printTestDisabledMessage("regression test for 12200");		
-		helper1(6, 18, 6, 21);
-	}	
-
-	public void test19() throws Exception{
-//		printTestDisabledMessage("regression test for 12212");		
-		helper1(6, 19, 6, 19);
-	}	
-
-	public void test20() throws Exception{
-//		printTestDisabledMessage("regression test for 16054");		
-		helper1(4, 17, 4, 18);
-	}	
-
-	public void test21() throws Exception{
-//		printTestDisabledMessage("regression test for 17479");		
-		helper1(6, 20, 6, 25);
-	}	
-
-	public void test22() throws Exception{
-//		printTestDisabledMessage("regression test for 18284");		
-		helper1(5, 13, 5, 17);
-	}	
-
-	public void test23() throws Exception{
-//		printTestDisabledMessage("regression test for 22938");		
-		helper1(5, 16, 5, 20);
-	}	
-
-	public void test24() throws Exception{
-//		printTestDisabledMessage("regression test for 26242");		
-		helper1(5, 19, 5, 24);
-	}	
-
-	public void test25() throws Exception{
-//		printTestDisabledMessage("regression test for 26242");		
-		helper1(5, 19, 5, 24);
-	}	
-
-	//------
-	
-	public void testFail0() throws Exception{
-		printTestDisabledMessage("compile errors are ok now");
-//		helper2();
-	}
-
-	public void testFail1() throws Exception{
-		helper2();
-	}
-
-	public void testFail2() throws Exception{
-		helper2();
-	}
-
-	public void testFail3() throws Exception{
-		helper2();
-	}
-
-	public void testFail4() throws Exception{
-		helper2();
-	}
-
-	public void testFail5() throws Exception{
-		helper2();
-	}
-
-	public void testFail6() throws Exception{
-		helper2();
-	}
-
-	public void testFail7() throws Exception{
-		helper2();
-	}
-
-	public void testFail8() throws Exception{
-		helper2();
-	}
-
-	public void testFail9() throws Exception{
-		//test for 16737
-		helper2(3, 9, 3, 13);
-	}
-
-	public void testFail10() throws Exception{
-		//test for 16737
-		helper2(3, 5, 3, 17);
-	}
-
-	public void testFail11() throws Exception{
-		//test for 17253
-		helper2(8, 14, 8, 18);
-	}
-	
-	public void testFail12() throws Exception{
-		//test for 19851
-		helper2(10, 16, 10, 19);
-	}
-
-	public void testFail13() throws Exception{
-//		printTestDisabledMessage("12106");
-		helper2(4, 18, 4, 19);
-	}
-
-	public void testFail14() throws Exception{
-//		printTestDisabledMessage("22632");
-		helper2(4, 8, 4, 11);
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java
deleted file mode 100644
index 7d3a886..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java
+++ /dev/null

@@ -1,651 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.corext.SourceRange;
-import org.eclipse.jdt.internal.corext.refactoring.code.IntroduceFactoryRefactoring;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * @author rfuhrer@watson.ibm.com
- */
-public class IntroduceFactoryTests extends RefactoringTest {
-	
-	private static final Class clazz= IntroduceFactoryTests.class;
-	private static final String REFACTORING_PATH= "IntroduceFactory/";
-
-	public IntroduceFactoryTests(String name) {
-		super(name);
-	} 
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test someTest) {
-	    return new RefactoringTestSetup(someTest);
-	}
-	
-	/**
-	 * Produces a test file name based on the name of this JUnit testcase.
-	 * For input files, trims off the trailing part of the test name that
-	 * begins with a '_', to get rid of the options part, so that we can
-	 * have a single (suite of) input file(s) but several outputs dependent
-	 * on the option settings.
-	 * @param input true iff the requested file is an input file.
-	 * @return the name of the test file, with a trailing "_in.java" if an input
-	 * file and a trailing "_XXX.java" if an output file and the test name/options
-	 * are "_XXX".
-	 */
-	private String getSimpleTestFileName(boolean input) {
-		String	testName = getName();
-		int		usIdx=  testName.indexOf('_'); 
-		int		endIdx= (usIdx >= 0) ? usIdx : testName.length();
-		String	fileName = (input ? (testName.substring(4, endIdx) + "_in") : testName.substring(4));
-
-		return fileName + ".java";
-	}
-
-	/**
-	 * Produces a test file name based on the name of this JUnit testcase,
-	 * like getSimpleTestFileName(), but also prepends the appropriate version
-	 * of the resource path (depending on the value of <code>positive</code>).
-	 * Test files are assumed to be located in the resources directory.
-	 * @param positive true iff the requested file is for a positive unit test
-	 * @param input true iff the requested file is an input file
-	 * @return the test file name
-	 */
-	private String getTestFileName(boolean positive, boolean input) {
-		String path= TEST_PATH_PREFIX + getRefactoringPath();
-
-		path += (positive ? "positive/": "negative/");
-		return path + getSimpleTestFileName(input);
-	}
-
-	/**
-	 * Produces a compilation unit from an input source file whose name
-	 * is based on the testcase name.
-	 * Test files are assumed to be located in the resources directory.
-	 * @param pack
-	 * @param positive
-	 * @param input
-	 * @return the ICompilationUnit created from the specified test file
-	 * @throws Exception
-	 */
-	private ICompilationUnit createCUForSimpleTest(IPackageFragment pack,
-												  boolean positive, boolean input)
-		throws Exception
-	{
-		String	fileName= getTestFileName(positive, input);
-		String	cuName= getSimpleTestFileName(input);
-
-		return createCU(pack, cuName, getFileContents(fileName));
-	}
-
-	/**
-	 * Produces a test file name based on the name of this JUnit testcase,
-	 * like getSimpleTestFileName(), but also prepends the appropriate version
-	 * of the resource path (depending on the value of <code>positive</code>).
-	 * Test files are assumed to be located in the resources directory.
-	 * @param project the project
-	 * @param pack the package fragment
-	 * @param fileName the file name
-	 * @param input true iff the requested file is an input file
-	 * @return the test file name
-	 */ 
-	private String getBugTestFileName(IJavaProject project, IPackageFragment pack, String fileName, boolean input) {
-		String testName= getName();
-		String testNumber= testName.substring("test".length());//$NON-NLS-1$
-		String path= TEST_PATH_PREFIX + getRefactoringPath() + "Bugzilla/" + testNumber + "/" +
-									(project == null ? "" : project.getElementName() + "/") +
-									(pack == getPackageP() ? "" : pack.getElementName() + "/");
-
-		return path + fileName + (input ? "" : "_out") + ".java";//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	/**
-	 * Produces a compilation unit from an input source file whose path
-	 * is based on the testcase name, but whose basename is supplied by
-	 * the caller.
-	 * Test files are assumed to be located in the resources directory.
-	 * @param project can be null if only 1 project exists in the test workspace
-	 * @param pack
-	 * @param baseName
-	 * @param input
-	 * @return the ICompilationUnit created from the specified test file
-	 * @throws Exception
-	 */
-	private ICompilationUnit createCUForBugTestCase(IJavaProject project,
-													IPackageFragment pack, String baseName, boolean input)
-		throws Exception
-	{
-		String	fileName= getBugTestFileName(project, pack, baseName, input);
-		String	cuName= baseName + (input ? "" : "_out") + ".java";
-
-		return createCU(pack, cuName, getFileContents(fileName));
-	}
-
-	static final String SELECTION_START_HERALD= "/*[*/";
-	static final String SELECTION_END_HERALD= "/*]*/";
-
-	/**
-	 * Finds and returns the selection markers in the given source string,
-	 * i.e. the first occurrences of <code>SELECTION_START_HERALD</code> and
-	 * <code>SELECTION_END_HERALD</code>. Fails an assertion if either of these
-	 * markers is not present in the source string.
-	 * @param source
-	 * @return an ISourceRange representing the marked selection
-	 * @throws Exception
-	 */
-	private ISourceRange findSelectionInSource(String source) throws Exception {
-		int		begin= source.indexOf(SELECTION_START_HERALD) + SELECTION_START_HERALD.length();
-		int		end= source.indexOf(SELECTION_END_HERALD);
-
-		if (begin < SELECTION_START_HERALD.length())
-			assertTrue("No selection start comment in input source file!", false);
-		if (end < 0)
-			assertTrue("No selection end comment in input source file!", false);
-
-		return new SourceRange(begin, end-begin);
-	}
-
-	private void doSingleUnitTest(boolean protectConstructor, ICompilationUnit cu, String outputFileName) throws Exception, JavaModelException, IOException {
-		ISourceRange		selection= findSelectionInSource(cu.getSource());
-		IntroduceFactoryRefactoring	ref= IntroduceFactoryRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-												   JavaPreferencesSettings.getCodeGenerationSettings());
-
-		ref.setProtectConstructor(protectConstructor);
-
-		RefactoringStatus	activationResult= ref.checkInitialConditions(new NullProgressMonitor());	
-
-		assertTrue("activation was supposed to be successful", activationResult.isOK());																
-
-		RefactoringStatus	checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-
-		if (!checkInputResult.isOK()) {
-			performChange(ref, false);
-
-			String newSource = cu.getSource();
-
-			System.err.println("!!!Precondition failed for " + getName() + "!!!");
-			System.err.println("Compile-time error: " + checkInputResult.toString());
-			System.err.println("Offending source:");
-			System.err.print(newSource);
-			assertTrue("precondition was supposed to pass but was " + checkInputResult.toString(), false);
-		}
-
-		performChange(ref, false);
-
-		String newSource = cu.getSource();
-
-		assertEqualLines(getName() + ": ", getFileContents(outputFileName), newSource);
-	}
-
-	/**
-	 * Tests the IntroduceFactoryRefactoring refactoring on a single input source file
-	 * whose name is the test name (minus the "test" prefix and any trailing
-	 * options indicator such as "_FFF"), and compares the transformed code
-	 * to a source file whose name is the test name (minus the "test" prefix).
-	 * Test files are assumed to be located in the resources directory.
-	 * @param protectConstructor true iff IntroduceFactoryRefactoring should make the constructor private
-	 * @throws Exception
-	 */
-	void singleUnitHelper(boolean protectConstructor)
-		throws Exception
-	{
-		ICompilationUnit	cu= createCUForSimpleTest(getPackageP(), true, true);
-
-		doSingleUnitTest(protectConstructor, cu, getTestFileName(true, false));
-	}
-
-	/**
-	 * Tests the IntroduceFactoryRefactoring refactoring on a single input source file
-	 * whose name is the test name (minus the "test" prefix and any trailing
-	 * options indicator such as "_FFF"), and compares the transformed code
-	 * to a source file whose name is the test name (minus the "test" prefix).
-	 * Test files are assumed to be located in the resources directory.
-	 * @param baseFileName the base file name
-	 * @param protectConstructor true iff IntroduceFactoryRefactoring should make the constructor private
-	 * @throws Exception
-	 */
-	protected void singleUnitBugHelper(String baseFileName, boolean protectConstructor)
-		throws Exception
-	{
-		ICompilationUnit	cu= createCUForBugTestCase(null, getPackageP(), baseFileName, true);
-
-		doSingleUnitTest(protectConstructor, cu, getBugTestFileName(null, getPackageP(), baseFileName, false));
-	}
-
-	/**
-	 * Like singleUnitHelper(), but allows for the specification of the names of
-	 * the generated factory method, class, and interface, as appropriate.
-	 * @param factoryMethodName the name to use for the generated factory method
-	 * @throws Exception
-	 */
-	void namesHelper(String factoryMethodName)
-		throws Exception
-	{
-		ICompilationUnit	cu= createCUForSimpleTest(getPackageP(), true, true);
-		ISourceRange		selection= findSelectionInSource(cu.getSource());
-		IntroduceFactoryRefactoring	ref= IntroduceFactoryRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-												   JavaPreferencesSettings.getCodeGenerationSettings());
-
-		RefactoringStatus	activationResult= ref.checkInitialConditions(new NullProgressMonitor());	
-
-		assertTrue("activation was supposed to be successful", activationResult.isOK());																
-
-		ref.setNewMethodName(factoryMethodName);
-
-		RefactoringStatus	checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-
-		assertTrue("precondition was supposed to pass but was " + checkInputResult.toString(), checkInputResult.isOK());
-
-		performChange(ref, false);
-
-		String newSource = cu.getSource();
-
-		assertEqualLines(getName() + ": ", getFileContents(getTestFileName(true, false)), newSource);
-	}
-
-	/**
-	 * Creates a compilation unit for a source file with a given base name (plus
-	 * "_in" suffix) in the given package. The source file is assumed to be
-	 * located in the test resources directory.<br>
-	 * Currently only handles positive tests.
-	 * @param fileName the base name of the source file (minus the "_in" suffix)
-	 * @param pack an IPackageFragment for the containing package
-	 * @return the ICompilationUnit for the newly-created unit
-	 * @throws Exception
-	 */
-	private ICompilationUnit createCUFromFileName(String fileName, IPackageFragment pack) throws Exception {
-		String fullName = TEST_PATH_PREFIX + getRefactoringPath() + "positive/" + fileName + "_in.java";
-
-		return createCU(pack, fileName + "_in.java", getFileContents(fullName));
-	}
-
-	private void doMultiUnitTest(ICompilationUnit[] CUs, String testPath, String[] outputFileBaseNames, String factoryClassName) throws Exception, JavaModelException, IOException {
-		ISourceRange selection= findSelectionInSource(CUs[0].getSource());
-		IntroduceFactoryRefactoring	ref= IntroduceFactoryRefactoring.create(CUs[0], selection.getOffset(), selection.getLength(), 
-												   JavaPreferencesSettings.getCodeGenerationSettings());
-
-		RefactoringStatus activationResult= ref.checkInitialConditions(new NullProgressMonitor());
-
-		assertTrue("activation was supposed to be successful", activationResult.isOK());																
-
-		if (factoryClassName != null)
-			ref.setFactoryClass(factoryClassName);
-
-		RefactoringStatus	checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-
-		assertTrue("precondition was supposed to pass but was " + checkInputResult.toString(), checkInputResult.isOK());
-
-		performChange(ref, false);
-
-		String	testName= getName();
-
-		for (int i = 0; i < CUs.length; i++) {
-			int optIdx= testName.indexOf("_");
-			String testOptions= (optIdx >= 0) ? testName.substring(optIdx) : "";
-			String outFileName= testPath + outputFileBaseNames[i] + testOptions + "_out.java";
-			String xformedSrc= CUs[i].getSource();
-			String expectedSrc= getFileContents(outFileName);
-
-			assertEqualLines(getName() + ": ", expectedSrc, xformedSrc);
-		}
-	}
-
-	/**
-	 * Tests the IntroduceFactoryRefactoring refactoring on a set of input source files
-	 * whose names are supplied in the <code>fileBaseNames</code> argument,
-	 * and compares the transformed code to source files whose names are 
-	 * the input base names plus the options suffix (e.g. "_FFF").
-	 * Test files are assumed to be located in the resources directory.
-	 * @param staticFactoryMethod true iff IntroduceFactoryRefactoring should make the factory method static
-	 * @param inputFileBaseNames an array of input source file base names
-	 * @throws Exception
-	 */
-	void multiUnitHelper(boolean staticFactoryMethod, String[] inputFileBaseNames)
-		throws Exception
-	{
-		IPackageFragment	pkg= getPackageP();
-		ICompilationUnit	CUs[]= new ICompilationUnit[inputFileBaseNames.length];
-
-		for (int i = 0; i < inputFileBaseNames.length; i++)
-			CUs[i] = createCUFromFileName(inputFileBaseNames[i], pkg);
-
-		String	testPath= TEST_PATH_PREFIX + getRefactoringPath() + "positive/";
-
-		doMultiUnitTest(CUs, testPath, inputFileBaseNames, null);
-	}
-
-	/**
-	 * Tests the IntroduceFactoryRefactoring refactoring on a set of input source files
-	 * whose names are supplied in the <code>fileBaseNames</code> argument,
-	 * and compares the transformed code to source files whose names are 
-	 * the input base names plus the options suffix (e.g. "_FFF").
-	 * Test files are assumed to be located in the resources directory.
-	 * @param staticFactoryMethod true iff IntroduceFactoryRefactoring should make the factory method static
-	 * @param inputFileBaseNames an array of input source file base names
-	 * @param factoryClassName the fully-qualified name of the class to receive the factory method, or null
-	 * if the factory method is to be placed on the class defining the given constructor
-	 * @throws Exception
-	 */
-	void multiUnitBugHelper(boolean staticFactoryMethod, String[] inputFileBaseNames, String factoryClassName)
-		throws Exception
-	{
-		ICompilationUnit CUs[]= new ICompilationUnit[inputFileBaseNames.length];
-
-		for(int i= 0; i < inputFileBaseNames.length; i++) {
-			int pkgEnd= inputFileBaseNames[i].lastIndexOf('/')+1;
-			boolean explicitPkg= (pkgEnd > 0);
-			IPackageFragment pkg= explicitPkg ? getRoot().createPackageFragment(inputFileBaseNames[i].substring(0, pkgEnd-1), true, new NullProgressMonitor()) : getPackageP();
-
-			CUs[i]= createCUForBugTestCase(null, pkg, inputFileBaseNames[i].substring(pkgEnd), true);
-		}
-
-		String	testName= getName();
-		String	testNumber= testName.substring("test".length());
-		String	testPath= TEST_PATH_PREFIX + getRefactoringPath() + "Bugzilla/" + testNumber + "/";
-
-		doMultiUnitTest(CUs, testPath, inputFileBaseNames, factoryClassName);
-	}
-
-	void multiProjectBugHelper(String[] inputFileBaseNames, String[] dependencies) throws Exception {
-		Map/*<String,Set<String>>*/ projName2PkgNames= collectProjectPackages(inputFileBaseNames);
-		Map/*<String,IJavaProject>*/ projName2Project= new HashMap();
-		Map/*<IJavaProject,IPackageFragmentRoot>*/ proj2PkgRoot= new HashMap();
-
-		createProjectPackageStructure(projName2PkgNames, projName2Project, proj2PkgRoot);
-
-		ICompilationUnit[] CUs = createCUs(inputFileBaseNames, projName2Project, proj2PkgRoot);
-
-		addProjectDependencies(dependencies, projName2Project);
-
-		String	testName= getName();
-		String	testNumber= testName.substring("test".length());
-		String	testPath= TEST_PATH_PREFIX + getRefactoringPath() + "Bugzilla/" + testNumber + "/";
-
-		doMultiUnitTest(CUs, testPath, inputFileBaseNames, null);
-	}
-
-	private ICompilationUnit[] createCUs(String[] inputFileBaseNames, Map projName2Project, Map proj2PkgRoot) throws Exception {
-		ICompilationUnit CUs[]= new ICompilationUnit[inputFileBaseNames.length];
-
-		for(int i= 0; i < inputFileBaseNames.length; i++) {
-			String filePath= inputFileBaseNames[i];
-
-			int projEnd= filePath.indexOf('/');
-			int pkgEnd= filePath.lastIndexOf('/');
-			int fileBegin= pkgEnd+1;
-
-			String projName= filePath.substring(0, projEnd);
-			String pkgName= filePath.substring(projEnd+1, pkgEnd).replace('/', '.');
-
-			IJavaProject project= (IJavaProject) projName2Project.get(projName);
-			IPackageFragmentRoot root= (IPackageFragmentRoot) proj2PkgRoot.get(project);
-			IPackageFragment pkg= root.getPackageFragment(pkgName);
-
-			CUs[i]= createCUForBugTestCase(project, pkg, filePath.substring(fileBegin), true);
-		}
-		return CUs;
-	}
-
-	private void addProjectDependencies(String[] dependencies, Map projName2Project) throws JavaModelException {
-		for(int i= 0; i < dependencies.length; i++) {
-			// dependent:provider
-			String dependency= dependencies[i];
-			int colonIdx= dependency.indexOf(':');
-			String depName= dependency.substring(0, colonIdx);
-			String provName= dependency.substring(colonIdx+1);
-
-			IJavaProject depProj= (IJavaProject) projName2Project.get(depName);
-			IJavaProject provProj= (IJavaProject) projName2Project.get(provName);
-
-			JavaProjectHelper.addRequiredProject(depProj, provProj);
-		}
-	}
-
-	private void createProjectPackageStructure(Map projName2PkgNames, Map projName2Project, Map proj2PkgRoot) throws CoreException, JavaModelException {
-		for(Iterator iter= projName2PkgNames.keySet().iterator(); iter.hasNext(); ) {
-			String projName= (String) iter.next();
-			Set/*<String>*/ projPkgNames= (Set) projName2PkgNames.get(projName);
-
-			IJavaProject project= JavaProjectHelper.createJavaProject(projName, "bin");
-			IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(project, CONTAINER);
-
-			JavaProjectHelper.addRTJar(project);
-
-			Set/*<IPackageFragment>*/ pkgs= new HashSet();
-
-			projName2Project.put(projName, project);
-			proj2PkgRoot.put(project, root);
-			for(Iterator pkgIter= projPkgNames.iterator(); pkgIter.hasNext(); ) {
-				String pkgName= (String) pkgIter.next();
-
-				pkgs.add(root.createPackageFragment(pkgName, true, null));
-			}
-		}
-	}
-
-	private Map/*<String,Set<String>>*/ collectProjectPackages(String[] inputFileBaseNames) {
-		Map/*<String,Set<String>>*/ proj2Pkgs= new HashMap();
-
-		for(int i= 0; i < inputFileBaseNames.length; i++) {
-			String filePath= inputFileBaseNames[i];
-			int projEnd= filePath.indexOf('/');
-			String projName= filePath.substring(0, projEnd);
-			String pkgName= filePath.substring(projEnd+1, filePath.lastIndexOf('/'));
-
-			Set/*<String>*/ projPkgs= (Set) proj2Pkgs.get(projName);
-
-			if (projPkgs == null)
-				proj2Pkgs.put(projName, projPkgs= new HashSet());
-			projPkgs.add(pkgName);
-		}
-		return proj2Pkgs;
-	}
-
-	private void failHelper(boolean staticFactory, int expectedStatus) throws Exception {
-		ICompilationUnit	cu= createCUForSimpleTest(getPackageP(), false, true);
-		ISourceRange		selection= findSelectionInSource(cu.getSource());
-		IntroduceFactoryRefactoring	ref= IntroduceFactoryRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-												   JavaPreferencesSettings.getCodeGenerationSettings());
-		RefactoringStatus	result= performRefactoring(ref);
-
-		assertNotNull("precondition was supposed to fail", result);
-		assertEquals("status", expectedStatus, result.getSeverity());
-	}	
-
-	private void failBugHelper(String baseFileName, boolean staticFactory, int expectedStatus) throws Exception {
-		ICompilationUnit	cu= createCUForBugTestCase(null, getPackageP(), baseFileName, true);
-		ISourceRange		selection= findSelectionInSource(cu.getSource());
-		IntroduceFactoryRefactoring	ref= IntroduceFactoryRefactoring.create(cu, selection.getOffset(), selection.getLength(), 
-				JavaPreferencesSettings.getCodeGenerationSettings());
-		RefactoringStatus	result= performRefactoring(ref);
-
-		assertNotNull("precondition was supposed to fail", result);
-		assertEquals("status", expectedStatus, result.getSeverity());
-	}	
-
-	//--- TESTS
-	public void testStaticContext_FFF() throws Exception {
-		singleUnitHelper(false);
-	}
-	//
-	// ================================================================================
-	//
-	public void testInstanceContext_FFF() throws Exception {
-		singleUnitHelper(false);
-	}
-	//
-	// ================================================================================
-	//
-	static final String[]	k_Names = { "createThing", "ThingFactory", "IThingFactory" };
-
-	public void testNames_FFF() throws Exception {
-		namesHelper(k_Names[0]);
-	}
-	//
-	// ================================================================================
-	//
-	public void testMultipleCallers_FFF() throws Exception {
-		singleUnitHelper(false);
-	}
-	//
-	// ================================================================================
-	//
-	public void testSelectConstructor() throws Exception {
-		singleUnitHelper(false);
-	}
-	//
-	// ================================================================================
-	//
-	public void testDifferentSigs() throws Exception {
-		singleUnitHelper(false);
-	}
-
-	public void testDifferentArgs1() throws Exception {
-		singleUnitHelper(false);
-	}
-
-	public void testDifferentArgs2() throws Exception {
-		singleUnitHelper(false);
-	}
-
-	public void testDifferentArgs3() throws Exception {
-		singleUnitHelper(false);
-	}
-	//
-	// ================================================================================
-	//
-	public void testUnmovableArg1() throws Exception {
-		singleUnitHelper(false);
-	}
-
-	public void testUnmovableArg2() throws Exception {
-		singleUnitHelper(false);
-	}
-
-	public void testDontMoveArgs1() throws Exception {
-		singleUnitHelper(false);
-	}
-
-	public void testDontMoveArgs2() throws Exception {
-		singleUnitHelper(false);
-	}
-	//
-	// ================================================================================
-	//
-	public void testProtectConstructor1() throws Exception {
-		singleUnitHelper(true);
-	}
-
-	public void testProtectConstructor2() throws Exception {
-		singleUnitHelper(true);
-	}
-	//
-	// ================================================================================
-	//
-	public void testStaticInstance() throws Exception {
-		singleUnitHelper(false);
-	}
-	//
-	// ================================================================================
-	//
-	public void testCtorThrows() throws Exception {
-		singleUnitHelper(true);
-	}
-	//
-	// ================================================================================
-	//
-	public void testNestedClass() throws Exception {
-		failHelper(false, RefactoringStatus.FATAL);
-	}
-	//
-	// ================================================================================
-	//
-	public void testMultipleUnits_FFF() throws Exception {
-		multiUnitHelper(false, new String[] { "MultiUnit1A", "MultiUnit1B", "MultiUnit1C" });
-	}
-	//
-	// ================================================================================
-	// Bugzilla bug regression tests
-	// ================================================================================
-	//
-	public void test45942() throws Exception {
-		multiUnitBugHelper(true, new String[] { "TestClass", "UseTestClass" }, null);
-	}
-
-	public void test46189() throws Exception {
-		singleUnitBugHelper("TestClass", true);
-	}
-
-	public void test46189B() throws Exception {
-		failBugHelper("TestClass", true, RefactoringStatus.FATAL);
-	}
-
-	public void test46373() throws Exception {
-		singleUnitBugHelper("ImplicitCtor", false);
-	}
-
-	public void test46374() throws Exception {
-		singleUnitBugHelper("QualifiedName", false);
-	}
-
-	public void test46608() throws Exception {
-		multiUnitBugHelper(true, new String[] { "p1/TT", "p2/TT" }, null);
-	}
-
-	public void test59284() throws Exception {
-		singleUnitBugHelper("ArgTypeImport", true);
-	}
-
-	public void test59280() throws Exception {
-		singleUnitBugHelper("ExplicitSuperCtorCall", true);
-	}
-
-	public void test48504() throws Exception {
-		multiUnitBugHelper(true, new String[] { "p1/A", "p1/B" }, "p1.B");
-	}
-
-	public void test58293() throws Exception {
-		singleUnitBugHelper("ImplicitSuperCtorCall", true);
-	}
-
-	public void test59283() throws Exception {
-		multiProjectBugHelper(new String[] { "proj1/pA/A", "proj2/pB/B" },
-				new String[] { "proj2:proj1" });
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceParameterTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceParameterTests.java
deleted file mode 100644
index f3ace1c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceParameterTests.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.StringTokenizer;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-
-import org.eclipse.jdt.internal.corext.refactoring.code.IntroduceParameterRefactoring;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class IntroduceParameterTests extends LineColumnSelectionTestCase {
-
-	private static final String SLASH_OUT= "/out";
-	public IntroduceParameterTests(String name) {
-		super(name);
-	}
-	
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-
-	public static Test suite() {
-		//TODO: re-runnable tests: setUp() should create project iff neccessary (circumvent TestDecorator "MySetup")
-		if (true) {
-			return new RefactoringTestSetup(new TestSuite(IntroduceParameterTests.class));
-		} else {
-			System.err.println("*** Running only parts of IntroduceParameterTests!");
-			TestSuite suite= new TestSuite();
-			suite.addTest(new IntroduceParameterTests("testSimple_StaticGetter1"));
-			return new RefactoringTestSetup(suite);
-		}
-	}
-	
-	protected String getResourceLocation() {
-		return "IntroduceParameter/";
-	}
-
-	/**
-	 * get names from comment in source "//name: guessedName -> nameToUse"
-	 * <br>relies on tabwidth == 4
-	 * @param cu
-	 * @return {"guessedName", "nameToUse"} or null iff no name comment found
-	 * @throws Exception
-	 */
-	private String[] getNames(ICompilationUnit cu) throws Exception {
-		String source= cu.getSource();
-		String name= "//name:";
-		int namStart= source.indexOf(name);
-		if (namStart == -1)
-			return null;
-
-		int dataStart= namStart + name.length();
-		StringTokenizer tokenizer= new StringTokenizer(source.substring(dataStart), " ->\t\r\n");
-		String[] result= {tokenizer.nextToken(), tokenizer.nextToken()};
-		return result;
-	}
-
-	private void performOK() throws Exception {
-		perform(RefactoringStatus.OK, RefactoringStatus.OK);
-	}
-
-	private void performInvalidSelection() throws Exception {
-		perform(RefactoringStatus.FATAL, RefactoringStatus.FATAL);
-	}
-
-	private void perform(int expectedActivationStatus, int expectedInputStatus) throws Exception {
-		String packageName= adaptPackage(getName());
-		IPackageFragment packageFragment= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment(packageName, true , null);
-		ICompilationUnit cu= createCU(packageFragment, getName());
-
-		ISourceRange selection= getSelection(cu);
-		IntroduceParameterRefactoring refactoring= IntroduceParameterRefactoring.create(
-			cu, selection.getOffset(), selection.getLength());		
-
-		NullProgressMonitor pm= new NullProgressMonitor();
-		RefactoringStatus status= refactoring.checkInitialConditions(pm);
-		assertEquals("wrong activation status", expectedActivationStatus, status.getSeverity());
-		if (! status.isOK())
-			return;
-		
-		String[] names= getNames(cu);
-		if (names == null) {
-			refactoring.setParameterName(refactoring.guessedParameterName());
-		} else {
-			assertEquals("incorrectly guessed parameter name", names[0], refactoring.guessedParameterName());
-			refactoring.setParameterName(names[1]);
-		}
-
-		status.merge(refactoring.checkFinalConditions(pm));
-		assertEquals("wrong input status", expectedInputStatus, status.getSeverity());
-		if (status.getSeverity() == RefactoringStatus.FATAL)
-			return;
-		
-		String out= getProofedContent(packageName + SLASH_OUT, getName());
-		performTest(cu, refactoring, out);
-	}
-		
-// ---
-
-	public void testInvalid_NotInMethod1() throws Exception {
-		performInvalidSelection();
-	}
-	public void testInvalid_NotInMethod2() throws Exception {
-		performInvalidSelection();
-	}
-	public void testInvalid_NotInMethod3() throws Exception {
-		performInvalidSelection();
-	}
-
-	public void testInvalid_PartName1() throws Exception {
-		performInvalidSelection();
-	}
-
-	public void testInvalid_PartString() throws Exception {
-		performInvalidSelection();
-	}
-
-	public void testInvalid_NoMethodBinding() throws Exception {
-		performInvalidSelection();
-	}
-	
-	public void testInvalid_NoExpression1() throws Exception {
-		performInvalidSelection();
-	}
-	
-	//	---
-
-	public void testSimple_ConstantExpression1() throws Exception {
-		performOK();
-	}
-
-	public void testSimple_ConstantExpression2() throws Exception {
-		performOK();
-	}
-
-	public void testSimple_NewInstance1() throws Exception {
-		performOK();
-	}
-
-	public void testSimple_NewInstanceImport() throws Exception {
-		performOK();
-	}
-
-	public void testSimple_StaticGetter1() throws Exception {
-		performOK();
-	}
-	
-	public void testSimple_Formatting1() throws Exception {
-		performOK();
-	}
-	
-	public void testSimple_Javadoc1() throws Exception {
-		performOK();
-	}
-
-	public void testSimple_Javadoc2() throws Exception {
-		performOK();
-	}
-	
-	public void testSimple_Constructor1() throws Exception {
-		performOK();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/Java15Setup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/Java15Setup.java
deleted file mode 100644
index d35d9cf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/Java15Setup.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-public class Java15Setup extends RefactoringTestSetup {
-
-	public Java15Setup(Test test) {
-		super(test);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		Hashtable options= JavaCore.getOptions();
-		JavaProjectHelper.set15CompilerOptions(options);
-		JavaCore.setOptions(options);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/LineColumnSelectionTestCase.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/LineColumnSelectionTestCase.java
deleted file mode 100644
index c199fe4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/LineColumnSelectionTestCase.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaCore;
-
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractCUTestCase;
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringTestPlugin;
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-
-/**
- * Test Naming Convention:<p>
- * - testSimple_A() -> package 'simple', file 'A.java'; result in package 'simple.out'<br>
- * - testSuch_ALongName17() -> package 'such', file 'ALongName17.java'
- */
-public class LineColumnSelectionTestCase extends AbstractCUTestCase {
-
-	public LineColumnSelectionTestCase(String name) {
-		super(name);
-	}
-
-	protected InputStream getFileInputStream(String fileName) throws IOException {
-		return RefactoringTestPlugin.getDefault().getTestResourceStream(fileName);
-	}
-
-	/**
-	 * @param name e.g. "testSuch_ALongName17"
-	 * @return e.g. "ALongName17"
-	 */
-	protected String adaptName(String name) {
-		int separator= name.indexOf('_');
-		assertTrue(separator != -1);
-		assertTrue(separator >= 5);
-		return name.substring(separator + 1) + ".java";
-	}
-
-	/**
-	 * @param name e.g. "testSuch_ALongName17"
-	 * @return e.g. "such"
-	 */
-	protected String adaptPackage(String name) {
-		int separator= name.indexOf('_');
-		assertTrue(separator != -1);
-		assertTrue(separator >= 5);
-		return Character.toLowerCase(name.charAt(4))
-				+ name.substring(5, separator);
-	}
-
-	/*
-	 * get selection from comment in source "//selection: line, col, line, col"
-	 * <br>relies on tabwidth == 4
-	 */
-	protected ISourceRange getSelection(ICompilationUnit cu) throws Exception {
-		String source= cu.getSource();
-		String selection= "//selection:";
-		int selStart= source.indexOf(selection);
-		assertTrue(selStart != -1);
-	
-		int dataStart= selStart + selection.length();
-		StringTokenizer tokenizer= new StringTokenizer(source.substring(dataStart), " ,\t\r\n");
-		int line1= Integer.parseInt(tokenizer.nextToken());
-		int col1= Integer.parseInt(tokenizer.nextToken());
-		int line2= Integer.parseInt(tokenizer.nextToken());
-		int col2= Integer.parseInt(tokenizer.nextToken());
-		return TextRangeUtil.getSelection(cu, line1, col1, line2, col2);
-	}
-
-	/* @require refactoring.checkActivation().isOK() */
-	protected void performTest(final ICompilationUnit unit, final Refactoring refactoring, final String out) throws Exception {
-		JavaCore.run(new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				String original= unit.getSource();
-				final Change change= refactoring.createChange(monitor);
-				assertNotNull(change);
-				change.initializeValidationData(new NullProgressMonitor());
-				assertTrue(!change.isValid(new NullProgressMonitor()).hasFatalError());
-				Change undo= change.perform(monitor);
-				change.dispose();
-				assertNotNull(undo);
-				compareSource(unit.getSource(), out);
-				undo.initializeValidationData(new NullProgressMonitor());
-				assertTrue(!undo.isValid(new NullProgressMonitor()).hasFatalError());
-				undo.perform(monitor);
-				undo.dispose();
-				compareSource(unit.getSource(), original);
-			}
-		}, new NullProgressMonitor());
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToTopLevelTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToTopLevelTests.java
deleted file mode 100644
index 596c366..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToTopLevelTests.java
+++ /dev/null

@@ -1,441 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInnerToTopRefactoring;
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class MoveInnerToTopLevelTests extends RefactoringTest {
-
-	private static final Class clazz= MoveInnerToTopLevelTests.class;
-	private static final String REFACTORING_PATH= "MoveInnerToTopLevel/";
-	
-	private static final int NOT_AVAILABLE= 1001;
-
-	private Object fCompactPref;
-
-	public MoveInnerToTopLevelTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-	    return new RefactoringTestSetup(someTest);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.NEWTYPE).setPattern(
-			"${package_declaration}" + 
-			System.getProperty("line.separator", "\n") +
-			"${type_declaration}");
-
-		Hashtable options= JavaCore.getOptions();
-		
-		String setting= DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR;
-		fCompactPref= options.get(setting);
-		options.put(setting, DefaultCodeFormatterConstants.TRUE);
-		JavaCore.setOptions(options);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		Hashtable options= JavaCore.getOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, fCompactPref);
-		JavaCore.setOptions(options);	
-	}
-	
-
-	private IType getClassFromTestFile(IPackageFragment pack, String className) throws Exception{
-		return getType(createCUfromTestFile(pack, className), className);
-	}
-
-	private void validatePassingTest(String parentClassName, String className, String packageName, String[] cuNames, String[] packageNames, String enclosingInstanceName, boolean makeFinal, boolean possible, boolean mandatory, boolean createFieldIfPossible) throws Exception {
-		IType parentClas= getClassFromTestFile(getPackage(packageName), parentClassName);
-		IType clas= parentClas.getType(className);
-		
-		assertTrue("should be enabled", MoveInnerToTopRefactoring.isAvailable(clas));
-		MoveInnerToTopRefactoring ref= MoveInnerToTopRefactoring.create(clas, JavaPreferencesSettings.getCodeGenerationSettings());
-		RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());
-		assertTrue("activation was supposed to be successful" + preconditionResult.toString(), preconditionResult.isOK());
-		
-		assertEquals("reference creation possible", possible, ref.isCreatingInstanceFieldPossible());
-		assertEquals("reference creation mandatory", mandatory, ref.isCreatingInstanceFieldMandatory());
-		if (ref.isCreatingInstanceFieldPossible() && ! ref.isCreatingInstanceFieldMandatory())
-			ref.setCreateInstanceField(createFieldIfPossible);
-		if (enclosingInstanceName != null){
-			ref.setEnclosingInstanceName(enclosingInstanceName);
-			assertTrue("name should be ok ", ref.checkEnclosingInstanceName(enclosingInstanceName).isOK());
-		}	
-		ref.setMarkInstanceFieldAsFinal(makeFinal);
-		ICompilationUnit[] cus= new ICompilationUnit[cuNames.length];
-		for (int i= 0; i < cuNames.length; i++) {
-			cus[i]= createCUfromTestFile(getPackage(packageNames[i]), cuNames[i]);			
-		}
-		
-		RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-		assertTrue("precondition was supposed to pass", checkInputResult.isOK());	
-		performChange(ref, false);
-		
-		for (int i= 0; i < cus.length; i++) {
-			String actual= cus[i].getSource();
-			String expected= getFileContents(getOutputTestFileName(cuNames[i]));
-			assertEqualLines(cus[i].getElementName(), expected, actual);
-		}
-		ICompilationUnit newCu= clas.getPackageFragment().getCompilationUnit(className + ".java");
-		String expected= getFileContents(getOutputTestFileName(className));
-		String actual= newCu.getSource();
-		assertEqualLines("new Cu:", expected, actual);
-	}
-	private void validatePassingTest(String parentClassName, String className, String[] cuNames, String[] packageNames, String enclosingInstanceName, boolean possible, boolean mandatory) throws Exception {
-		validatePassingTest(parentClassName, className, "p", cuNames, packageNames, enclosingInstanceName, false, possible, mandatory, true);
-	}
-
-	private void validateFailingTest(String parentClassName, String className, String[] cuNames, String[] packageNames, String enclosingInstanceName, int expectedSeverity) throws Exception {
-		IType parentClas= getClassFromTestFile(getPackageP(), parentClassName);
-		IType clas= parentClas.getType(className);
-
-		MoveInnerToTopRefactoring ref= MoveInnerToTopRefactoring.create(clas, JavaPreferencesSettings.getCodeGenerationSettings());
-		if (expectedSeverity == NOT_AVAILABLE && ref == null)
-			return;
-		assertEquals("refactoring availability not as expected", expectedSeverity == NOT_AVAILABLE, ref == null);
-
-		RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());
-		
-		if (enclosingInstanceName != null){
-			ref.setEnclosingInstanceName(enclosingInstanceName);
-		}	
-		ref.setMarkInstanceFieldAsFinal(false);		
-		ICompilationUnit[] cus= new ICompilationUnit[cuNames.length];
-		for (int i= 0; i < cuNames.length; i++) {
-			cus[i]= createCUfromTestFile(getPackage(packageNames[i]), cuNames[i]);			
-		}
-		
-		RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-		
-		RefactoringStatus result= new RefactoringStatus();
-		result.merge(preconditionResult);
-		result.merge(checkInputResult);
-		assertEquals("different severity expected", expectedSeverity, result.getSeverity());
-	}
-	private IPackageFragment getPackage(String name) throws JavaModelException {
-		if ("p".equals(name))
-			return getPackageP();
-		IPackageFragment pack= getRoot().getPackageFragment(name);
-		if (pack.exists())	
-			return pack;
-		return getRoot().createPackageFragment(name, false, new NullProgressMonitor());	
-	}
-
-
-	//-- tests 
-
-	public void test0() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-	
-	public void test1() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test2() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test3() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test4() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test5() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test6() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-	public void test7() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test8() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-	public void test9() throws Exception{
-		printTestDisabledMessage("removing unused imports");
-//		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null);
-	}
-
-	public void test10() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-	public void test11() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test12() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-	public void test13() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test14() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test15() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A", "A1"}, new String[]{"p", "p1"}, null, false, false);
-	}
-
-	public void test16() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A", "A1"}, new String[]{"p", "p1"}, null, false, false);
-	}
-
-	public void test17() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test18() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A", "A1"}, new String[]{"p", "p1"}, null, false, false);
-	}
-
-	public void test19() throws Exception{
-		printTestDisabledMessage("bug 23078");
-//		validatePassingTest("A", "Inner", new String[]{"A", "A1"}, new String[]{"p", "p1"}, null);
-	}
-
-	public void test20() throws Exception{
-//		printTestDisabledMessage("bug 23077 ");
-		validatePassingTest("A", "Inner", new String[]{"A", "A1"}, new String[]{"p", "p1"}, null, false, false);
-	}
-
-	public void test21() throws Exception{
-//		printTestDisabledMessage("bug 23627");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-	public void test22() throws Exception{
-//		printTestDisabledMessage("bug 23627");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test23() throws Exception{
-//		printTestDisabledMessage("bug 24576 ");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test24() throws Exception{
-//		printTestDisabledMessage("bug 28816 ");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, null, false, false);
-	}
-
-	public void test25() throws Exception{
-//		printTestDisabledMessage("bug 39716");
-		validatePassingTest("A", "Inner", "", new String[]{"A"}, new String[]{""}, null, false, false, false, true);
-	}
-
-	public void test_nonstatic_0() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-
-	public void test_nonstatic_1() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_2() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_3() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_4() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_5() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_6() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_7() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_8() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_9() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_10() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_11() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_12() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, true);
-	}
-	public void test_nonstatic_13() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, true);
-	}
-	public void test_nonstatic_14() throws Exception{
-		printTestDisabledMessage("bug 23488");
-//		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a");
-	}
-	public void test_nonstatic_15() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_16() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_17() throws Exception{ 
-		printTestDisabledMessage("bug 23488");
-//		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a");
-	}
-	public void test_nonstatic_18() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_19() throws Exception{
-//		printTestDisabledMessage("bug 23464 ");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_20() throws Exception{
-//		printTestDisabledMessage("bug 23464 ");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_21() throws Exception{
-//		printTestDisabledMessage("must fix - consequence of fix for 23464");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_22() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_23() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_24() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_25() throws Exception{
-//		printTestDisabledMessage("bug 23464 ");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_26() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_27() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-	public void test_nonstatic_28() throws Exception{
-		printTestDisabledMessage("test for bug 23725");
-//		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a");
-	}
-	public void test_nonstatic_29() throws Exception{
-		printTestDisabledMessage("test for bug 23724");
-//		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a");
-	}
-	public void test_nonstatic_30() throws Exception{
-//		printTestDisabledMessage("test for bug 23715");
-		validatePassingTest("A", "Inner", "p", new String[]{"A"}, new String[]{"p"}, "a", true, true, false, true);
-	}
-
-	public void test_nonstatic_31() throws Exception{
-//		printTestDisabledMessage("test for bug 25537");
-		validatePassingTest("A", "Inner", "p", new String[]{"A"}, new String[]{"p"}, "a", true, true, true, true);
-	}
-
-	public void test_nonstatic_32() throws Exception{
-//		printTestDisabledMessage("test for bug 25537");
-		validatePassingTest("A", "Inner", "p", new String[]{"A"}, new String[]{"p"}, "a", true, true, true, true);
-	}
-
-    public void test_nonstatic_33() throws Exception{
-//		printTestDisabledMessage("test for bug 26252");
-        validatePassingTest("A", "I", "p", new String[]{"A"}, new String[]{"p"}, "a", true, true, false, true);
-    }
-
-	public void test_nonstatic_34() throws Exception{
-//		printTestDisabledMessage("test for bug 31861");
-		validatePassingTest("A", "Inner", "p", new String[]{"A"}, new String[]{"p"}, "a", true, true, true, true);
-	}
-
-	public void test_nonstatic_35() throws Exception{
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, false);
-	}
-
-	public void test_nonstatic_36() throws Exception{
-//		printTestDisabledMessage("test for bug 34591");
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, true);
-	}
-
-	public void test_nonstatic_37() throws Exception{
-//		printTestDisabledMessage("test for bug 38114");		
-		validatePassingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", true, true);
-	}
-
-	public void test_nonstatic_38() throws Exception{
-//		printTestDisabledMessage("test for bug 37540");		
-		validatePassingTest("A", "Inner", "p", new String[]{"A"}, new String[]{"p"}, "a", false, true, false, false);
-	}
-
-	public void test_nonstatic_39() throws Exception{
-//		printTestDisabledMessage("test for bug 37540");		
-		validatePassingTest("A", "Inner", "p", new String[]{"A"}, new String[]{"p"}, "a", false, true, false, false);
-	}
-
-	public void testFail_nonstatic_0() throws Exception{
-		validateFailingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", RefactoringStatus.ERROR);
-	}
-	public void testFail_nonstatic_1() throws Exception{
-		validateFailingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", RefactoringStatus.ERROR);
-	}
-	public void testFail_nonstatic_2() throws Exception{
-		validateFailingTest("A", "Inner", new String[]{"A"}, new String[]{"p"}, "a", RefactoringStatus.ERROR);
-	}
-	
-	public void testFail_nonstatic_3() throws Exception{
-		IType parentClas= getClassFromTestFile(getPackageP(), "A");
-		int offset= TextRangeUtil.getOffset(parentClas.getCompilationUnit(), 5, 25);
-		IType nestedLocal= (IType) parentClas.getCompilationUnit().codeSelect(offset, 0)[0];
-	
-		MoveInnerToTopRefactoring ref= MoveInnerToTopRefactoring.create(nestedLocal, JavaPreferencesSettings.getCodeGenerationSettings());
-		assertNull("refactoring was not supposed to be available", ref);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java
deleted file mode 100644
index 3ac003a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java
+++ /dev/null

@@ -1,413 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.Assert;
-import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatusCodes;
-import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodRefactoring;
-import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodRefactoring.INewReceiver;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class MoveInstanceMethodTests extends RefactoringTest {
-
-	private static final Class clazz= MoveInstanceMethodTests.class;
-	private static final String REFACTORING_PATH= "MoveInstanceMethod/";
-
-	private static final int PARAMETER= 0;
-	private static final int FIELD= 1;
-
-	private boolean toSucceed;
-
-	public MoveInstanceMethodTests(String name) {
-		super(name);
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH+ successPath();
-	}
-
-	private String successPath() {
-		return toSucceed ? "/canMove/" : "/cannotMove/";
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	private String getSimpleName(String qualifiedName) {
-		return qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
-	}
-
-	private String getQualifier(String qualifiedName) {
-		int dot= qualifiedName.lastIndexOf('.');
-		return qualifiedName.substring(0, dot != -1 ? dot : 0);
-	}
-
-	private ICompilationUnit[] createCUs(String[] qualifiedNames) throws Exception {
-		ICompilationUnit[] cus= new ICompilationUnit[qualifiedNames.length];
-		for(int i= 0; i < qualifiedNames.length; i++) {
-			Assert.isNotNull(qualifiedNames[i]);
-
-			cus[i]= createCUfromTestFile(getRoot().createPackageFragment(getQualifier(qualifiedNames[i]), true, null),
-													  getSimpleName(qualifiedNames[i]));
-		}
-		return cus;
-	}
-
-	private int firstIndexOf(String one, String[] others) {
-		for(int i= 0; i < others.length; i++)
-			if(one == null && others[i] == null || one.equals(others[i]))
-				return i;
-		return -1;
-	}
-	
-	private void helper1(String[] cuQNames, String selectionCuQName, int startLine, int startColumn, int endLine, int endColumn, int newReceiverType, String newReceiverName, boolean inlineDelegator, boolean removeDelegator) throws Exception {
-		int selectionCuIndex= firstIndexOf(selectionCuQName, cuQNames);
-		Assert.isTrue(selectionCuIndex != -1, "parameter selectionCuQName must match some String in cuQNames.");
-		helper1(cuQNames, selectionCuIndex, startLine, startColumn, endLine, endColumn, newReceiverType, newReceiverName, null, inlineDelegator, removeDelegator);
-	}
-	
-	private static void chooseNewReceiver(MoveInstanceMethodRefactoring ref, int newReceiverType, String newReceiverName) {
-		INewReceiver chosen= null;
-		INewReceiver[] possibleNewReceivers= ref.getPossibleNewReceivers();
-		for(int i= 0; i < possibleNewReceivers.length; i++)  {
-			INewReceiver candidate= possibleNewReceivers[i];
-			if(   candidate.getName().equals(newReceiverName)
-			   && typeMatches(newReceiverType, candidate)) {
-				assertNull(chosen);
-				chosen= candidate;
-			}
-		}
-		assertNotNull("Expected new receiver not available.", chosen);
-		ref.chooseNewReceiver(chosen);		
-	}
-	
-	private static boolean typeMatches(int newReceiverType, INewReceiver newReceiver) {
-		return    newReceiverType == PARAMETER && newReceiver.isParameter()
-		        || newReceiverType == FIELD && newReceiver.isField();
-	}
-	
-	private void helper1(String[] cuQNames, int selectionCuIndex, int startLine, int startColumn, int endLine, int endColumn, int newReceiverType, String newReceiverName, String newMethodName, boolean inlineDelegator, boolean removeDelegator) throws Exception{
-		Assert.isTrue(0 <= selectionCuIndex && selectionCuIndex < cuQNames.length);
-
-		toSucceed= true;
-
-		ICompilationUnit[] cus= createCUs(cuQNames);
-		ICompilationUnit selectionCu= cus[selectionCuIndex];
-
-		ISourceRange selection= TextRangeUtil.getSelection(selectionCu, startLine, startColumn, endLine, endColumn);
-		IMethod method= getMethod(selectionCu, selection);
-		assertNotNull(method);
-		MoveInstanceMethodRefactoring ref= MoveInstanceMethodRefactoring.create(method, JavaPreferencesSettings.getCodeGenerationSettings());
-		
-		assertNotNull("refactoring should be created", ref);
-		RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor());
-
-		assertTrue("activation was supposed to be successful", preconditionResult.isOK());
-
-		chooseNewReceiver(ref, newReceiverType, newReceiverName);
-		
-		ref.setRemoveDelegator(removeDelegator);
-		ref.setInlineDelegator(inlineDelegator);
-		if(newMethodName != null)
-			ref.setNewMethodName(newMethodName);
-
-		preconditionResult.merge(ref.checkFinalConditions(new NullProgressMonitor()));
-
-		assertTrue("precondition was supposed to pass",preconditionResult.isOK());
-
-		performChange(ref, false);
-
-		for(int i= 0; i < cus.length; i++) {
-			String outputTestFileName= getOutputTestFileName(getSimpleName(cuQNames[i]));
-			assertEqualLines("Incorrect inline in " + outputTestFileName, getFileContents(outputTestFileName), cus[i].getSource());
-		}
-	}
-
-	private void failHelper1(String cuQName, int startLine, int startColumn, int endLine, int endColumn, int newReceiverType, String newReceiverName, boolean inlineDelegator, boolean removeDelegator, int errorCode) throws Exception {
-		failHelper1(new String[] {cuQName}, cuQName, startLine, startColumn, endLine, endColumn, newReceiverType, newReceiverName, inlineDelegator, removeDelegator, errorCode);
-	}
-	private void failHelper1(String[] cuQNames, String selectionCuQName, int startLine, int startColumn, int endLine, int endColumn, int newReceiverType, String newReceiverName, boolean inlineDelegator, boolean removeDelegator, int errorCode) throws Exception {
-		int selectionCuIndex= firstIndexOf(selectionCuQName, cuQNames);
-		Assert.isTrue(selectionCuIndex != -1, "parameter selectionCuQName must match some String in cuQNames.");
-		failHelper1(cuQNames, selectionCuIndex, startLine, startColumn, endLine, endColumn, newReceiverType, newReceiverName, null, null, inlineDelegator, removeDelegator, errorCode);
-	}
-	private void failHelper2(String[] cuQNames, String selectionCuQName, int startLine, int startColumn, int endLine, int endColumn, int newReceiverType, String newReceiverName, String originalReceiverParameterName, boolean inlineDelegator, boolean removeDelegator, int errorCode) throws Exception {
-		int selectionCuIndex= firstIndexOf(selectionCuQName, cuQNames);
-		Assert.isTrue(selectionCuIndex != -1, "parameter selectionCuQName must match some String in cuQNames.");
-		failHelper1(cuQNames, selectionCuIndex, startLine, startColumn, endLine, endColumn, newReceiverType, newReceiverName, null, originalReceiverParameterName, inlineDelegator, removeDelegator, errorCode);
-	}
-	private void failHelper1(String[] cuQNames, int selectionCuIndex, int startLine, int startColumn, int endLine, int endColumn, int newReceiverType, String newReceiverName, String newMethodName, String originalReceiverParameterName, boolean inlineDelegator, boolean removeDelegator, int errorCode) throws Exception {
-		Assert.isTrue(0 <= selectionCuIndex && selectionCuIndex < cuQNames.length);
-
-		toSucceed= false;
-
-		ICompilationUnit[] cus= createCUs(cuQNames);
-		ICompilationUnit selectionCu= cus[selectionCuIndex];
-
-		ISourceRange selection= TextRangeUtil.getSelection(selectionCu, startLine, startColumn, endLine, endColumn);
-		IMethod method= getMethod(selectionCu, selection);
-		assertNotNull(method);
-		MoveInstanceMethodRefactoring ref= MoveInstanceMethodRefactoring.create(method,
-																									JavaPreferencesSettings.getCodeGenerationSettings());
-		if (ref == null) {
-			assertTrue(errorCode != 0);
-		} else  {
-			RefactoringStatus result= ref.checkInitialConditions(new NullProgressMonitor());
-
-			if(!result.isOK()) {
-				assertEquals(errorCode, result.getEntryMatchingSeverity(RefactoringStatus.ERROR).getCode());
-				return;
-			} else {
-				chooseNewReceiver(ref, newReceiverType, newReceiverName);
-	
-				if (originalReceiverParameterName != null)
-					ref.setOriginalReceiverParameterName(originalReceiverParameterName);
-				ref.setRemoveDelegator(removeDelegator);			
-				ref.setInlineDelegator(inlineDelegator);
-				if(newMethodName != null)
-					ref.setNewMethodName(newMethodName);
-	
-				result.merge(ref.checkFinalConditions(new NullProgressMonitor()));
-	
-				assertTrue("precondition checking is expected to fail.", !result.isOK());
-				assertEquals(errorCode, result.getEntryMatchingSeverity(RefactoringStatus.ERROR).getCode());
-			}
-		}
-	}	
-
-	private static IMethod getMethod(ICompilationUnit cu, ISourceRange sourceRange) throws JavaModelException {
-		IJavaElement[] jes= cu.codeSelect(sourceRange.getOffset(), sourceRange.getLength());
-		if (jes.length != 1 || ! (jes[0] instanceof IMethod))
-			return null;
-		return (IMethod)jes[0];
-	}
-	
-	//--- TESTS
-	
-	// Move mA1 to parameter b, do not inline delegator	
-	public void test0() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B", "p3.C"}, "p1.A", 7, 17, 7, 20, PARAMETER, "b", false, false);
-	}
-	
-	// Move mA1 to parameter b, inline delegator
-	public void test1() throws Exception {
-		printTestDisabledMessage("not implemented yet");
-//		helper1(new String[] {"p1.A", "p2.B", "p3.C"}, "p1.A", 7, 17, 7, 20, PARAMETER, "b", true, false);
-	}
-
-//	// Move mA1 to parameter b, inline delegator, remove delegator
-	public void test2() throws Exception {
-		printTestDisabledMessage("not implemented yet");
-//		helper1(new String[] {"p1.A", "p2.B", "p3.C"}, "p1.A", 7, 17, 7, 20, PARAMETER, "b", true, true);
-	}
-	
-	// Move mA1 to field fB, do not inline delegator
-	public void test3() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B", "p3.C"}, "p1.A", 9, 17, 9, 20, FIELD, "fB", false, false);
-	}
-	
-//	// Move mA1 to field fB, inline delegator, remove delegator
-	public void test4() throws Exception {
-		printTestDisabledMessage("not implemented yet");		
-//		helper1(new String[] {"p1.A", "p2.B", "p3.C"}, "p1.A", 9, 17, 9, 20, FIELD, "fB", true, true);
-	}
-	
-	// Move mA1 to field fB, unqualified static member references are qualified
-	public void test5() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B"}, "p1.A", 15, 19, 15, 19, FIELD, "fB", false, false);	
-	}
-	
-	// class qualify referenced type name to top level, original receiver not used in method
-	public void test6() throws Exception {
-		helper1(new String[] {"p1.Nestor", "p2.B"}, "p1.Nestor", 11, 17, 11, 17, PARAMETER, "b", false, false);
-	}	
-	
-	public void test7() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B", "p3.N1"}, "p1.A", 8, 17, 8, 18, PARAMETER, "b", false, false);
-	}
-	
-	// access to fields, non-void return type
-	public void test8() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B"}, "p1.A", 9, 19, 9, 20, PARAMETER, "b", false, false);
-	}
-	
-	// multiple parameters, some left of new receiver parameter, some right of it,
-	// "this" is passed as first argument
-	public void test9() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B"}, "p1.A", 6, 17, 6, 17, PARAMETER, "b", false, false);
-	}	
-	
-	// multiple parameters, some left of new receiver parameter, some right of it,
-	// "this" is NOT passed as first argument, (since it's not used in the method)
-	public void test10() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B"}, "p1.A", 6, 17, 6, 17, PARAMETER, "b", false, false);
-	}
-	
-	//move to field, method has parameters, choice of fields, some non-class type fields
-	// ("this" is passed as first argument)
-	public void test11() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B"}, "p1.A", 11, 17, 11, 17, FIELD, "fB", false, false);
-	}	
-
-	//move to field - do not pass 'this' because it's unneeded
-	public void test12() throws Exception {
-		helper1(new String[] {"p1.A", "p2.B"}, "p1.A", 8, 17, 8, 20, FIELD, "fB", false, false);
-	}	
-
-	//junit case
-	public void test13() throws Exception {
-		helper1(new String[] {"p1.TR", "p1.TC", "p1.P"}, "p1.TR", 4, 20, 4, 23, PARAMETER, "test", false, false);
-	}	
-
-	//simplified junit case
-	public void test14() throws Exception {
-		helper1(new String[] {"p1.TR", "p1.TC"}, "p1.TR", 4, 20, 4, 23, PARAMETER, "test", false, false);
-	}	
-	
-	//move to type in same cu
-	public void test15() throws Exception {
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=40120
-		helper1(new String[] {"p.A"}, "p.A", 13, 18, 13, 18, PARAMETER, "s", false, false);
-	}	
-
-	//move to inner type in same cu
-	public void test16() throws Exception {
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=40120
-		helper1(new String[] {"p.B"}, "p.B", 11, 17, 11, 22, PARAMETER, "s", false, false);
-	}
-
-	//don't generate parameter for unused field (bug 38310)
-	public void test17() throws Exception {
-		helper1(new String[] {"p.Shape", "p.Rectangle"}, "p.Shape", 7, 16, 7, 20, FIELD, "fBounds", false, false);
-	}	
-
-	//generate parameter for used field (bug 38310)
-	public void test18() throws Exception {
-		helper1(new String[] {"p.Shape", "p.Rectangle"}, "p.Shape", 13, 22, 13, 22, FIELD, "fInnerBounds", false, false);
-	}	
-
-	//generate parameter for used field (bug 38310)
-	public void test19() throws Exception {
-		helper1(new String[] {"p.Shape", "p.Rectangle"}, "p.Shape", 17, 20, 17, 33, PARAMETER, "rect", false, false);
-	}	
-	
-	// Can move if "super" is used in inner class 
-	public void test20() throws Exception {
-		helper1(new String[] {"p.A", "p.B", "p.StarDecorator"}, "p.A", 10, 17, 10, 22, PARAMETER, "b", false, false);
-	}	
-
-	// Arguments of method calls preserved in moved body (bug 41468)
-	public void test21() throws Exception {
-		helper1(new String[] {"p.A", "p.Second"}, "p.A", 5, 17, 5, 22, FIELD, "s", false, false);
-	}
-
-	// arguments of method calls preserved in moved body (bug 41468),
-	// use "this" instead of field (bug 38310)
-	public void test22() throws Exception {
-		helper1(new String[] {"p.A", "p.Second"}, "p.A", 5, 17, 5, 22, FIELD, "s", false, false);
-	}
-
-	// "this"-qualified field access: this.s -> this (bug 41597)
-	public void test23() throws Exception {
-		helper1(new String[] {"p.A", "p.Second"}, "p.A", 5, 17, 5, 22, FIELD, "s", false, false);
-	}
-
-	// move local class (41530)
-	public void test24() throws Exception {
-		helper1(new String[] {"p1.A", "p1.B", "p1.StarDecorator"}, "p1.A", 9, 17, 9, 22, PARAMETER, "b", false, false);
-	}
-
-
-	// Cannot move interface method declaration
-	public void testFail0() throws Exception {
-		failHelper1("p1.IA", 5, 17, 5, 20, PARAMETER, "b", true, true, RefactoringStatusCodes.SELECT_METHOD_IMPLEMENTATION);	
-	}
-	
-	// Cannot move abstract method declaration
-	public void testFail1() throws Exception {
-		failHelper1("p1.A", 5, 26, 5, 29, PARAMETER, "b", true, true, RefactoringStatusCodes.SELECT_METHOD_IMPLEMENTATION);
-	}
-	
-	// Cannot move static method
-	public void testFail2() throws Exception {
-		failHelper1(new String[] {"p1.A", "p2.B"}, "p1.A", 6, 23, 6, 24, PARAMETER, "b", true, true, RefactoringStatusCodes.CANNOT_MOVE_STATIC);
-	}
-	
-	// Cannot move native method
-	public void testFail3() throws Exception {
-		failHelper1(new String[] {"p1.A", "p2.B"}, "p1.A", 6, 23, 6, 24, PARAMETER, "b", true, true, RefactoringStatusCodes.CANNOT_MOVE_NATIVE);
-	}
-	
-	// Cannot move method that references "super"
-	public void testFail4() throws Exception {
-		failHelper1(new String[] {"p1.A", "p2.B"}, "p1.A", 11, 20, 11, 21, PARAMETER, "b", true, true, RefactoringStatusCodes.SUPER_REFERENCES_NOT_ALLOWED);
-	}
-	
-	// Cannot move method that references an enclosing instance
-	public void testFail5() throws Exception {
-		failHelper1(new String[] {"p1.A", "p2.B"}, "p1.A", 8, 21, 8, 21, PARAMETER, "b", true, true, RefactoringStatusCodes.ENCLOSING_INSTANCE_REFERENCES_NOT_ALLOWED);
-	}
-	
-	// Cannot move potentially directly recursive method
-	public void testFail6() throws Exception {
-		failHelper1(new String[] {"p1.A", "p2.B"}, "p1.A", 6, 16, 6, 17, PARAMETER, "b", true, true, RefactoringStatusCodes.CANNOT_MOVE_RECURSIVE);
-	}
-	
-	// Cannot move to local class
-	public void testFail7() throws Exception {
-		printTestDisabledMessage("not implemented yet - jcore does not have elements for local types");
-//		failHelper1("p1.A", 9, 25, 9, 26, PARAMETER, "p", true, true, RefactoringStatusCodes.CANNOT_MOVE_TO_LOCAL);
-	}		
-
-	// Cannot move synchronized method
-	public void testFail8() throws Exception {
-		failHelper1(new String[] {"p1.A", "p2.B"}, "p1.A", 6, 29, 6, 29, PARAMETER, "b", true, true, RefactoringStatusCodes.CANNOT_MOVE_SYNCHRONIZED);
-	}
-
-	// Cannot move method if there's no new potential receiver
-	public void testFail9() throws Exception {
-		failHelper1(new String[] {"p1.A", "p2.B", "p3.C"}, "p1.A", 7, 17, 7, 20, PARAMETER, "b", true, true, RefactoringStatusCodes.NO_NEW_RECEIVERS);	
-	}
-
-	// Cannot move method if there's no new potential receiver
-	public void testFail10() throws Exception {
-		failHelper1(new String[] {"p1.A", "p2.B", "p3.C"}, "p1.A", 8, 17, 8, 20, PARAMETER, "b", true, true, RefactoringStatusCodes.NO_NEW_RECEIVERS);	
-	}
-	
-	// Cannot move method - parameter name conflict
-	public void testFail11() throws Exception {
-		failHelper2(new String[] {"p1.A", "p2.B"}, "p1.A", 7, 17, 7, 20, PARAMETER, "b", "a", true, true, RefactoringStatusCodes.PARAM_NAME_ALREADY_USED);	
-	}
-
-	// Cannot move method if there's no new potential receiver (because of null bindings here)
-	public void testFail12() throws Exception {
-//		printTestDisabledMessage("bug 39871");
-		failHelper1(new String[] {"p1.A"}, "p1.A", 5, 10, 5, 16, PARAMETER, "b", true, true, RefactoringStatusCodes.NO_NEW_RECEIVERS);	
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveMembersTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveMembersTests.java
deleted file mode 100644
index ebdcf34..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveMembersTests.java
+++ /dev/null

@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.DebugUtils;
-
-import org.eclipse.jdt.internal.corext.refactoring.structure.MoveStaticMembersProcessor;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.MoveArguments;
-import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
-
-public class MoveMembersTests extends RefactoringTest {
-
-	private static final Class clazz= MoveMembersTests.class;
-	
-	private static final String REFACTORING_PATH= "MoveMembers/";
-
-	public MoveMembersTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}	
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	//---
-	private static MoveRefactoring createRefactoring(IMember[] members, IType destination) throws JavaModelException{
-		return createRefactoring(members, destination.getFullyQualifiedName());
-	}
-	
-	private static MoveRefactoring createRefactoring(IMember[] members, String destination) throws JavaModelException{
-		MoveStaticMembersProcessor processor= MoveStaticMembersProcessor.create(members, JavaPreferencesSettings.getCodeGenerationSettings());
-		if (processor == null)
-			return null;
-		processor.setDestinationTypeFullyQualifiedName(destination);
-		return new MoveRefactoring(processor);
-	}
-	
-	protected void setUp() throws Exception {
-		if (fIsVerbose)
-			DebugUtils.dump("--------- " + getName() + " ---------------");
-		super.setUp();
-	}
-	
-	private void fieldMethodTypePackageHelper_passing(String[] fieldNames, String[] methodNames, String[][] signatures, String[] typeNames, IPackageFragment packForA, IPackageFragment packForB) throws Exception {
-		ParticipantTesting.reset();
-		ICompilationUnit cuA= createCUfromTestFile(packForA, "A");
-		ICompilationUnit cuB= createCUfromTestFile(packForB, "B");
-		IType typeA= getType(cuA, "A");
-		IType typeB= getType(cuB, "B");
-		IField[] fields= getFields(typeA, fieldNames);
-		IMethod[] methods= getMethods(typeA, methodNames, signatures);
-		IType[] types= getMemberTypes(typeA, typeNames);
-	
-		IType destinationType= typeB;
-		IMember[] members= merge(methods, fields, types);
-		String[] handles= ParticipantTesting.createHandles(members);
-		MoveArguments[] args= new MoveArguments[handles.length];
-		for (int i = 0; i < args.length; i++) {
-			args[i]= new MoveArguments(destinationType, true);
-		}
-		MoveRefactoring ref= createRefactoring(members, destinationType);
-	
-		RefactoringStatus result= performRefactoringWithStatus(ref);
-		assertTrue("precondition was supposed to pass", result.getSeverity() <= RefactoringStatus.WARNING);
-		ParticipantTesting.testMove(handles, args);
-	
-		String expected;
-		String actual;
-	
-		expected= getFileContents(getOutputTestFileName("A"));
-		actual= cuA.getSource();
-		assertEqualLines("incorrect modification of  A", expected, actual);
-	
-		expected= getFileContents(getOutputTestFileName("B"));
-		actual= cuB.getSource();
-		assertEqualLines("incorrect modification of  B", expected, actual);
-		//tearDown() deletes resources and does performDummySearch();
-	}
-	
-	/* Move members from p.A to r.B */
-	private void fieldMethodTypeABHelper_passing(String[] fieldNames, String[] methodNames, String[][] signatures, String[] typeNames) throws Exception {
-		IPackageFragment packageForB= getRoot().createPackageFragment("r", false, null);
-		fieldMethodTypePackageHelper_passing(fieldNames, methodNames, signatures, typeNames, getPackageP(), packageForB);
-		//tearDown() deletes resources and does performDummySearch();
-	}
-
-	private void fieldMethodTypeHelper_passing(String[] fieldNames, String[] methodNames, String[][] signatures, String[] typeNames) throws Exception{
-		IPackageFragment packForA= getPackageP();
-		IPackageFragment packForB= getPackageP();
-		fieldMethodTypePackageHelper_passing(fieldNames, methodNames, signatures, typeNames, packForA, packForB);
-	}
-	
-	private void fieldHelper_passing(String[] fieldNames) throws Exception {
-		fieldMethodTypeHelper_passing(fieldNames, new String[0], new String[0][0], new String[0]);
-	}
-	
-	private void methodHelper_passing(String[] methodNames, String[][] signatures) throws Exception {
-		fieldMethodTypeHelper_passing(new String[0], methodNames, signatures, new String[0]);
-	}
-
-	private void typeHelper_passing(String[] typeNames) throws Exception {
-		fieldMethodTypeHelper_passing(new String[0], new String[0], new String[0][0], typeNames);
-	}
-	
-	private void fieldMethodTypePackageHelper_failing(String[] fieldNames,
-												String[] methodNames, String[][] signatures,
-												String[] typeNames,
-												int errorLevel, String destinationTypeName,
-												IPackageFragment packForA,
-												IPackageFragment packForB) throws Exception {
-		ICompilationUnit cuA= createCUfromTestFile(packForA, "A");
-		ICompilationUnit cuB= createCUfromTestFile(packForB, "B");
-		try{
-			IType typeA= getType(cuA, "A");
-			IField[] fields= getFields(typeA, fieldNames);
-			IMethod[] methods= getMethods(typeA, methodNames, signatures);
-			IType[] types= getMemberTypes(typeA, typeNames);
-		
-			MoveRefactoring ref= createRefactoring(merge(methods, fields, types), destinationTypeName);
-			if (ref == null){
-				assertEquals(errorLevel, RefactoringStatus.FATAL);
-				return;
-			}
-		
-			RefactoringStatus result= performRefactoring(ref);
-			if (fIsVerbose)
-				DebugUtils.dump("status:" + result);
-			assertNotNull("precondition was supposed to fail", result);
-			assertEquals("precondition was supposed to fail", errorLevel, result.getSeverity());
-		
-		} finally{
-			performDummySearch();			
-			cuA.delete(false, null);
-			cuB.delete(false, null);
-		}	
-	}
-	
-	private void fieldMethodTypeHelper_failing(String[] fieldNames, 
-												String[] methodNames, String[][] signatures, 
-												String[] typeNames,
-												int errorLevel, String destinationTypeName) throws Exception {
-		IPackageFragment packForA= getPackageP();
-		IPackageFragment packForB= getPackageP();											
-		fieldMethodTypePackageHelper_failing(fieldNames, methodNames, signatures, typeNames,
-												errorLevel, destinationTypeName, packForA, packForB);	
-	}
-
-
-	//---
-
-	public void test0() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test1() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test2() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test3() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test4() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test5() throws Exception{
-		fieldHelper_passing(new String[]{"f"});
-	}
-
-	public void test6() throws Exception{
-		fieldHelper_passing(new String[]{"f"});
-	}
-
-	public void test7() throws Exception{
-		fieldHelper_passing(new String[]{"f"});
-	}
-	
-	public void test8() throws Exception{
-//		printTestDisabledMessage("36835");
-		IPackageFragment packageForB= null;
-		try{
-			packageForB= getRoot().createPackageFragment("r", false, null);
-			fieldMethodTypePackageHelper_passing(new String[]{"f"}, new String[0], new String[0][0], new String[0], getPackageP(), packageForB);
-		} finally{
-			performDummySearch();
-			if (packageForB != null)
-				packageForB.delete(true, null);
-		}	
-	}
-
-	public void test9() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test10() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test11() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test12() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test13() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test14() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test15() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test16() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test17() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test18() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test19() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test20() throws Exception{
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-	
-	public void test21() throws Exception{
-		fieldHelper_passing(new String[]{"F", "i"});
-	}
-	
-	public void test22() throws Exception{
-		fieldHelper_passing(new String[]{"i"});
-	}
-	
-	public void test23() throws Exception{
-		fieldHelper_passing(new String[]{"FRED"});
-	}
-	
-	public void test24() throws Exception{
-		fieldHelper_passing(new String[]{"FRED"});
-	}
-	
-	public void test25() throws Exception{
-		//printTestDisabledMessage("test for 27098");
-		fieldHelper_passing(new String[]{"FRED"});
-	}
-	
-	public void test26() throws Exception{
-		IPackageFragment packageForB= null;
-		try{
-			packageForB= getRoot().createPackageFragment("r", false, null);
-			fieldMethodTypePackageHelper_passing(new String[0], new String[]{"n"}, new String[][]{new String[0]}, new String[0], getPackageP(), packageForB);
-		} finally{
-			performDummySearch();
-			if (packageForB != null)
-				packageForB.delete(true, null);
-		}	
-	}
-	
-	public void test27() throws Exception{
-		IPackageFragment packageForB= null;
-		try{
-			packageForB= getRoot().createPackageFragment("r", false, null);
-			fieldMethodTypePackageHelper_passing(new String[0], new String[]{"n"}, new String[][]{new String[0]}, new String[0], getPackageP(), packageForB);
-		} finally{
-			performDummySearch();
-			if (packageForB != null)
-				packageForB.delete(true, null);
-		}	
-	}
-	
-	public void test28() throws Exception{
-		methodHelper_passing(new String[]{"m", "n"}, new String[][]{new String[0], new String[0]});
-	}
-	
-	public void test29() throws Exception{ //test for bug 41691
-		methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test30() throws Exception{ //test for bug 41691
-		fieldHelper_passing(new String[]{"id"});
-	}
-
-	public void test31() throws Exception{ //test for bug 41691
-		fieldHelper_passing(new String[]{"odd"});
-	}
-
-	public void test32() throws Exception{ //test for bug 41734, 41691
-		printTestDisabledMessage("test for 41734");
-		//methodHelper_passing(new String[]{"m"}, new String[][]{new String[0]});
-	}
-
-	public void test33() throws Exception{ //test for bug 28022
-		fieldHelper_passing(new String[]{"i"});
-	}
-
-	public void test34() throws Exception{ //test for bug 28022
-		fieldHelper_passing(new String[]{"i"});
-	}
-
-	public void test35() throws Exception{ //test for bug 28022
-		fieldHelper_passing(new String[]{"i"});
-	}
-	
-	//-- move types:
-	
-	public void test36() throws Exception {
-		typeHelper_passing(new String[]{"I"});
-	}
-	
-	public void test37() throws Exception {
-		printTestDisabledMessage("qualified access to source");
-//		typeHelper_passing(new String[] {"Inner"});
-	}
-	
-	public void test38() throws Exception {
-		fieldMethodTypeABHelper_passing(new String[0], new String[0], new String[0][0], new String[]{"Inner"});
-	}
-
-	public void test39() throws Exception {
-		printTestDisabledMessage("complex imports - need more work");
-//		fieldMethodType3CUsHelper_passing(new String[0], new String[0], new String[0][0],
-//							new String[]{"Inner"});
-	}
-	
-	public void test40() throws Exception{
-		fieldMethodTypeHelper_passing(new String[] {"f"}, new String[]{"m"}, new String[][]{new String[0]}, new String[0]);
-	}
-
-	public void test41() throws Exception{
-		methodHelper_passing(new String[] {"m"}, new String[][]{new String[0]});
-	}
-
-	//---
-	public void testFail0() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0],
-									  new String[]{"m"}, new String[][]{new String[0]},
-									  new String[0],
-									  RefactoringStatus.FATAL, "p.B");
-	}
-	
-
-	public void testFail1() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, 
-									  new String[0],
-									  RefactoringStatus.ERROR, "p.B.X");
-	}
-	
-	public void testFail2() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, 
-									  new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-
-	public void testFail3() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[]{"I", "I"}}, 
-									  new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-
-	public void testFail4() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[]{"I", "I"}}, 
-									  new String[0],
-									  RefactoringStatus.WARNING, "p.B");
-	}
-	
-	public void testFail5() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[]{"I", "I"}}, 
-									  new String[0],
-									  RefactoringStatus.WARNING, "p.B");
-	}
-
-	public void testFail6() throws Exception{
-		fieldMethodTypeHelper_failing(new String[]{"i"}, new String[0], new String[0][0], new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-	
-	public void testFail7() throws Exception{
-		fieldMethodTypeHelper_failing(new String[]{"i"}, new String[0], new String[0][0], new String[0], 
-									  RefactoringStatus.ERROR, "p.B");
-	}
-	
-	public void testFail8() throws Exception{
-		fieldMethodTypeHelper_failing(new String[]{"i"}, new String[0], new String[0][0], new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-	
-	public void testFail9() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-	
-	public void testFail10() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-
-	public void testFail11() throws Exception{
-		fieldMethodTypeHelper_failing(new String[]{"i"}, new String[0], new String[0][0], new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-
-	public void testFail12() throws Exception{
-		fieldMethodTypeHelper_failing(new String[]{"i"}, new String[0], new String[0][0], new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-
-	public void testFail13() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-
-	public void testFail14() throws Exception{
-		fieldMethodTypeHelper_failing(new String[]{"i"}, new String[0], new String[0][0], new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-
-	public void testFail15() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.WARNING, "p.B");
-	}
-
-	public void testFail16() throws Exception{
-		IPackageFragment packageForB= null;
-		try{
-			packageForB= getRoot().createPackageFragment("r", false, null);
-			fieldMethodTypePackageHelper_failing(new String[]{"f"}, new String[0], new String[0][0], new String[0],
-										 RefactoringStatus.ERROR, "r.B", 
-										 getPackageP(), packageForB);
-		} finally{
-			performDummySearch();
-			if (packageForB != null)
-				packageForB.delete(true, null);
-		}	
-	}
-
-	public void testFail17() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.FATAL, "java.lang.Object");
-	}
-	
-	public void testFail18() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.FATAL, "p.DontExist");
-	}
-
-	public void testFail19() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.ERROR, "p.B");
-	}
-	
-	public void testFail20() throws Exception{
-		// was same as test19
-	}
-	
-	public void testFail21() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.FATAL, "p.B");
-	}
-
-	public void testFail22() throws Exception{
-		//free slot
-	}
-
-	public void testFail23() throws Exception{
-		//free slot
-	}
-
-	public void testFail24() throws Exception{
-		fieldMethodTypeHelper_failing(new String[0], 
-									  new String[]{"m"}, new String[][]{new String[0]}, new String[0],
-									  RefactoringStatus.FATAL, "p.B");
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/NullRefactoring.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/NullRefactoring.java
deleted file mode 100644
index 23bbea3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/NullRefactoring.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.NullChange;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * useful for tests
- */
-public class NullRefactoring extends Refactoring {
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		pm.beginTask("", 1);
-		pm.worked(1);
-		pm.done();
-		return new NullChange("NullRefactoring");
-	}
-
-
-	public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException {
-		pm.beginTask("", 1);
-		pm.worked(1);
-		pm.done();
-		return new RefactoringStatus();
-	}
-
-	public RefactoringStatus checkFinalConditions(IProgressMonitor pm) throws CoreException {
-		pm.beginTask("", 1);
-		pm.worked(1);
-		pm.done();
-		return new RefactoringStatus();
-	}
-	
-	public String getName() {
-		return "Null Refactoring";
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ParticipantTesting.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ParticipantTesting.java
deleted file mode 100644
index 32cd168..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ParticipantTesting.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.participants.MoveArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-
-
-public class ParticipantTesting {
-	
-	public static void reset() {
-		TestCreateParticipantShared.reset();
-		TestDeleteParticipantShared.reset();
-		TestMoveParticipantShared.reset();
-		TestRenameParticipantShared.reset();
-		
-		TestCreateParticipantSingle.reset();
-		TestDeleteParticipantSingle.reset();
-		TestMoveParticipantSingle.reset();
-		TestRenameParticipantSingle.reset();
-	}
-	
-	public static String[] createHandles(Object object) {
-		return createHandles(new Object[] { object });
-	}
-	
-	public static String[] createHandles(Object obj1, Object obj2) {
-		return createHandles(new Object[] { obj1, obj2 });
-	}
-	
-	public static String[] createHandles(Object obj1, Object obj2, Object obj3) {
-		return createHandles(new Object[] { obj1, obj2, obj3 });
-	}
-	
-	public static String[] createHandles(Object obj1, Object obj2, Object obj3, Object obj4) {
-		return createHandles(new Object[] { obj1, obj2, obj3, obj4 });
-	}
-		
-	public static String[] createHandles(Object[] elements) {
-		List result= new ArrayList();
-		for (int i= 0; i < elements.length; i++) {
-			Object element= elements[i];
-			if (element instanceof IJavaElement) {
-				result.add(((IJavaElement)element).getHandleIdentifier());
-			} else {
-				result.add(((IResource)element).getFullPath().toString());
-			}
-		}
-		return (String[])result.toArray(new String[result.size()]);
-	}
-	
-	public static void testRename(String[] handles, RenameArguments[] args) {
-		Assert.assertTrue(handles.length == args.length);
-		if (handles.length == 0) {
-			TestRenameParticipantShared.testNumberOfElements(0);
-			TestRenameParticipantSingle.testNumberOfInstances(0);
-		} else {
-			testElementsShared(handles, TestRenameParticipantShared.fgInstance.fHandles);
-			TestRenameParticipantShared.testArguments(args);
-			
-			TestRenameParticipantSingle.testNumberOfInstances(handles.length);
-			TestRenameParticipantSingle.testElements(handles);
-			TestRenameParticipantSingle.testArguments(args);
-		}
-	}
-	
-	public static void testMove(String[] handles, MoveArguments[] args) {
-		Assert.assertTrue(handles.length == args.length);
-		if (handles.length == 0) {
-			TestMoveParticipantShared.testNumberOfElements(0);
-			TestMoveParticipantSingle.testNumberOfInstances(0);
-		} else {
-			testElementsShared(handles, TestMoveParticipantShared.fgInstance.fHandles);
-			TestMoveParticipantShared.testArguments(args);
-			
-			TestMoveParticipantSingle.testNumberOfInstances(handles.length);
-			TestMoveParticipantSingle.testElements(handles);
-			TestMoveParticipantSingle.testArguments(args);
-		}
-	}
-	
-	public static void testDelete(String[] handles) {
-		if (handles.length == 0) {
-			TestDeleteParticipantShared.testNumberOfElements(0);
-			TestDeleteParticipantSingle.testNumberOfInstances(0);
-		} else {
-			testElementsShared(handles, TestDeleteParticipantShared.fgInstance.fHandles);
-			
-			TestDeleteParticipantSingle.testNumberOfInstances(handles.length);
-			TestDeleteParticipantSingle.testElements(handles);
-		}
-	}	
-	
-	public static void testCreate(String[] handles) {
-		if (handles.length == 0)  {
-			TestCreateParticipantShared.testNumberOfElements(0);
-			TestCreateParticipantSingle.testNumberOfInstances(0);
-		} else {
-			testElementsShared(handles, TestCreateParticipantShared.fgInstance.fHandles);
-			
-			TestCreateParticipantSingle.testNumberOfInstances(handles.length);
-			TestCreateParticipantSingle.testElements(handles);
-		}
-	}
-	
-	private static void testElementsShared(String[] handles, List list) {
-		testNumberOfElements(handles.length, list);
-		for (int i= 0; i < handles.length; i++) {
-			String handle= handles[i];
-			Assert.assertTrue(list.contains(handle));
-		}
-	}
-	
-	private static void testNumberOfElements(int expected, List list) {
-		if (expected == 0 && list == null)
-			return;
-		Assert.assertEquals(expected, list.size());
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PathTransformationTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PathTransformationTests.java
deleted file mode 100644
index 95eb3a9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PathTransformationTests.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jdt.internal.corext.refactoring.changes.RenameResourceChange;
-
-public class PathTransformationTests extends TestCase {
-	
-	private static final Class clazz= PathTransformationTests.class;
-	public PathTransformationTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	private IPath createIPath(String p){
-		return Path.EMPTY.append(p);
-	}
-	
-	private void  check(String path, String oldName, String newName){
-		IPath pOld= createIPath(path + "/" + oldName);
-		String extension= "";
-		//if (oldName.lastIndexOf(".") != -1)
-		//	extension= oldName.substring(oldName.lastIndexOf("."));
-		IPath pNew= createIPath(path + "/" + newName + extension);
-		IPath newPath= RenameResourceChange.renamedResourcePath(pOld, newName);
-		
-		assertEquals(pNew.toString(), newPath.toString());
-	}
-	
-/************/
-	
-	public void test0(){
-		check("/s/p", "A.java", "B.java");
-	}
-	
-	public void test1(){
-		check("/s/p", "A.java", "A.java");
-	}		
-
-	public void test2(){
-		check("/s/p", "A.txt", "B.txt");
-	}		
-	
-	public void test3(){
-		check("/s/p", "A", "B");
-	}		
-	
-	public void test4(){
-		check("/s/p/p", "A.java", "B.java");
-	}
-	
-	public void test5(){
-		check("/s/p/p", "A.java", "A.java");
-	}		
-
-	public void test6(){
-		check("/s/p/p", "A.txt", "B.txt");
-	}		
-	
-	public void test7(){
-		check("/s", "A", "B.java");
-	}		
-	
-	public void test8(){
-		check("/s", "A.java", "B.java");
-	}
-	
-	public void test9(){
-		check("/s", "A.java", "A.java");
-	}		
-
-	public void test10(){
-		check("/s", "A.txt", "B.txt");
-	}		
-	
-	public void test11(){
-		check("/s", "A", "B");
-	}			
-	
-	public void test12(){
-		check("", "A.java", "B.java");
-	}
-	
-	public void test13(){
-		check("", "A.java", "A.java");
-	}		
-
-	public void test14(){
-		check("", "A.txt", "B.txt");
-	}		
-	
-	public void test15(){
-		check("", "A", "B");
-	}			
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PromoteTempToFieldTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PromoteTempToFieldTests.java
deleted file mode 100644
index 4e45ea9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PromoteTempToFieldTests.java
+++ /dev/null

@@ -1,554 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.jdt.internal.corext.refactoring.code.PromoteTempToFieldRefactoring;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class PromoteTempToFieldTests extends RefactoringTest{
-	
-	private static final Class clazz= PromoteTempToFieldTests.class;
-	private static final String REFACTORING_PATH= "PromoteTempToField/";
-    private Object fCompactPref;
-	
-	public PromoteTempToFieldTests(String name){
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		Hashtable options= JavaCore.getOptions();
-		
-		String setting= DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR;
-		fCompactPref= options.get(setting);
-		options.put(setting, DefaultCodeFormatterConstants.TRUE);
-		JavaCore.setOptions(options);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		Hashtable options= JavaCore.getOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, fCompactPref);
-		JavaCore.setOptions(options);	
-	}
-	
-	
-	
-	private String getSimpleTestFileName(boolean canRename, boolean input){
-		String fileName = "A_" + getName();
-		if (canRename)
-			fileName += input ? "_in": "_out";
-		return fileName + ".java"; 
-	}
-
-	private String getSimpleEnablementTestFileName(){
-		return "A_" + getName() + ".java"; 
-	}
-	
-	private String getTestFileName(boolean canRename, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += (canRename ? "canPromote/": "cannotPromote/");
-		return fileName + getSimpleTestFileName(canRename, input);
-	}
-	
-	private String getEnablementTestFileName(){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += "testEnablement/";
-		return fileName + getSimpleEnablementTestFileName();
-	}
-	
-	
-	//------------
-	protected final ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean canPromote, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(canPromote, input), getFileContents(getTestFileName(canPromote, input)));
-	}
-
-	protected final ICompilationUnit createCUfromEnablementTestFile(IPackageFragment pack) throws Exception {
-		return createCU(pack, getSimpleEnablementTestFileName(), getFileContents(getEnablementTestFileName()));
-	}
-	
-	private void passHelper(int startLine, int startColumn, int endLine, int endColumn, 
-						  String newName,
-						  boolean declareStatic,
-						  boolean declareFinal,
-						  int initializeIn,
-						  int accessModifier) throws Exception{
-						  	
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);						  	
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-        PromoteTempToFieldRefactoring ref= PromoteTempToFieldRefactoring.create(cu, selection.getOffset(), selection.getLength(), JavaPreferencesSettings.getCodeGenerationSettings());
-
-		RefactoringStatus activationResult= ref.checkInitialConditions(new NullProgressMonitor());	
-		assertTrue("activation was supposed to be successful", activationResult.isOK());
-
-        ref.setFieldName(newName);
-        ref.setDeclareFinal(declareFinal);
-        ref.setDeclareStatic(declareStatic);
-        ref.setInitializeIn(initializeIn);
-        ref.setVisibility(accessModifier);
-		
-		RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-		assertTrue("precondition was supposed to pass", checkInputResult.isOK());
-
-		performChange(ref, false);
-        		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		assertEqualLines("incorrect changes", getFileContents(getTestFileName(true, false)), newcu.getSource());
-	}
-
-	private void failHelper(int startLine, int startColumn, int endLine, int endColumn, 
-						  String newName,
-						  boolean declareStatic,
-						  boolean declareFinal,
-						  int initializeIn,
-						  int accessModifier,
-						  int expectedSeverity) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);						  	
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-        PromoteTempToFieldRefactoring ref= PromoteTempToFieldRefactoring.create(cu, selection.getOffset(), selection.getLength(), JavaPreferencesSettings.getCodeGenerationSettings());
-		
-		RefactoringStatus result= ref.checkInitialConditions(new NullProgressMonitor());	
-        ref.setFieldName(newName);
-        ref.setDeclareFinal(declareFinal);
-        ref.setDeclareStatic(declareStatic);
-        ref.setInitializeIn(initializeIn);
-        ref.setVisibility(accessModifier);
-		result.merge(ref.checkFinalConditions(new NullProgressMonitor()));
-		if (result.isOK())
-			result= null;
-		assertNotNull("precondition was supposed to fail",result);
-
-		assertEquals("incorrect severity:", expectedSeverity, result.getSeverity());
-	}
-
-	private void enablementHelper(int startLine, int startColumn, int endLine, int endColumn,
-						  String newName,
-						  boolean declareStatic,
-						  boolean declareFinal,
-						  int initializeIn,
-						  int accessModifier,
-						  boolean expectedCanEnableSettingFinal,
-						  boolean expectedCanEnableSettingStatic,
-						  boolean expectedCanEnableInitInField,
-						  boolean expectedCanEnableInitInMethod,
-  						  boolean expectedCanEnableInitInConstructors) throws Exception{
-		ICompilationUnit cu= createCUfromEnablementTestFile(getPackageP());
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-        PromoteTempToFieldRefactoring ref= PromoteTempToFieldRefactoring.create(cu, selection.getOffset(), selection.getLength(), JavaPreferencesSettings.getCodeGenerationSettings());
-		RefactoringStatus result= ref.checkInitialConditions(new NullProgressMonitor());
-		ref.setFieldName(newName);
-        ref.setDeclareFinal(declareFinal);
-        ref.setDeclareStatic(declareStatic);
-        ref.setInitializeIn(initializeIn);
-        ref.setVisibility(accessModifier);
-		
-		assertEquals("activation checking was supposed to pass", RefactoringStatus.OK, result.getSeverity());
-		
-		assertEquals("incorrect in-constructor enablement", expectedCanEnableInitInConstructors, 	ref.canEnableSettingDeclareInConstructors());
-		assertEquals("incorrect in-field enablement", 		expectedCanEnableInitInField, 			ref.canEnableSettingDeclareInFieldDeclaration());
-		assertEquals("incorrect in-method enablement", 		expectedCanEnableInitInMethod, 			ref.canEnableSettingDeclareInMethod());
-		assertEquals("incorrect static enablement", 		expectedCanEnableSettingStatic, 		ref.canEnableSettingStatic());
-		assertEquals("incorrect final enablement", 			expectedCanEnableSettingFinal, 			ref.canEnableSettingFinal());
-	}
-	private void enablementHelper1(int startLine, int startColumn, int endLine, int endColumn,
-						  boolean expectedCanEnableSettingFinal,
-						  boolean expectedCanEnableSettingStatic,
-						  boolean expectedCanEnableInitInField,
-						  boolean expectedCanEnableInitInMethod,
-  						  boolean expectedCanEnableInitInConstructors) throws Exception{
-  	   enablementHelper(startLine, startColumn, endLine, endColumn, "i", false, false, PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD, Modifier.PRIVATE, 
-  	   				expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}	
-
-	///---------------------- tests -------------------------//
-	
-	public void testEnablement0() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= true;
-        boolean expectedCanEnableInitInMethod			= true;
-        boolean expectedCanEnableInitInField			= true;
-        boolean expectedCanEnableSettingStatic			= true;
-        boolean expectedCanEnableSettingFinal			= true;
-        
-        String newName= "i";
-		boolean declareStatic = false;
-	  	boolean declareFinal= false;
-	  	int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD;
-	  	int accessModifier= Modifier.PRIVATE;
-        
-		enablementHelper(5, 13, 5, 14, newName, declareStatic, declareFinal, initializeIn, accessModifier,
-					expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-
-	public void testEnablement1() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= false;
-        boolean expectedCanEnableInitInMethod			= false;
-        boolean expectedCanEnableInitInField			= false;
-        boolean expectedCanEnableSettingStatic			= true;
-        boolean expectedCanEnableSettingFinal			= false;
-		enablementHelper1(5, 13, 5, 14, expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-	
-	public void testEnablement2() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= false;
-        boolean expectedCanEnableInitInMethod			= false;
-        boolean expectedCanEnableInitInField			= false;
-        boolean expectedCanEnableSettingStatic			= true;
-        boolean expectedCanEnableSettingFinal			= false;
-		enablementHelper1(5, 13, 5, 14, expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-	
-	public void testEnablement3() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= true;
-        boolean expectedCanEnableInitInMethod			= true;
-        boolean expectedCanEnableInitInField			= true;
-        boolean expectedCanEnableSettingStatic			= true;
-        boolean expectedCanEnableSettingFinal			= false;
-		enablementHelper1(5, 13, 5, 14, expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-	
-	public void testEnablement4() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= false;
-        boolean expectedCanEnableInitInMethod			= true;
-        boolean expectedCanEnableInitInField			= true;
-        boolean expectedCanEnableSettingStatic			= true;
-        boolean expectedCanEnableSettingFinal			= true;
-
-        String newName= "i";
-		boolean declareStatic = false;
-	  	boolean declareFinal= false;
-	  	int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD;
-	  	int accessModifier= Modifier.PRIVATE;
-
-		enablementHelper(5, 13, 5, 14, newName, declareStatic, declareFinal, initializeIn, accessModifier,
-					expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-	
-	public void testEnablement5() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= false;
-        boolean expectedCanEnableInitInMethod			= true;
-        boolean expectedCanEnableInitInField			= true;
-        boolean expectedCanEnableSettingStatic			= true;
-        boolean expectedCanEnableSettingFinal			= true;
-        
-        String newName= "i";
-		boolean declareStatic = false;
-	  	boolean declareFinal= false;
-	  	int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD;
-	  	int accessModifier= Modifier.PRIVATE;
-        
-		enablementHelper(7, 21, 7, 22, newName, declareStatic, declareFinal, initializeIn, accessModifier,
-					expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-	
-	public void testEnablement6() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= false;
-        boolean expectedCanEnableInitInMethod			= false;
-        boolean expectedCanEnableInitInField			= false;
-        boolean expectedCanEnableSettingStatic			= true;
-        boolean expectedCanEnableSettingFinal			= false;
-		enablementHelper1(7, 21, 7, 22, expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-	
-	public void testEnablement7() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= false;
-        boolean expectedCanEnableInitInMethod			= true;
-        boolean expectedCanEnableInitInField			= true;
-        boolean expectedCanEnableSettingStatic			= false;
-        boolean expectedCanEnableSettingFinal			= false;
-		enablementHelper1(5, 13, 5, 14, expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-
-	public void testEnablement8() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= true;
-        boolean expectedCanEnableInitInMethod			= true;
-        boolean expectedCanEnableInitInField			= true;
-        boolean expectedCanEnableSettingStatic			= false;
-        boolean expectedCanEnableSettingFinal			= true;
-        
-        String newName= "i";
-		boolean declareStatic = false;
-	  	boolean declareFinal= false;
-	  	int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR;
-	  	int accessModifier= Modifier.PRIVATE;
-        
-		enablementHelper(4, 13, 4, 14, newName, declareStatic, declareFinal, initializeIn, accessModifier,
-					expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-
-	public void testEnablement9() throws Exception{
-        boolean expectedCanEnableInitInConstructors	= false;
-        boolean expectedCanEnableInitInMethod			= true;
-        boolean expectedCanEnableInitInField			= true;
-        boolean expectedCanEnableSettingStatic			= true;
-        boolean expectedCanEnableSettingFinal			= false;
-        
-        String newName= "i";
-		boolean declareStatic = true;
-	  	boolean declareFinal= false;
-	  	int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-	  	int accessModifier= Modifier.PRIVATE;
-        
-		enablementHelper(4, 13, 4, 14, newName, declareStatic, declareFinal, initializeIn, accessModifier,
-					expectedCanEnableSettingFinal, expectedCanEnableSettingStatic, expectedCanEnableInitInField, expectedCanEnableInitInMethod, expectedCanEnableInitInConstructors);
-	}
-	
-	///---- test failing preconditions --------------
-	
-	public void testFail0() throws Exception{
-		failHelper(3, 16, 3, 17, "i", false, false, PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD, Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-
-	public void testFail1() throws Exception{
-		failHelper(5, 28, 5, 29, "i", false, false, PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD, Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-
-	public void testFail2() throws Exception{
-		failHelper(5, 15, 5, 16, "i", false, false, PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD, Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-
-	public void testFail3() throws Exception{
-		failHelper(5, 16, 5, 17, "i", false, false, PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR, Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-
-	public void testFail4() throws Exception{
-		failHelper(7, 13, 7, 14, "i", false, false, PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR, Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-
-	public void testFail5() throws Exception{
-		failHelper(6, 13, 6, 14, "i", false, false, PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD, Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-
-	public void testFail6() throws Exception{
-		failHelper(4, 18, 4, 19, "i", false, false, PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR, Modifier.PRIVATE, RefactoringStatus.FATAL);
-	}
-	
-	///----------- tests of transformation ------------
-
-	public void test0() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(5, 13, 5, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test1() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(5, 13, 5, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test2() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(7, 13, 7, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test3() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(9, 13, 9, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test4() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(5, 13, 5, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test5() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(6, 21, 6, 22, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test6() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(6, 21, 6, 22, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test7() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(4, 13, 4, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test8() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(4, 13, 4, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test9() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(5, 13, 5, 14, "field", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test10() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR;
-        boolean declareFinal= true;
-        boolean declareStatic= false;
-		passHelper(7, 13, 7, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test11() throws Exception{
-        int accessModifier= Modifier.PUBLIC;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(7, 13, 7, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test12() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= true;
-		passHelper(5, 13, 5, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test13() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= true;
-		passHelper(5, 13, 5, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test14() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= true;
-		passHelper(5, 19, 5, 20, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test15() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= true;
-		passHelper(5, 19, 5, 20, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test16() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(10, 13, 10, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test17() throws Exception{
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(4, 13, 4, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test18() throws Exception{
-		//printTestDisabledMessage("regression test for bug 39363");
-		if (true) return;
-		int accessModifier= Modifier.PRIVATE;
-		int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_CONSTRUCTOR;
-		boolean declareFinal= false;
-		boolean declareStatic= false;
-		passHelper(5, 13, 5, 14, "i", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test19() throws Exception{ //test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=49840
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(4, 13, 4, 22, "fSomeArray", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-
-	public void test20() throws Exception{ //test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=49840
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_METHOD;
-        boolean declareFinal= false;
-        boolean declareStatic= false;
-		passHelper(4, 24, 4, 24, "fDoubleDim", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test21() throws Exception{ //test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=47798
-        int accessModifier= Modifier.PRIVATE;
-        int initializeIn= PromoteTempToFieldRefactoring.INITIALIZE_IN_FIELD;
-        boolean declareFinal= true;
-        boolean declareStatic= true;
-		passHelper(4, 17, 4, 18, "fgX", declareStatic, declareFinal, initializeIn, accessModifier);
-	}
-	
-	public void test22() throws Exception{ //test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=54444
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);						  	
-		ISourceRange selection= TextRangeUtil.getSelection(cu, 4, 34, 4, 37);
-        PromoteTempToFieldRefactoring ref= PromoteTempToFieldRefactoring.create(cu, selection.getOffset(), selection.getLength(), JavaPreferencesSettings.getCodeGenerationSettings());
-		ref.checkInitialConditions(new NullProgressMonitor());
-        assertEquals("sortByDefiningTypeAction", ref.getFieldName());
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java
deleted file mode 100644
index 3912d34..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java
+++ /dev/null

@@ -1,1701 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.refactoring.structure.PullUpRefactoring;
-import org.eclipse.jdt.internal.corext.refactoring.util.JavaElementUtil;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class PullUpTests extends RefactoringTest {
-
-	private static final Class clazz= PullUpTests.class;
-	
-	private static final String REFACTORING_PATH= "PullUp/";
-
-	public PullUpTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new Java15Setup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new Java15Setup(someTest);
-	}	
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	//-------------------
-	
-	private static PullUpRefactoring createRefactoring(IMember[] methods) throws JavaModelException{
-		return PullUpRefactoring.create(methods, JavaPreferencesSettings.getCodeGenerationSettings());
-	}
-	
-	private void fieldMethodHelper1(String[] fieldNames, String[] methodNames, String[][] signatures, boolean deleteAllInSourceType, boolean deleteAllMatchingMethods) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType type= getType(cu, "B");
-			IField[] fields= getFields(type, fieldNames);
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-
-			PullUpRefactoring ref= createRefactoring(merge(methods, fields));
-//			assertTrue("preactivation", ref.checkPreactivation().isOK());
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setSuperclassAsTargetClass(ref);
-
-			if (deleteAllInSourceType)
-				ref.setMethodsToDelete(methods);
-			if (deleteAllMatchingMethods)
-				ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-								
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to pass", checkInputResult.isOK());	
-			performChange(ref, false);
-			
-			String expected= getFileContents(getOutputTestFileName("A"));
-			String actual= cu.getSource();
-			assertEqualLines(expected, actual);
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-
-	private IType[] getPossibleTargetClasses(PullUpRefactoring ref) throws JavaModelException{
-		return ref.getPossibleTargetClasses(new NullProgressMonitor());
-	}
-	
-	private void setSuperclassAsTargetClass(PullUpRefactoring ref) throws JavaModelException {
-		IType[] possibleClasses= getPossibleTargetClasses(ref);
-		ref.setTargetClass(possibleClasses[possibleClasses.length - 1]);
-	}
-	
-	private void setTargetClass(PullUpRefactoring ref, int targetClassIndex) throws JavaModelException{
-		IType[] possibleClasses= getPossibleTargetClasses(ref);
-		ref.setTargetClass(getPossibleTargetClasses(ref)[possibleClasses.length - 1 - targetClassIndex]);
-	}
-	
-	private void addRequiredMembersHelper(String[] fieldNames, String[] methodNames, String[][] methodSignatures, String[] expectedFieldNames, String[] expectedMethodNames, String[][] expectedMethodSignatures) throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType type= getType(cu, "B");
-			IField[] fields= getFields(type, fieldNames);
-			IMethod[] methods= getMethods(type, methodNames, methodSignatures);
-
-			IMember[] members= merge(methods, fields);
-			PullUpRefactoring ref= createRefactoring(members);
-//			assertTrue("preactivation", ref.checkPreactivation().isOK());
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setSuperclassAsTargetClass(ref);
-
-			List  additionalRequired= Arrays.asList(ref.getAdditionalRequiredMembersToPullUp(new NullProgressMonitor()));
-			List required= new ArrayList();
-			required.addAll(additionalRequired);
-			required.addAll(Arrays.asList(members));
-			IField[] expectedFields= getFields(type, expectedFieldNames);
-			IMethod[] expectedMethods= getMethods(type, expectedMethodNames, expectedMethodSignatures);
-			List expected= Arrays.asList(merge(expectedFields, expectedMethods));
-			assertEquals("incorrect size", expected.size(), required.size());
-			for (Iterator iter= expected.iterator(); iter.hasNext();) {
-				Object each= iter.next();
-				assertTrue ("required does not contain " + each, required.contains(each));
-			}
-			for (Iterator iter= required.iterator(); iter.hasNext();) {
-				Object each= iter.next();
-				assertTrue ("expected does not contain " + each, expected.contains(each));
-			}
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-
-	private void fieldHelper1(String[] fieldNames, int targetClassIndex) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType type= getType(cu, "B");
-			IField[] fields= getFields(type, fieldNames);
-			
-			PullUpRefactoring ref= createRefactoring(fields);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setTargetClass(ref, targetClassIndex);
-		
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to pass", checkInputResult.isOK());	
-			performChange(ref, false);
-			
-			String expected= getFileContents(getOutputTestFileName("A"));
-			String actual= cu.getSource();
-			assertEqualLines(expected, actual);
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-	
-	private void fieldHelper2(String[] fieldNames, int targetClassIndex) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType type= getType(cu, "B");
-			IField[] fields= getFields(type, fieldNames);
-			PullUpRefactoring ref= createRefactoring(fields);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setTargetClass(ref, targetClassIndex);
-
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to fail", ! checkInputResult.isOK());	
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}		
-	}
-	
-	private static IMethod[] getMethods(IMember[] members){
-		List l= Arrays.asList(JavaElementUtil.getElementsOfType(members, IJavaElement.METHOD));
-		return (IMethod[]) l.toArray(new IMethod[l.size()]);
-	}
-
-	private PullUpRefactoring createRefactoringPrepareForInputCheck(String[] selectedMethodNames, String[][] selectedMethodSignatures, 
-						String[] selectedFieldNames, 
-						String[] selectedTypeNames, String[] namesOfMethodsToPullUp, 
-						String[][] signaturesOfMethodsToPullUp, 
-						String[] namesOfFieldsToPullUp, String[] namesOfTypesToPullUp, 
-						String[] namesOfMethodsToDeclareAbstract, String[][] signaturesOfMethodsToDeclareAbstract, 
-						boolean deleteAllPulledUpMethods, boolean deleteAllMatchingMethods, int targetClassIndex, ICompilationUnit cu) throws CoreException {
-		IType type= getType(cu, "B");
-		IMethod[] selectedMethods= getMethods(type, selectedMethodNames, selectedMethodSignatures);
-		IField[] selectedFields= getFields(type, selectedFieldNames);
-		IType[] selectedTypes= getMemberTypes(type, selectedTypeNames);
-		IMember[] selectedMembers= merge(selectedFields, selectedMethods, selectedTypes);
-		
-		PullUpRefactoring ref= createRefactoring(selectedMembers);
-//		assertTrue("preactivation", ref.checkPreactivation().isOK());
-		assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-		
-		setTargetClass(ref, targetClassIndex);
-		
-		IMethod[] methodsToPullUp= findMethods(selectedMethods, namesOfMethodsToPullUp, signaturesOfMethodsToPullUp);
-		IField[] fieldsToPullUp= findFields(selectedFields, namesOfFieldsToPullUp);
-		IType[] typesToPullUp= findTypes(selectedTypes, namesOfTypesToPullUp);
-		IMember[] membersToPullUp= merge(methodsToPullUp, fieldsToPullUp, typesToPullUp);
-		
-		IMethod[] methodsToDeclareAbstract= findMethods(selectedMethods, namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract);
-		ref.setMembersToMove(membersToPullUp);
-		ref.setMethodsToDeclareAbstract(methodsToDeclareAbstract);
-		if (deleteAllPulledUpMethods && methodsToPullUp.length != 0)
-			ref.setMethodsToDelete(methodsToPullUp);
-		if (deleteAllMatchingMethods && methodsToPullUp.length != 0)
-			ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		return ref;
-	}
-	
-	private void declareAbstractFailHelper(String[] selectedMethodNames, String[][] selectedMethodSignatures,
-											String[] selectedFieldNames,
-											String[] selectedTypeNames, String[] namesOfMethodsToPullUp, 
-											String[][] signaturesOfMethodsToPullUp, String[] namesOfFieldsToPullUp, 
-											String[] namesOfMethodsToDeclareAbstract,
-											String[][] signaturesOfMethodsToDeclareAbstract, String[] namesOfTypesToPullUp,
-											boolean deleteAllPulledUpMethods, boolean deleteAllMatchingMethods, int targetClassIndex) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			PullUpRefactoring ref= createRefactoringPrepareForInputCheck(selectedMethodNames, selectedMethodSignatures, selectedFieldNames, selectedTypeNames, namesOfMethodsToPullUp, signaturesOfMethodsToPullUp, namesOfFieldsToPullUp, namesOfTypesToPullUp, namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, deleteAllPulledUpMethods, deleteAllMatchingMethods, targetClassIndex, cu);
-
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to fail", ! checkInputResult.isOK());	
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-
-	private void declareAbstractHelper(String[] selectedMethodNames, String[][] selectedMethodSignatures,
-											String[] selectedFieldNames,
-											String[] selectedTypeNames, String[] namesOfMethodsToPullUp, 
-											String[][] signaturesOfMethodsToPullUp, String[] namesOfFieldsToPullUp, 
-											String[] namesOfMethodsToDeclareAbstract,
-											String[][] signaturesOfMethodsToDeclareAbstract, String[] namesOfTypesToPullUp,
-											boolean deleteAllPulledUpMethods, boolean deleteAllMatchingMethods, int targetClassIndex) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			PullUpRefactoring ref= createRefactoringPrepareForInputCheck(selectedMethodNames, selectedMethodSignatures, selectedFieldNames, selectedTypeNames, namesOfMethodsToPullUp, signaturesOfMethodsToPullUp, namesOfFieldsToPullUp, namesOfTypesToPullUp, namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, deleteAllPulledUpMethods, deleteAllMatchingMethods, targetClassIndex, cu);
-
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to pass", checkInputResult.isOK());	
-			performChange(ref, false);
-
-			String expected= getFileContents(getOutputTestFileName("A"));
-			String actual= cu.getSource();
-			assertEqualLines(expected, actual);
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-
-	private void helper1(String[] methodNames, String[][] signatures, boolean deleteAllInSourceType, boolean deleteAllMatchingMethods, int targetClassIndex) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType type= getType(cu, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-
-			setTargetClass(ref, targetClassIndex);
-			if (deleteAllInSourceType)
-				ref.setMethodsToDelete(methods);
-			if (deleteAllMatchingMethods)
-				ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to pass", checkInputResult.isOK());	
-			performChange(ref, false);
-			
-			String expected= getFileContents(getOutputTestFileName("A"));
-			String actual= cu.getSource();
-			assertEqualLines(expected, actual);
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-	
-	private void helper2(String[] methodNames, String[][] signatures, boolean deleteAllInSourceType, boolean deleteAllMatchingMethods, int targetClassIndex) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType type= getType(cu, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setTargetClass(ref, targetClassIndex);
-			if (deleteAllInSourceType)
-				ref.setMethodsToDelete(methods);
-			if (deleteAllMatchingMethods)
-				ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to fail", ! checkInputResult.isOK());	
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}		
-	}
-	
-	private void helper3(String[] methodNames, String[][] signatures, boolean deleteAllInSourceType, boolean deleteAllMatchingMethods, int targetClassIndex, boolean shouldActivationCheckPass) throws Exception {
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-		try{
-			IType type= getType(cuB, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-//			assertTrue("preactivation", ref.checkPreactivation().isOK());
-			assertEquals("activation", shouldActivationCheckPass, ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			if (! shouldActivationCheckPass)
-				return;
-			setTargetClass(ref, targetClassIndex);			
-			if (deleteAllInSourceType)
-				ref.setMethodsToDelete(methods);
-			if (deleteAllMatchingMethods)
-				ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to fail", ! checkInputResult.isOK());	
-		} finally{
-			performDummySearch();
-			cuA.delete(false, null);
-			cuB.delete(false, null);
-		}				
-	}
-	
-	//------------------ tests -------------
-	
-	public void test0() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void test1() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void test2() throws Exception{
-		helper1(new String[]{"mmm", "n"}, new String[][]{new String[0], new String[0]}, true, false, 0);
-	}
-
-	public void test3() throws Exception{
-		helper1(new String[]{"mmm", "n"}, new String[][]{new String[0], new String[0]}, true, true, 0);
-	}
-
-	public void test4() throws Exception{
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-		
-		try{
-			String[] methodNames= new String[]{"m"};
-			String[][] signatures= new String[][]{new String[]{"QList;"}};
-			
-			IType type= getType(cuB, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setSuperclassAsTargetClass(ref);
-
-			ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		
-			RefactoringStatus result= performRefactoring(ref);
-			assertEquals("precondition was supposed to pass", null, result);
-			
-			assertEqualLines("A", cuA.getSource(), getFileContents(getOutputTestFileName("A")));
-			assertEqualLines("B", cuB.getSource(), getFileContents(getOutputTestFileName("B")));
-		} finally{
-			performDummySearch();
-			cuA.delete(false, null);
-			cuB.delete(false, null);
-		}					
-	}
-
-	public void test5() throws Exception{
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-		
-		try{
-			String[] methodNames= new String[]{"m"};
-			String[][] signatures= new String[][]{new String[0]};
-			
-			IType type= getType(cuB, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setSuperclassAsTargetClass(ref);
-
-			ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		
-			RefactoringStatus result= performRefactoring(ref);
-			assertEquals("precondition was supposed to pass", null, result);
-			
-			assertEqualLines("A", cuA.getSource(), getFileContents(getOutputTestFileName("A")));
-			assertEqualLines("B", cuB.getSource(), getFileContents(getOutputTestFileName("B")));
-		} finally{
-			performDummySearch();
-			cuA.delete(false, null);
-			cuB.delete(false, null);
-		}		
-	}
-
-	public void test6() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void test7() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void test8() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void test9() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void test10() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void test11() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void test12() throws Exception{
-		//printTestDisabledMessage("bug#6779 searchDeclarationsOfReferencedTyped - missing exception  types");
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-
-		try{
-			String[] methodNames= new String[]{"m"};
-			String[][] signatures= new String[][]{new String[0]};
-			
-			IType type= getType(cuB, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setSuperclassAsTargetClass(ref);
-			ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		
-			RefactoringStatus result= performRefactoring(ref);
-			assertEquals("precondition was supposed to pass", null, result);
-			
-			assertEqualLines("A", cuA.getSource(), getFileContents(getOutputTestFileName("A")));
-			assertEqualLines("B", cuB.getSource(), getFileContents(getOutputTestFileName("B")));
-		} finally{
-			performDummySearch();
-			cuA.delete(false, null);
-			cuB.delete(false, null);
-		}							
-	}
-	
-	public void test13() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void test14() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void test15() throws Exception{
-		printTestDisabledMessage("must fix - incorrect error");
-//		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false);
-	}
-	
-	public void test16() throws Exception{
-		printTestDisabledMessage("must fix - incorrect error");
-//		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false);
-	}
-	
-	public void test17() throws Exception{
-		printTestDisabledMessage("must fix - incorrect error with static method access");
-//		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false);
-	}
-
-	public void test18() throws Exception{
-		printTestDisabledMessage("must fix - incorrect error with static field access");
-//		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false);
-	}
-	
-	public void test19() throws Exception{
-//		printTestDisabledMessage("bug 18438");
-//		printTestDisabledMessage("bug 23324 ");
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void test20() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 1);
-	}
-
-	public void test21() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 1);
-	}
-
-	public void test22() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void test23() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void test24() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void test25() throws Exception{
-//		printTestDisabledMessage("bug in ASTRewrite - extra dimentions 29553");
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void test26() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test27() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-	
-	public void test28() throws Exception{
-//		printTestDisabledMessage("unimplemented (increase method visibility if declare abstract in superclass)");
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test29() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[]{"[I"}};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-	
-	public void test30() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[]{"[I"}};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-	
-	public void test31() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[]{"[I"}};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test32() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-	
-	public void test33() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= selectedMethodNames;
-		String[][] signaturesOfMethodsToPullUp= selectedMethodSignatures;
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {new String[0]};
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test34() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test35() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test36() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test37() throws Exception{
-		String[] selectedMethodNames= {"m", "f"};
-		String[][] selectedMethodSignatures= {new String[0], new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {"m"};
-		String[][] signaturesOfMethodsToPullUp= {new String[0]};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= {"f"};
-		String[][] signaturesOfMethodsToDeclareAbstract= {new String[0]};
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test38() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {"A"};
-		String[] namesOfMethodsToPullUp= {"m"};
-		String[][] signaturesOfMethodsToPullUp= {new String[0]};
-		String[] namesOfFieldsToPullUp= {"A"};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void test39() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {"A"};
-		String[] selectedTypeNames= {"X", "Y"};
-		String[] namesOfMethodsToPullUp= {"m"};
-		String[][] signaturesOfMethodsToPullUp= {new String[0]};
-		String[] namesOfFieldsToPullUp= {"A"};
-		String[] namesOfTypesToPullUp= {"X", "Y"};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-
-	public void test40() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] selectedTypeNames= {};
-		String[] namesOfMethodsToPullUp= {"m"};
-		String[][] signaturesOfMethodsToPullUp= {new String[0]};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfTypesToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-
-	public void test41() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"i"};
-		String[] selectedTypeNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {"i"};
-		String[] namesOfTypesToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-
-	public void test42() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"i", "j"};
-		String[] selectedTypeNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {"i", "j"};
-		String[] namesOfTypesToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-
-	public void test43() throws Exception{
-//		printTestDisabledMessage("bug 35562 Method pull up wrongly indents javadoc comment [refactoring]");
-		
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] selectedTypeNames= {};
-		String[] namesOfMethodsToPullUp= selectedMethodNames;
-		String[][] signaturesOfMethodsToPullUp= selectedMethodSignatures;
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfTypesToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		declareAbstractHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-
-	public void testFail0() throws Exception{
-//		printTestDisabledMessage("6538: searchDeclarationsOf* incorrect");
-		helper2(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void testFail1() throws Exception{
-		printTestDisabledMessage("overloading - current limitation");
-//		helper2(new String[]{"m"}, new String[][]{new String[0]}, true, false);
-	}
-	
-	public void testFail2() throws Exception{
-//		printTestDisabledMessage("6538: searchDeclarationsOf* incorrect");
-		helper2(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testFail3() throws Exception{
-//		printTestDisabledMessage("6538: searchDeclarationsOf* incorrect");
-		helper2(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testFail4() throws Exception{
-//		printTestDisabledMessage("6538: searchDeclarationsOf* incorrect");
-		helper2(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testFail5() throws Exception{
-		helper2(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-	
-	public void testFail6() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		
-		helper3(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 0, true);
-	}
-	
-	public void testFail7() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper3(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 0, false);
-	}
-	
-	public void testFail8() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper3(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 0, true);
-	}
-	
-	public void testFail9() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper3(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 0, true);
-	}
-	
-	public void testFail10() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper3(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 0, false);
-	}
-
-	public void testFail11() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper3(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 0, true);
-	}
-
-	public void testFail12() throws Exception{
-		printTestDisabledMessage("overloading - current limitation");
-//		String[] methodNames= new String[]{"m"};
-//		String[][] signatures= new String[][]{new String[0]};
-//		boolean deleteAllInSourceType= true;
-//		boolean deleteAllMatchingMethods= false;
-//		helper3(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods);
-	}
-
-	public void testFail13() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper2(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 0);
-	}
-	
-	public void testFail14() throws Exception{
-		//removed - this (pulling up classes) is allowed now
-				
-//		String[] methodNames= new String[]{"m"};
-//		String[][] signatures= new String[][]{new String[0]};
-//		boolean deleteAllInSourceType= true;
-//		boolean deleteAllMatchingMethods= false;
-//		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-//		try{
-//			IType type= getType(cu, "A");
-//			IMethod[] methods= getMethods(type, methodNames, signatures);
-//			IMember[] members= merge(methods, new IMember[]{type.getType("Quux")});
-//
-//			PullUpRefactoring ref= createRefactoring(members);
-//			assertTrue("preactivation", ref.checkPreactivation().isOK());
-//			assertTrue("activation", ref.checkActivation(new NullProgressMonitor()).isOK());
-//			setSuperclassAsTargetClass(ref);
-//			if (deleteAllInSourceType)
-//				ref.setMethodsToDelete(methods);
-//			if (deleteAllMatchingMethods)
-//				ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-//		
-//			RefactoringStatus result= performRefactoring(ref);
-//
-//			assertTrue("precondition was supposed to fail", result != null && ! result.isOK());
-//		} finally{
-//			performDummySearch();
-//			cu.delete(false, null);
-//		}		
-	}
-	
-	public void testFail15() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper2(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 1);
-	}
-
-	public void testFail16() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper2(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 1);
-	}
-
-	public void testFail17() throws Exception{
-		printTestDisabledMessage("unimplemented test - see bug 29522");
-//		String[] methodNames= new String[]{"m"};
-//		String[][] signatures= new String[][]{new String[0]};
-//		boolean deleteAllInSourceType= true;
-//		boolean deleteAllMatchingMethods= false;
-//		helper2(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 1);
-	}
-
-	public void testFail18() throws Exception{
-		printTestDisabledMessage("unimplemented test - see bug 29522");
-//		String[] methodNames= new String[]{"m"};
-//		String[][] signatures= new String[][]{new String[0]};
-//		boolean deleteAllInSourceType= true;
-//		boolean deleteAllMatchingMethods= false;
-//		helper2(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 0);
-	}
-
-	public void testFail19() throws Exception{
-		String[] methodNames= new String[]{"m"};
-		String[][] signatures= new String[][]{new String[0]};
-		boolean deleteAllInSourceType= true;
-		boolean deleteAllMatchingMethods= false;
-		helper2(methodNames, signatures, deleteAllInSourceType, deleteAllMatchingMethods, 1);
-	}
-
-	public void testFail20() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void testFail21() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void testFail22() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void testFail23() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void testFail24() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								new String[0], namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, new String[0], true, true, 0);
-	}
-
-	public void testFail25() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {};
-		String[] selectedTypeNames= {"Test"};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfTypesToPullUp= {"Test"};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-
-	public void testFail26() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {};
-		String[] selectedTypeNames= {"Test"};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfTypesToPullUp= {"Test"};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-
-	public void testFail27() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {};
-		String[] selectedTypeNames= {"A"};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfTypesToPullUp= {"A"};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-
-	public void testFail28() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {};
-		String[] selectedTypeNames= {"Test"};
-		String[] namesOfMethodsToPullUp= {};
-		String[][] signaturesOfMethodsToPullUp= {};
-		String[] namesOfFieldsToPullUp= {};
-		String[] namesOfTypesToPullUp= {"Test"};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		declareAbstractFailHelper(selectedMethodNames, selectedMethodSignatures, 
-								selectedFieldNames,	
-								selectedTypeNames, namesOfMethodsToPullUp, 
-								signaturesOfMethodsToPullUp, 
-								namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, 
-								signaturesOfMethodsToDeclareAbstract, namesOfTypesToPullUp, true, true, 0);
-	}
-	
-	public void testFail29() throws Exception {
-		helper2(new String[] {"stop"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	//----------------------------------------------------------
-	public void testField0() throws Exception{
-		fieldHelper1(new String[]{"i"}, 0);
-	}
-	
-	public void testFieldFail0() throws Exception{
-		fieldHelper2(new String[]{"x"}, 0);
-	}
-	
-	public void testFieldFail1() throws Exception{
-		fieldHelper2(new String[]{"x"}, 0);
-	}
-
-	public void testFieldFail2() throws Exception{
-		fieldHelper2(new String[]{"f"}, 1);
-	}
-
-	//---------------------------------------------------------
-	public void testFieldMethod0() throws Exception{
-//		printTestDisabledMessage("bug 23324 ");
-		fieldMethodHelper1(new String[]{"f"}, new String[]{"m"}, new String[][]{new String[0]}, true, false);
-	}
-	
-	//----
-	public void testAddingRequiredMembers0() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers1() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers2() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers3() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"m", "y"};
-		String[][] expectedMethodSignatures= {new String[0], new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers4() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"m", "y"};
-		String[][] expectedMethodSignatures= {new String[0], new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers5() throws Exception{
-		String[] fieldNames= {"y"};
-		String[] methodNames= {};
-		String[][] methodSignatures= {};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"m"};
-		String[][] expectedMethodSignatures= {new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers6() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers7() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers8() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"m", "foo"};
-		String[][] expectedMethodSignatures= {new String[0], new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers9() throws Exception{
-		String[] fieldNames= {"m"};
-		String[] methodNames= {};
-		String[][] methodSignatures= {};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers10() throws Exception{
-		String[] fieldNames= {"m"};
-		String[] methodNames= {};
-		String[][] methodSignatures= {};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"foo"};
-		String[][] expectedMethodSignatures= {new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers11() throws Exception{
-		String[] fieldNames= {"m"};
-		String[] methodNames= {};
-		String[][] methodSignatures= {};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"foo"};
-		String[][] expectedMethodSignatures= {new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers12() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"foo", "m"};
-		String[][] expectedMethodSignatures= {new String[0], new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-	
-	public void testEnablement0() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement1() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IType typeD= cu.getType("D");
-		IMember[] members= {typeB, typeD};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement2() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement3() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement4() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement5() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement6() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement7() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement8() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement9() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement10() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement11() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement12() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement13() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IType typeD= cu.getType("D");
-		IMember[] members= {typeB, typeD};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement14() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IType typeD= cu.getType("D");
-		IMember[] members= {typeB, typeD};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement15() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IType typeD= cu.getType("D");
-		IMember[] members= {typeB, typeD};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement16() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IType typeD= cu.getType("D");
-		IMember[] members= {typeB, typeD};
-		assertTrue("should be disabled", ! PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement17() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement18() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement19() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement20() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement21() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement22() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement23() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement24() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be enabled", PullUpRefactoring.isAvailable(members));
-	}
-
-	//------------------ tests -------------
-	
-	public void testGenerics0() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics1() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics2() throws Exception{
-		helper1(new String[]{"mmm", "n"}, new String[][]{new String[] {"QT;"}, new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics3() throws Exception{
-		helper1(new String[]{"mmm", "n"}, new String[][]{new String[] {"QT;"}, new String[0]}, true, true, 0);
-	}
-
-	public void testGenerics4() throws Exception{
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-		
-		try{
-			String[] methodNames= new String[]{"m"};
-			String[][] signatures= new String[][]{new String[]{"QList<QT;>;"}};
-			
-			IType type= getType(cuB, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setSuperclassAsTargetClass(ref);
-	
-			ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		
-			RefactoringStatus result= performRefactoring(ref);
-			assertEquals("precondition was supposed to pass", null, result);
-			
-			assertEqualLines("A", cuA.getSource(), getFileContents(getOutputTestFileName("A")));
-			assertEqualLines("B", cuB.getSource(), getFileContents(getOutputTestFileName("B")));
-		} finally{
-			performDummySearch();
-			cuA.delete(false, null);
-			cuB.delete(false, null);
-		}					
-	}
-
-	public void testGenerics5() throws Exception{
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-		
-		try{
-			String[] methodNames= new String[]{"m"};
-			String[][] signatures= new String[][]{new String[] {"QS;"}};
-			
-			IType type= getType(cuB, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setSuperclassAsTargetClass(ref);
-	
-			ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		
-			RefactoringStatus result= performRefactoring(ref);
-			assertEquals("precondition was supposed to pass", null, result);
-			
-			assertEqualLines("A", cuA.getSource(), getFileContents(getOutputTestFileName("A")));
-			assertEqualLines("B", cuB.getSource(), getFileContents(getOutputTestFileName("B")));
-		} finally{
-			performDummySearch();
-			cuA.delete(false, null);
-			cuB.delete(false, null);
-		}		
-	}
-
-	public void testGenerics6() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics7() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics8() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics9() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics10() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics11() throws Exception{
-		helper1(new String[]{"m"}, new String[][]{new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics12() throws Exception{
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-	
-		try{
-			String[] methodNames= new String[]{"m"};
-			String[][] signatures= new String[][]{new String[]{"QT;"}};
-			
-			IType type= getType(cuB, "B");
-			IMethod[] methods= getMethods(type, methodNames, signatures);
-			PullUpRefactoring ref= createRefactoring(methods);
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-			setSuperclassAsTargetClass(ref);
-			ref.setMethodsToDelete(getMethods(ref.getMatchingElements(new NullProgressMonitor(), false)));
-		
-			RefactoringStatus result= performRefactoring(ref);
-			assertEquals("precondition was supposed to pass", null, result);
-			
-			assertEqualLines("A", cuA.getSource(), getFileContents(getOutputTestFileName("A")));
-			assertEqualLines("B", cuB.getSource(), getFileContents(getOutputTestFileName("B")));
-		} finally{
-			performDummySearch();
-			cuA.delete(false, null);
-			cuB.delete(false, null);
-		}							
-	}
-
-	public void testGenerics13() throws Exception {
-		helper1(new String[] { "m"}, new String[][] { new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics14() throws Exception {
-		helper1(new String[] { "m"}, new String[][] { new String[0]}, true, false, 0);
-	}
-
-	public void testGenerics15() throws Exception {
-		helper1(new String[] { "m"}, new String[][] { new String[0]}, true, false, 0);
-	}
-
-	public void testGenericsFail0() throws Exception {
-		helper2(new String[] { "m"}, new String[][] { new String[] {"QT;"}}, true, false, 0);
-	}
-
-	public void testGenericsFail1() throws Exception {
-		helper2(new String[] { "m"}, new String[][] { new String[]{"QS;"}}, true, false, 0);
-	}
-
-	public void testGenericsFail2() throws Exception {
-		helper2(new String[] { "m"}, new String[][] { new String[]{"QT;"}}, true, false, 0);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java
deleted file mode 100644
index 5da5884..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java
+++ /dev/null

@@ -1,1567 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.refactoring.structure.PushDownRefactoring;
-import org.eclipse.jdt.internal.corext.refactoring.structure.PushDownRefactoring.MemberActionInfo;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class PushDownTests extends RefactoringTest {
-
-	private static final Class clazz= PushDownTests.class;
-	
-	private static final String REFACTORING_PATH= "PushDown/";
-
-	public PushDownTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new Java15Setup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new Java15Setup(someTest);
-	}	
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	private static PushDownRefactoring createRefactoring(IMember[] members) throws JavaModelException{
-		return PushDownRefactoring.create(members, JavaPreferencesSettings.getCodeGenerationSettings());
-	}
-
-	private PushDownRefactoring createRefactoringPrepareForInputCheck(String[] selectedMethodNames, String[][] selectedMethodSignatures, 
-						String[] selectedFieldNames, 
-						String[] namesOfMethodsToPullUp, String[][] signaturesOfMethodsToPullUp, 
-						String[] namesOfFieldsToPullUp, 
-						String[] namesOfMethodsToDeclareAbstract, String[][] signaturesOfMethodsToDeclareAbstract,
-						ICompilationUnit cu) throws CoreException {
-							
-		IType type= getType(cu, "A");
-		IMethod[] selectedMethods= getMethods(type, selectedMethodNames, selectedMethodSignatures);
-		IField[] selectedFields= getFields(type, selectedFieldNames);
-		IMember[] selectedMembers= merge(selectedFields, selectedMethods);
-		
-		PushDownRefactoring ref= createRefactoring(selectedMembers);
-//		assertTrue("preactivation", ref.checkPreactivation().isOK());
-		assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-		
-		prepareForInputCheck(ref, selectedMethods, selectedFields, namesOfMethodsToPullUp, signaturesOfMethodsToPullUp, namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract);
-		return ref;
-	}
-
-	private void prepareForInputCheck(PushDownRefactoring ref, IMethod[] selectedMethods, IField[] selectedFields, String[] namesOfMethodsToPullUp, String[][] signaturesOfMethodsToPullUp, String[] namesOfFieldsToPullUp, String[] namesOfMethodsToDeclareAbstract, String[][] signaturesOfMethodsToDeclareAbstract) {
-		IMethod[] methodsToPushDown= findMethods(selectedMethods, namesOfMethodsToPullUp, signaturesOfMethodsToPullUp);
-		IField[] fieldsToPushDown= findFields(selectedFields, namesOfFieldsToPullUp);
-		List membersToPushDown= Arrays.asList(merge(methodsToPushDown, fieldsToPushDown));
-		List methodsToDeclareAbstract= Arrays.asList(findMethods(selectedMethods, namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract));
-		
-		PushDownRefactoring.MemberActionInfo[] infos= ref.getMemberActionInfos();
-		for (int i= 0; i < infos.length; i++) {
-			if (membersToPushDown.contains(infos[i].getMember())){
-				infos[i].setAction(MemberActionInfo.PUSH_DOWN_ACTION);
-				assertTrue(! methodsToDeclareAbstract.contains(infos[i].getMember()));
-			}
-			if (methodsToDeclareAbstract.contains(infos[i].getMember())){
-				infos[i].setAction(MemberActionInfo.PUSH_ABSTRACT_ACTION);
-				assertTrue(! membersToPushDown.contains(infos[i].getMember()));
-			}
-		}
-	}
-
-	private void helper(String[] selectedMethodNames, String[][] selectedMethodSignatures,
-						String[] selectedFieldNames,
-						String[] namesOfMethodsToPullUp, String[][] signaturesOfMethodsToPullUp, 
-						String[] namesOfFieldsToPullUp, String[] namesOfMethodsToDeclareAbstract, 
-						String[][] signaturesOfMethodsToDeclareAbstract, String[] additionalCuNames, String[] additionalPackNames) throws Exception{
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		
-		IPackageFragment[] addtionalPacks= createAdditionalPackages(additionalCuNames, additionalPackNames);
-		ICompilationUnit[] additonalCus= createAdditionalCus(additionalCuNames, addtionalPacks);
-		
-		try{
-			PushDownRefactoring ref= createRefactoringPrepareForInputCheck(selectedMethodNames, selectedMethodSignatures, selectedFieldNames, namesOfMethodsToPullUp, signaturesOfMethodsToPullUp, namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, cuA);
-
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertTrue("precondition was supposed to pass but got " + checkInputResult.toString(), checkInputResult.isOK());	
-			performChange(ref, false);
-
-			String expected= getFileContents(getOutputTestFileName("A"));
-			String actual= cuA.getSource();
-			assertEqualLines("A.java", expected, actual);
-			
-			for (int i= 0; i < additonalCus.length; i++) {
-				ICompilationUnit unit= additonalCus[i];
-				String expectedS= getFileContents(getOutputTestFileName(additionalCuNames[i]));
-				String actualS= unit.getSource();
-				assertEqualLines(unit.getElementName(), expectedS, actualS);
-			}
-			
-		} finally{
-			performDummySearch();
-			cuA.delete(false, null);
-			for (int i= 0; i < additonalCus.length; i++) {
-				additonalCus[i].delete(false, null);
-			}
-			for (int i= 0; i < addtionalPacks.length; i++) {
-				if (! addtionalPacks[i].equals(getPackageP()))
-					addtionalPacks[i].delete(false, null);
-			}
-		}	
-	}
-
-	private ICompilationUnit[] createAdditionalCus(String[] additionalCuNames, IPackageFragment[] addtionalPacks) throws Exception {
-		ICompilationUnit[] additonalCus= new ICompilationUnit[0];
-		if (additionalCuNames != null){
-			additonalCus= new ICompilationUnit[additionalCuNames.length];
-			for (int i= 0; i < additonalCus.length; i++) {
-				additonalCus[i]= createCUfromTestFile(addtionalPacks[i], additionalCuNames[i]);
-			}
-		}
-		return additonalCus;
-	}
-
-	private IPackageFragment[] createAdditionalPackages(String[] additionalCuNames, String[] additionalPackNames) {
-		IPackageFragment[] additionalPacks= new IPackageFragment[0];
-		if (additionalPackNames != null){
-			additionalPacks= new IPackageFragment[additionalPackNames.length];
-			assertTrue(additionalPackNames.length == additionalCuNames.length);
-			for (int i= 0; i < additionalPackNames.length; i++) {
-				additionalPacks[i]= getRoot().getPackageFragment(additionalPackNames[i]);
-			}
-		}
-		return additionalPacks;
-	}
-
-	private void failActivationHelper(String[] selectedMethodNames, String[][] selectedMethodSignatures,
-										String[] selectedFieldNames,
-										String[] namesOfMethodsToPullUp, String[][] signaturesOfMethodsToPullUp, 
-										String[] namesOfFieldsToPullUp, String[] namesOfMethodsToDeclareAbstract, 
-										String[][] signaturesOfMethodsToDeclareAbstract,
-										int expectedSeverity) throws Exception{
-												
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType type= getType(cu, "A");
-			IMethod[] selectedMethods= getMethods(type, selectedMethodNames, selectedMethodSignatures);
-			IField[] selectedFields= getFields(type, selectedFieldNames);
-			IMember[] selectedMembers= merge(selectedFields, selectedMethods);
-		
-			PushDownRefactoring ref= createRefactoring(selectedMembers);
-//			assertTrue("preactivation", ref.checkPreactivation().isOK());
-			assertEquals("activation was expected to fail", expectedSeverity, ref.checkInitialConditions(new NullProgressMonitor()).getSeverity());
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-
-	private void failInputHelper(String[] selectedMethodNames, String[][] selectedMethodSignatures,
-											String[] selectedFieldNames,
-											String[] namesOfMethodsToPullUp, String[][] signaturesOfMethodsToPullUp, 
-											String[] namesOfFieldsToPullUp, String[] namesOfMethodsToDeclareAbstract, 
-											String[][] signaturesOfMethodsToDeclareAbstract,
-											int expectedSeverity) throws Exception{
-												
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			PushDownRefactoring ref= createRefactoringPrepareForInputCheck(selectedMethodNames, selectedMethodSignatures, selectedFieldNames, namesOfMethodsToPullUp, signaturesOfMethodsToPullUp, namesOfFieldsToPullUp, namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, cu);
-			RefactoringStatus checkInputResult= ref.checkFinalConditions(new NullProgressMonitor());
-			assertEquals("precondition was expected to fail", expectedSeverity, checkInputResult.getSeverity());	
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-
-	private void addRequiredMembersHelper(String[] fieldNames, String[] methodNames, String[][] methodSignatures, String[] expectedFieldNames, String[] expectedMethodNames, String[][] expectedMethodSignatures) throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType type= getType(cu, "A");
-			IField[] fields= getFields(type, fieldNames);
-			IMethod[] methods= getMethods(type, methodNames, methodSignatures);
-
-			IMember[] members= merge(methods, fields);
-			PushDownRefactoring ref= createRefactoring(members);
-//			assertTrue("preactivation", ref.checkPreactivation().isOK());
-			assertTrue("activation", ref.checkInitialConditions(new NullProgressMonitor()).isOK());
-
-			ref.computeAdditionalRequiredMembersToPushDown(new NullProgressMonitor());
-			List required= getMembersToPushDown(ref);
-			ref.getMemberActionInfos();
-			IField[] expectedFields= getFields(type, expectedFieldNames);
-			IMethod[] expectedMethods= getMethods(type, expectedMethodNames, expectedMethodSignatures);
-			List expected= Arrays.asList(merge(expectedFields, expectedMethods));
-			assertEquals("incorrect size", expected.size(), required.size());
-			for (Iterator iter= expected.iterator(); iter.hasNext();) {
-				Object each= iter.next();
-				assertTrue ("required does not contain " + each, required.contains(each));
-			}
-			for (Iterator iter= required.iterator(); iter.hasNext();) {
-				Object each= iter.next();
-				assertTrue ("expected does not contain " + each, expected.contains(each));
-			}
-		} finally{
-			performDummySearch();
-			cu.delete(false, null);
-		}	
-	}
-	
-	private static List getMembersToPushDown(PushDownRefactoring ref){
-		MemberActionInfo[] infos= ref.getMemberActionInfos();
-		List result= new ArrayList(infos.length);
-		for (int i= 0; i < infos.length; i++) {
-			if (infos[i].isToBePushedDown())
-				result.add(infos[i].getMember());
-		}
-		return result;
-	}
-	
-	//--------------------------------------------------------
-	
-	public void test0() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test1() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test2() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test3() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test4() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test5() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test6() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test7() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test8() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test9() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test10() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test11() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test12() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"f"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {"f"};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test13() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"f"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {"f"};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test14() throws Exception{
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test15() throws Exception{
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test16() throws Exception{
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test17() throws Exception{
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test18() throws Exception{
-		String[] selectedMethodNames= {"f", "m"};
-		String[][] selectedMethodSignatures= {new String[0], new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test19() throws Exception{
-		String[] selectedMethodNames= {"f", "m"};
-		String[][] selectedMethodSignatures= {new String[0], new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test20() throws Exception{
-		String[] selectedMethodNames= {"f", "m"};
-		String[][] selectedMethodSignatures= {new String[0], new String[0]};
-		String[] selectedFieldNames= {"i"};
-		String[] namesOfMethodsToPushDown= {"f"};
-		String[][] signaturesOfMethodsToPushDown= {new String[0]};
-		String[] namesOfFieldsToPushDown= {"i"};
-		String[] namesOfMethodsToDeclareAbstract= {"m"};
-		String[][] signaturesOfMethodsToDeclareAbstract= {new String[0]};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, 
-			   new String[]{"B"}, new String[]{"p"});
-	}
-
-	public void test21() throws Exception{
-		String[] selectedMethodNames= {"f", "m"};
-		String[][] selectedMethodSignatures= {new String[0], new String[0]};
-		String[] selectedFieldNames= {"i"};
-		String[] namesOfMethodsToPushDown= {"f", "m"};
-		String[][] signaturesOfMethodsToPushDown= {new String[0], new String[0]};
-		String[] namesOfFieldsToPushDown= {"i"};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, 
-			   new String[]{"B", "C"}, new String[]{"p", "p"});
-	}
-
-	public void test22() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"bar"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= selectedFieldNames;
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-	
-	public void test23() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"bar"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= selectedFieldNames;
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test24() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"foo", "bar"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= selectedFieldNames;
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test25() throws Exception{
-		String[] selectedMethodNames= {"foo"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test26() throws Exception{
-		String[] selectedMethodNames= {"bar"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test27() throws Exception{
-		String[] selectedMethodNames= {"bar"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void test28() throws Exception{
-//		if (true){
-//			printTestDisabledMessage("37175");
-//			return;
-//		}
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"i", "j"};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {"i", "j"};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-	
-	public void testFail0() throws Exception {
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failActivationHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.FATAL);
-	}
-
-	public void testFail1() throws Exception {
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failActivationHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.FATAL);
-	}
-
-	public void testFail2() throws Exception {
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail3() throws Exception {
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"i"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= selectedFieldNames;
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail4() throws Exception {
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail5() throws Exception {
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail6() throws Exception {
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail7() throws Exception {
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail8() throws Exception {
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail9() throws Exception {
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"f"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= selectedFieldNames;
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail10() throws Exception {
-		String[] selectedMethodNames= {"foo"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail11() throws Exception {
-		String[] selectedMethodNames= {"foo"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail12() throws Exception {
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"bar"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= selectedFieldNames;
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-
-	public void testFail13() throws Exception {
-		String[] selectedMethodNames= {"foo"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		failInputHelper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract,
-			   RefactoringStatus.ERROR);
-	}
-	
-	public void testAddingRequiredMembers0() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers1() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers2() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers3() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"m", "f"};
-		String[][] expectedMethodSignatures= {new String[0], new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers4() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m", "f"};
-		String[][] methodSignatures= {new String[0], new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers5() throws Exception{
-		String[] fieldNames= {};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= {"f"};
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers6() throws Exception{
-		String[] fieldNames= {"f"};
-		String[] methodNames= {"m"};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= methodNames;
-		String[][] expectedMethodSignatures= methodSignatures;
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers7() throws Exception{
-		String[] fieldNames= {"f"};
-		String[] methodNames= {};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= fieldNames;
-		String[] expectedMethodNames= {"m"};
-		String[][] expectedMethodSignatures= {new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers8() throws Exception{
-		String[] fieldNames= {"f"};
-		String[] methodNames= {};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= {"f", "m"};
-		String[] expectedMethodNames= {};
-		String[][] expectedMethodSignatures= {new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testAddingRequiredMembers9() throws Exception{
-		String[] fieldNames= {"f"};
-		String[] methodNames= {};
-		String[][] methodSignatures= {new String[0]};
-		
-		String[] expectedFieldNames= {"f", "m"};
-		String[] expectedMethodNames= {};
-		String[][] expectedMethodSignatures= {new String[0]};
-		addRequiredMembersHelper(fieldNames, methodNames, methodSignatures, expectedFieldNames, expectedMethodNames, expectedMethodSignatures);
-	}
-
-	public void testEnablement0() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be enabled", PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement1() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement2() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement3() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IType typeB= cu.getType("B");
-		IMember[] members= {typeA, typeB};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement4() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be enabled", PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement5() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be enabled", PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement6() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be enabled", PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement7() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be enabled", PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement8() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be enabled", PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement9() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement10() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement11() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeA= cu.getType("A");
-		IMember[] members= {typeA};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement12() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement13() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement14() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testEnablement15() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType typeB= cu.getType("Outer").getType("B");
-		IMember[] members= {typeB};
-		assertTrue("should be disabled", ! PushDownRefactoring.isAvailable(members));
-	}
-
-	public void testGenerics0() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics1() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics2() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics3() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics4() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics5() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics6() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics7() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics8() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics9() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics10() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics11() throws Exception{
-		String[] selectedMethodNames= {"m"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics12() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"f"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {"f"};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics13() throws Exception{
-		String[] selectedMethodNames= {};
-		String[][] selectedMethodSignatures= {};
-		String[] selectedFieldNames= {"f"};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {"f"};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics14() throws Exception{
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics15() throws Exception{
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics16() throws Exception{
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics17() throws Exception{
-		String[] selectedMethodNames= {"f"};
-		String[][] selectedMethodSignatures= {new String[0]};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics18() throws Exception{
-		String[] selectedMethodNames= {"f", "m"};
-		String[][] selectedMethodSignatures= {new String[0], new String[] {"QT;"}};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= selectedMethodNames;
-		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= {};
-		String[][] signaturesOfMethodsToDeclareAbstract= {};
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-
-	public void testGenerics19() throws Exception{
-		String[] selectedMethodNames= {"f", "m"};
-		String[][] selectedMethodSignatures= {new String[0], new String[]{"QT;"}};
-		String[] selectedFieldNames= {};
-		String[] namesOfMethodsToPushDown= {};
-		String[][] signaturesOfMethodsToPushDown= {};
-		String[] namesOfFieldsToPushDown= {};
-		String[] namesOfMethodsToDeclareAbstract= selectedMethodNames;
-		String[][] signaturesOfMethodsToDeclareAbstract= selectedMethodSignatures;
-		
-		helper(selectedMethodNames, selectedMethodSignatures, 
-			   selectedFieldNames,	
-			   namesOfMethodsToPushDown, signaturesOfMethodsToPushDown, 
-			   namesOfFieldsToPushDown, 
-			   namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringScannerTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringScannerTests.java
deleted file mode 100644
index f99fd67..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringScannerTests.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RefactoringScanner;
-
-public class RefactoringScannerTests extends RefactoringTest{
-
-	public RefactoringScannerTests(String name){
-		super(name);
-	}
-	
-	private RefactoringScanner fScanner;
-	private static Class clazz= RefactoringScannerTests.class;
-	
-	protected String getRefactoringPath() {
-		return "RefactoringScanner/";
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	protected void setUp() throws Exception {
-		//no need to call super.setUp();
-		fScanner= new RefactoringScanner("TestPattern");
-	}
-
-	protected void tearDown() throws Exception {
-		//no need to call super.tearDown();
-	}
-
-	private void helper(String fileName, int expectedMatchCount)	throws Exception{
-		String text= getFileContents(getRefactoringPath() + fileName);
-		fScanner.scan(text);
-		assertEquals("results.length", expectedMatchCount, fScanner.getMatches().size());
-	}
-	
-	//-- tests
-	public void test0() throws Exception{
-		String text= "";
-		fScanner.scan(text);
-		assertEquals("results.length", 0, fScanner.getMatches().size());
-	}
-	
-	public void test1() throws Exception{
-		helper("A.java", 8);
-	}
-
-	//---
-	public void testWord1() throws Exception{
-		helper("B.java", 6);
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTest.java
deleted file mode 100644
index 27322fa..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTest.java
+++ /dev/null

@@ -1,507 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringBufferInputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceManipulation;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.ITypeNameRequestor;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-
-import org.eclipse.jdt.internal.corext.refactoring.util.JavaElementUtil;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.jdt.internal.corext.util.Strings;
-
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringTestPlugin;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public abstract class RefactoringTest extends TestCase {
-
-	private IPackageFragmentRoot fRoot;
-	private IPackageFragment fPackageP;
-	
-	public boolean fIsVerbose= false;
-
-	public static final String TEST_PATH_PREFIX= "";
-
-	protected static final String TEST_INPUT_INFIX= "/in/";
-	protected static final String TEST_OUTPUT_INFIX= "/out/";
-	protected static final String CONTAINER= "src";
-	
-	public RefactoringTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		fRoot= RefactoringTestSetup.getDefaultSourceFolder();
-		fPackageP= RefactoringTestSetup.getPackageP();
-		
-		if (fIsVerbose){
-			System.out.println("\n---------------------------------------------");
-			System.out.println("\nTest:" + getClass() + "." + getName());
-		}	
-		RefactoringCore.getUndoManager().flush();
-	}
-
-	protected void performDummySearch() throws Exception {
-		performDummySearch(getPackageP());
-	}	
-
-	protected void tearDown() throws Exception {
-		refreshFromLocal();	
-		performDummySearch();
-			
-		if (getPackageP().exists()){		
-			tryDeletingAllJavaChildren(getPackageP());
-			tryDeletingAllNonJavaChildResources(getPackageP());
-		}	
-		
-		if (getRoot().exists()){
-			IJavaElement[] packages= getRoot().getChildren();
-			for (int i= 0; i < packages.length; i++){
-				try{
-					IPackageFragment pack= (IPackageFragment)packages[i];
-					if (! pack.equals(getPackageP()) && pack.exists() && ! pack.isReadOnly())
-						pack.delete(true, null);
-				}	catch (JavaModelException e){
-					//try to delete'em all
-					e.printStackTrace();
-				}	
-			}
-		}
-	}
-
-	private void refreshFromLocal() throws CoreException {
-		if (getRoot().exists())
-			getRoot().getResource().refreshLocal(IResource.DEPTH_INFINITE, null);	
-		else if (getPackageP().exists())//don't refresh package if root already refreshed
-			getPackageP().getResource().refreshLocal(IResource.DEPTH_INFINITE, null);
-	}
-
-	private static void tryDeletingAllNonJavaChildResources(IPackageFragment pack) throws JavaModelException {
-		Object[] nonJavaKids= pack.getNonJavaResources();
-		for (int i= 0; i < nonJavaKids.length; i++) {
-			if (nonJavaKids[i] instanceof IResource) {
-				IResource resource= (IResource)nonJavaKids[i];
-				try {
-					resource.delete(true, null);
-				} catch (CoreException e) {
-					//try to delete'em all
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	private static void tryDeletingAllJavaChildren(IPackageFragment pack) throws JavaModelException {
-		IJavaElement[] kids= pack.getChildren();
-		for (int i= 0; i < kids.length; i++){
-			if (kids[i] instanceof ISourceManipulation){
-				try{
-					if (kids[i].exists() && ! kids[i].isReadOnly())
-						((ISourceManipulation)kids[i]).delete(true, null);
-				}	catch (JavaModelException e){
-					//try to delete'em all
-					e.printStackTrace();
-				}
-			}	
-		}
-	}
-
-	protected IPackageFragmentRoot getRoot() {
-		return fRoot;
-	}
-
-	protected IPackageFragment getPackageP() {
-		return fPackageP;
-	}
-
-	protected final RefactoringStatus performRefactoring(Refactoring ref) throws Exception {
-		return performRefactoring(ref, true);
-	}
-	
-	protected final RefactoringStatus performRefactoring(Refactoring ref, boolean providesUndo) throws Exception {
-		performDummySearch();
-		IUndoManager undoManager= getUndoManager();
-		CreateChangeOperation create= new CreateChangeOperation(
-			new CheckConditionsOperation(ref, CheckConditionsOperation.ALL_CONDITIONS),
-			RefactoringStatus.FATAL);
-		PerformChangeOperation perform= new PerformChangeOperation(create);
-		perform.setUndoManager(undoManager, ref.getName());
-		ResourcesPlugin.getWorkspace().run(perform, new NullProgressMonitor());
-		RefactoringStatus status= create.getConditionCheckingStatus();
-		if (!status.isOK())
-			return status;
-		assertTrue("Change wasn't executed", perform.changeExecuted());
-		Change undo= perform.getUndoChange();
-		if (providesUndo) {
-			assertNotNull("Undo doesn't exist", undo);
-			assertTrue("Undo manager is empty", undoManager.anythingToUndo());
-		} else {
-			assertNull("Undo manager contains undo but shouldn't", undo);
-		}
-		return null;
-	}
-	
-	protected final RefactoringStatus performRefactoringWithStatus(Refactoring ref) throws Exception {
-		performDummySearch();
-		CreateChangeOperation create= new CreateChangeOperation(
-			new CheckConditionsOperation(ref, CheckConditionsOperation.ALL_CONDITIONS),
-			RefactoringStatus.FATAL);
-		PerformChangeOperation perform= new PerformChangeOperation(create);
-		perform.setUndoManager(RefactoringCore.getUndoManager(), ref.getName());
-		ResourcesPlugin.getWorkspace().run(perform, new NullProgressMonitor());
-		RefactoringStatus status= create.getConditionCheckingStatus();
-		if (status.hasFatalError())
-			return status;
-		assertTrue("Change wasn't executed", perform.changeExecuted());
-		return status;
-	}
-	
-	protected final Change performChange(final Refactoring refactoring, boolean storeUndo) throws Exception {
-		CreateChangeOperation create= new CreateChangeOperation(refactoring);
-		PerformChangeOperation perform= new PerformChangeOperation(create);
-		if (storeUndo) {
-			perform.setUndoManager(getUndoManager(), refactoring.getName());
-		}
-		ResourcesPlugin.getWorkspace().run(perform, new NullProgressMonitor());
-		assertTrue("Change wasn't executed", perform.changeExecuted());
-		return perform.getUndoChange();
-	}
-	
-	protected final Change performChange(final Change change) throws Exception {
-		PerformChangeOperation perform= new PerformChangeOperation(change);
-		ResourcesPlugin.getWorkspace().run(perform, new NullProgressMonitor());
-		assertTrue("Change wasn't executed", perform.changeExecuted());
-		return perform.getUndoChange();
-	}
-	
-	protected IUndoManager getUndoManager() {
-		IUndoManager undoManager= RefactoringCore.getUndoManager();
-		undoManager.flush();
-		return undoManager;
-	}
-
-	/* ===================  helpers  ================= */
-	protected IType getType(ICompilationUnit cu, String name) throws JavaModelException {
-		IType[] types= cu.getAllTypes();
-		for (int i= 0; i < types.length; i++)
-			if (JavaModelUtil.getTypeQualifiedName(types[i]).equals(name) ||
-			    types[i].getElementName().equals(name))
-				return types[i];
-		return null;
-	}
-	
-	/*
-	 * subclasses override to inform about the location of their test cases
-	 */
-	protected String getRefactoringPath() {
-		return "";
-	}
-
-	/*
-	 *  example "RenameType/"
-	 */
-	protected String getTestPath() {
-		return TEST_PATH_PREFIX + getRefactoringPath();
-	}
-
-	protected String createTestFileName(String cuName, String infix) {
-		return getTestPath() + getName() + infix + cuName + ".java";
-	}
-	
-	protected String getInputTestFileName(String cuName) {
-		return createTestFileName(cuName, TEST_INPUT_INFIX);
-	}
-	
-	/*
-	 * @param subDirName example "p/" or "org/eclipse/jdt/"
-	 */
-	protected String getInputTestFileName(String cuName, String subDirName) {
-		return createTestFileName(cuName, TEST_INPUT_INFIX + subDirName);
-	}
-
-	protected String getOutputTestFileName(String cuName) {
-		return createTestFileName(cuName, TEST_OUTPUT_INFIX);
-	}
-	
-	/*
-	 * @param subDirName example "p/" or "org/eclipse/jdt/"
-	 */
-	protected String getOutputTestFileName(String cuName, String subDirName) {
-		return createTestFileName(cuName, TEST_OUTPUT_INFIX + subDirName);
-	}
-	
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, String cuName) throws Exception {
-		return createCUfromTestFile(pack, cuName, true);
-	}
-	
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, String cuName, String subDirName) throws Exception {
-		return createCUfromTestFile(pack, cuName, subDirName, true);
-	}
-	
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, String cuName, boolean input) throws Exception {
-		String contents= input 
-					? getFileContents(getInputTestFileName(cuName))
-					: getFileContents(getOutputTestFileName(cuName));
-		return createCU(pack, cuName + ".java", contents);
-	}
-	
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, String cuName, String subDirName, boolean input) throws Exception {
-		String contents= input 
-			? getFileContents(getInputTestFileName(cuName, subDirName))
-			: getFileContents(getOutputTestFileName(cuName, subDirName));
-		
-		return createCU(pack, cuName + ".java", contents);
-	}
-	
-	protected void printTestDisabledMessage(String explanation){
-		System.out.println("\n" +getClass().getName() + "::"+ getName() + " disabled (" + explanation + ")");
-	}
-	
-	//-----------------------
-	public static InputStream getStream(String content){
-		return new StringBufferInputStream(content);
-	}
-	
-	public static IPackageFragmentRoot getSourceFolder(IJavaProject javaProject, String name) throws JavaModelException{
-		IPackageFragmentRoot[] roots= javaProject.getPackageFragmentRoots();
-		for (int i= 0; i < roots.length; i++) {
-			if (! roots[i].isArchive() && roots[i].getElementName().equals(name))
-				return roots[i];
-		}
-		return null;
-	}
-	
-	public String getFileContents(String fileName) throws IOException {
-		return getContents(getFileInputStream(fileName));
-	}
-
-	public static String getContents(IFile file) throws IOException, CoreException {
-		return getContents(file.getContents());
-	}
-	
-	public static ICompilationUnit createCU(IPackageFragment pack, String name, String contents) throws Exception {
-		if (pack.getCompilationUnit(name).exists())
-			return pack.getCompilationUnit(name);
-		ICompilationUnit cu= pack.createCompilationUnit(name, contents, true, null);
-		cu.save(null, true);
-		return cu;
-	}
-
-	public static String getContents(InputStream in) throws IOException {
-		BufferedReader br= new BufferedReader(new InputStreamReader(in));
-		
-		StringBuffer sb= new StringBuffer(300);
-		try {
-			int read= 0;
-			while ((read= br.read()) != -1)
-				sb.append((char) read);
-		} finally {
-			br.close();
-		}
-		return sb.toString();
-	}
-
-	public InputStream getFileInputStream(String fileName) throws IOException {
-		return RefactoringTestPlugin.getDefault().getTestResourceStream(fileName);
-	}
-
-	public static String removeExtension(String fileName) {
-		return fileName.substring(0, fileName.lastIndexOf('.'));
-	}
-	
-	public static void performDummySearch(IJavaElement element) throws Exception{
-		new SearchEngine().searchAllTypeNames(
-			ResourcesPlugin.getWorkspace(),
-			null,
-			null,
-			SearchPattern.R_EXACT_MATCH,
-			true,
-			IJavaSearchConstants.CLASS,
-			SearchEngine.createJavaSearchScope(new IJavaElement[]{element}),
-			new Requestor(),
-			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-			null);
-	}
-	
-	public static IMember[] merge(IMember[] a1, IMember[] a2, IMember[] a3){
-		return JavaElementUtil.merge(JavaElementUtil.merge(a1, a2), a3);
-	}
-
-	public static IMember[] merge(IMember[] a1, IMember[] a2){
-		return JavaElementUtil.merge(a1, a2);
-	}
-		
-	public static IField[] getFields(IType type, String[] names) throws JavaModelException{
-		if (names == null )
-			return new IField[0];
-		Set fields= new HashSet();
-		for (int i = 0; i < names.length; i++) {
-			IField field= type.getField(names[i]);
-			assertTrue("field " + field.getElementName() + " does not exist", field.exists());
-			fields.add(field);
-		}
-		return (IField[]) fields.toArray(new IField[fields.size()]);	
-	}
-
-	public static IType[] getMemberTypes(IType type, String[] names) throws JavaModelException{
-		if (names == null )
-			return new IType[0];
-		Set memberTypes= new HashSet();
-		for (int i = 0; i < names.length; i++) {
-			IType memberType= type.getType(names[i]);
-			assertTrue("member type " + memberType.getElementName() + " does not exist", memberType.exists());
-			memberTypes.add(memberType);
-		}
-		return (IType[]) memberTypes.toArray(new IType[memberTypes.size()]);	
-	}
-	
-	public static IMethod[] getMethods(IType type, String[] names, String[][] signatures) throws JavaModelException{
-		if (names == null || signatures == null)
-			return new IMethod[0];
-		List methods= new ArrayList(names.length);
-		for (int i = 0; i < names.length; i++) {
-			IMethod method= type.getMethod(names[i], signatures[i]);
-			assertTrue("method " + method.getElementName() + " does not exist", method.exists());
-			if (!methods.contains(method))
-				methods.add(method);
-		}
-		return (IMethod[]) methods.toArray(new IMethod[methods.size()]);	
-	}
-
-	public static IType[] findTypes(IType[] types, String[] namesOfTypesToPullUp) {
-		List found= new ArrayList(types.length);
-		for (int i= 0; i < types.length; i++) {
-			IType type= types[i];
-			for (int j= 0; j < namesOfTypesToPullUp.length; j++) {
-				String name= namesOfTypesToPullUp[j];
-				if (type.getElementName().equals(name))
-					found.add(type);					
-			}
-		}
-		return (IType[]) found.toArray(new IType[found.size()]);
-	}
-	
-	public static IField[] findFields(IField[] fields, String[] namesOfFieldsToPullUp) {
-		List found= new ArrayList(fields.length);
-		for (int i= 0; i < fields.length; i++) {
-			IField field= fields[i];
-			for (int j= 0; j < namesOfFieldsToPullUp.length; j++) {
-				String name= namesOfFieldsToPullUp[j];
-				if (field.getElementName().equals(name))
-					found.add(field);					
-			}
-		}
-		return (IField[]) found.toArray(new IField[found.size()]);
-	}
-
-	public static IMethod[] findMethods(IMethod[] selectedMethods, String[] namesOfMethods, String[][] signaturesOfMethods){
-		List found= new ArrayList(selectedMethods.length);
-		for (int i= 0; i < selectedMethods.length; i++) {
-			IMethod method= selectedMethods[i];
-			String[] paramTypes= method.getParameterTypes();
-			for (int j= 0; j < namesOfMethods.length; j++) {
-				String methodName= namesOfMethods[j];
-				if (! methodName.equals(method.getElementName()))
-					continue;
-				String[] methodSig= signaturesOfMethods[j];
-				if (! areSameSignatures(paramTypes, methodSig))
-					continue;
-				found.add(method);	
-			}
-		}
-		return (IMethod[]) found.toArray(new IMethod[found.size()]);
-	}
-	
-	private static boolean areSameSignatures(String[] s1, String[] s2){
-		if (s1.length != s2.length)
-			return false;
-		for (int i= 0; i < s1.length; i++) {
-			if (! s1[i].equals(s2[i]))
-				return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Line-based version of junit.framework.Assert.assertEquals(String, String)
-	 * without considering line delimiters.
-	 * @param expected the expected value
-	 * @param actual the actual value
-	 */
-	public static void assertEqualLines(String expected, String actual) {
-		assertEqualLines("", expected, actual);
-	}
-	
-	/**
-	 * Line-based version of junit.framework.Assert.assertEquals(String, String, String)
-	 * without considering line delimiters.
-	 * @param message the message
-	 * @param expected the expected value
-	 * @param actual the actual value
-	 */
-	public static void assertEqualLines(String message, String expected, String actual) {
-		String[] expectedLines= Strings.convertIntoLines(expected);
-		String[] actualLines= Strings.convertIntoLines(actual);
-
-		String expected2= (expectedLines == null ? null : Strings.concatenate(expectedLines, "\n"));
-		String actual2= (actualLines == null ? null : Strings.concatenate(actualLines, "\n"));
-		assertEquals(message, expected2, actual2);		
-	}
-	
-	private static class Requestor implements ITypeNameRequestor{
-		
-		public void acceptClass(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-		}
-
-		public void acceptInterface(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTestSetup.java
deleted file mode 100644
index 50b3372..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RefactoringTestSetup.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class RefactoringTestSetup extends AbstractRefactoringTestSetup {
-	
-	public RefactoringTestSetup(Test test) {
-		super(test);
-	}
-	
-	public static final String CONTAINER= "src";
-	private static IPackageFragmentRoot fgRoot;
-	private static IPackageFragment fgPackageP;
-	private static IJavaProject fgJavaTestProject;
-	
-	public static IPackageFragmentRoot getDefaultSourceFolder() throws Exception {
-		if (fgRoot != null) 
-			return fgRoot;
-		throw new Exception(RefactoringTestSetup.class.getName() + " not initialized");
-	}
-	
-	public static IJavaProject getProject()throws Exception {
-		if (fgJavaTestProject != null)
-			return fgJavaTestProject;
-		throw new Exception(RefactoringTestSetup.class.getName() + " not initialized");
-	}
-	
-	public static IPackageFragment getPackageP()throws Exception {
-		if (fgPackageP != null) 
-			return fgPackageP;
-		throw new Exception(RefactoringTestSetup.class.getName() + " not initialized");
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		JavaProjectHelper.setAutoBuilding(false);
-		if (JavaPlugin.getActivePage() != null)
-			JavaPlugin.getActivePage().close();
-		fgJavaTestProject= JavaProjectHelper.createJavaProject("TestProject"+System.currentTimeMillis(), "bin");
-		JavaProjectHelper.addRTJar(fgJavaTestProject);
-		fgRoot= JavaProjectHelper.addSourceContainer(fgJavaTestProject, CONTAINER);
-		fgPackageP= fgRoot.createPackageFragment("p", true, null);
-	}
-	
-	protected void tearDown() throws Exception {
-		if (fgPackageP.exists())
-			fgPackageP.delete(true, null);
-		JavaProjectHelper.removeSourceContainer(fgJavaTestProject, CONTAINER);
-		JavaProjectHelper.delete(fgJavaTestProject);
-		super.tearDown();
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameFieldTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameFieldTests.java
deleted file mode 100644
index f8f52f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameFieldTests.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class RenameFieldTests {
-	
-	private static final Class clazz= RenameFieldTests.class;
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite(clazz.getName());
-		suite.addTest(RenameNonPrivateFieldTests.suite());
-		suite.addTest(RenamePrivateFieldTests.suite());
-		return suite;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameJavaProjectTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameJavaProjectTests.java
deleted file mode 100644
index 968178f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameJavaProjectTests.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameJavaProjectProcessor;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameJavaProjectTests extends RefactoringTest {
-
-	private static final Class clazz= RenameJavaProjectTests.class;
-
-	public RenameJavaProjectTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public void test0() throws Exception {
-		IJavaProject p1= null;
-		IJavaProject referencing1= null;
-		IJavaProject referencing2= null;
-		try {
-			ParticipantTesting.reset();
-			String newProjectName= "newName";
-			p1= JavaProjectHelper.createJavaProject("p1", "bin");
-			referencing1= JavaProjectHelper.createJavaProject("p2", "bin");
-			referencing2= JavaProjectHelper.createJavaProject("p3", "bin");
-
-			JavaProjectHelper.addRTJar(referencing1);
-			JavaProjectHelper.addRequiredProject(referencing1, p1);
-			JavaProjectHelper.addSourceContainer(referencing1, "src");
-
-			JavaProjectHelper.addRTJar(referencing2);
-			JavaProjectHelper.addRequiredProject(referencing2, p1);
-			JavaProjectHelper.addSourceContainer(referencing2, "src");
-
-			JavaProjectHelper.addRTJar(p1);
-
-			ParticipantTesting.reset();
-			String[] handles= ParticipantTesting.createHandles(p1, p1.getResource());
-			RenameJavaProjectProcessor processor= new RenameJavaProjectProcessor(p1);
-			RenameRefactoring ref= new RenameRefactoring(processor);
-			assertTrue(ref.isApplicable());
-			processor.setNewElementName(newProjectName);
-			RefactoringStatus result= performRefactoring(ref);
-			assertEquals("not expected to fail", null, result);
-			assertTrue("p1 is gone", !p1.exists());
-			
-			ParticipantTesting.testRename(handles, 
-				new RenameArguments[] {
-					new RenameArguments(newProjectName, true),
-					new RenameArguments(newProjectName, true)});
-			
-			p1= referencing1.getJavaModel().getJavaProject("newName");
-			assertTrue("p1 exists", p1.exists());
-			
-			//check entries in  referencing1
-			IClasspathEntry[] entries= referencing1.getRawClasspath();
-			assertEquals("expected entries", 3, entries.length);
-			for (int i= 0; i < entries.length; i++) {
-				IClasspathEntry iClassPathEntry= entries[i];
-				if (i == 1) {
-					assertEquals("expected entry name", p1.getProject().getFullPath(), iClassPathEntry.getPath());
-					assertEquals("expected entry kind", IClasspathEntry.CPE_PROJECT, iClassPathEntry.getEntryKind());
-				}
-			}
-
-			//check entries in  referencing2
-			entries= referencing2.getRawClasspath();
-			assertEquals("expected entries", 3, entries.length);
-			for (int i= 0; i < entries.length; i++) {
-				IClasspathEntry iClassPathEntry= entries[i];
-				if (i == 1) {
-					assertEquals("expected entry name", p1.getProject().getFullPath(), iClassPathEntry.getPath());
-					assertEquals("expected entry kind", IClasspathEntry.CPE_PROJECT, iClassPathEntry.getEntryKind());
-				}
-			}
-
-		} finally {
-			performDummySearch();
-			
-			if (referencing1 != null && referencing1.exists())
-				JavaProjectHelper.removeSourceContainer(referencing1, "src");
-			if (referencing2 != null && referencing2.exists())
-				JavaProjectHelper.removeSourceContainer(referencing2, "src");
-
-			if (p1 != null && p1.exists())
-				JavaProjectHelper.delete(p1);
-			if (referencing1 != null && referencing1.exists())
-				JavaProjectHelper.delete(referencing1);
-			if (referencing2 != null && referencing2.exists())
-				JavaProjectHelper.delete(referencing2);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodInInterfaceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodInInterfaceTests.java
deleted file mode 100644
index e3044f6..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodInInterfaceTests.java
+++ /dev/null

@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameMethodProcessor;
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameVirtualMethodProcessor;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameProcessor;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameMethodInInterfaceTests extends RefactoringTest {
-	
-	private static final Class clazz= RenameMethodInInterfaceTests.class;
-	private static final String REFACTORING_PATH= "RenameMethodInInterface/";
-
-	public RenameMethodInInterfaceTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	private void helper1_not_available(String methodName, String[] signatures) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType interfaceI= getType(cu, "I");
-		
-		RenameProcessor processor= new RenameVirtualMethodProcessor(interfaceI.getMethod(methodName, signatures));
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		assertTrue(! ref.isApplicable());
-	}
-	private void helper1_0(String methodName, String newMethodName, String[] signatures) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType interfaceI= getType(cu, "I");
-		RenameMethodProcessor processor= new RenameVirtualMethodProcessor(interfaceI.getMethod(methodName, signatures));
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		processor.setNewElementName(newMethodName);
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	private void helper1() throws Exception{
-		helper1_0("m", "k", new String[0]);
-	}
-	
-	private void helper2_0(String methodName, String newMethodName, String[] signatures, boolean shouldPass, boolean updateReferences) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType interfaceI= getType(cu, "I");
-		RenameMethodProcessor processor= new RenameVirtualMethodProcessor(interfaceI.getMethod(methodName, signatures));
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		processor.setUpdateReferences(updateReferences);
-		processor.setNewElementName(newMethodName);
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		if (!shouldPass){
-			assertTrue("incorrect renaming because of a java model bug", ! getFileContents(getOutputTestFileName("A")).equals(cu.getSource()));
-			return;
-		}
-		assertEqualLines("incorrect renaming", getFileContents(getOutputTestFileName("A")), cu.getSource());
-		
-		assertTrue("anythingToUndo", RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("! anythingToRedo", !RefactoringCore.getUndoManager().anythingToRedo());
-		//assertEquals("1 to undo", 1, Refactoring.getUndoManager().getRefactoringLog().size());
-		
-		RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-		assertEqualLines("invalid undo", getFileContents(getInputTestFileName("A")), cu.getSource());
-
-		assertTrue("! anythingToUndo", !RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("anythingToRedo", RefactoringCore.getUndoManager().anythingToRedo());
-		//assertEquals("1 to redo", 1, Refactoring.getUndoManager().getRedoStack().size());
-		
-		RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-		assertEqualLines("invalid redo", getFileContents(getOutputTestFileName("A")), cu.getSource());
-	}
-	
-	private void helper2(boolean updateReferences) throws Exception{
-		helper2_0("m", "k", new String[0], true, updateReferences);
-	}
-	
-	private void helper2() throws Exception{
-		helper2(true);
-	}
-	
-	public void testFail0() throws Exception{
-		helper1();
-	}
-	public void testFail1() throws Exception{
-		helper1();
-	}
-	public void testFail3() throws Exception{
-		helper1();
-	}
-	public void testFail4() throws Exception{
-		helper1();
-	}
-	public void testFail5() throws Exception{
-		helper1();
-	}
-	public void testFail6() throws Exception{
-		helper1();
-	}
-	public void testFail7() throws Exception{
-		helper1();
-	}
-	public void testFail8() throws Exception{
-		helper1_0("m", "k", new String[]{Signature.SIG_INT});
-	}
-	public void testFail9() throws Exception{
-		helper1();
-	}
-	public void testFail10() throws Exception{
-		helper1();
-	}
-	public void testFail11() throws Exception{
-		helper1();
-	}
-	public void testFail12() throws Exception{
-		helper1();
-	}
-	public void testFail13() throws Exception{
-		helper1();
-	}
-	public void testFail14() throws Exception{
-		helper1();
-	}
-	public void testFail15() throws Exception{
-		helper1();
-	}
-	public void testFail16() throws Exception{
-		helper1();
-	}
-	public void testFail17() throws Exception{
-		helper1();
-	}
-	public void testFail18() throws Exception{
-		helper1();
-	}
-	public void testFail19() throws Exception{
-		helper1();
-	}
-	public void testFail20() throws Exception{
-		helper1();
-	}
-	public void testFail21() throws Exception{
-		helper1_0("m", "k", new String[]{"QString;"});
-	}
-	public void testFail22() throws Exception{
-		helper1_0("m", "k", new String[]{"QObject;"});
-	}
-	public void testFail23() throws Exception{
-		helper1_not_available("toString", new String[0]);
-	}
-	public void testFail24() throws Exception{
-		helper1();
-	}
-	public void testFail25() throws Exception{
-		helper1();
-	}
-	public void testFail26() throws Exception{
-		helper1();
-	}
-	public void testFail27() throws Exception{
-		helper1();
-	}
-	public void testFail28() throws Exception{
-		helper1();
-	}
-	public void testFail29() throws Exception{
-		helper1();
-	}
-	
-	public void testFail30() throws Exception{
-		helper1_not_available("toString", new String[0]);
-	}
-	
-	public void testFail31() throws Exception{
-		helper1_not_available("toString", new String[0]);
-	}
-	
-	public void testFail32() throws Exception{
-		helper1_0("m", "toString", new String[0]);
-	}
-	
-	public void testFail33() throws Exception{
-		helper1_0("m", "toString", new String[0]);
-	}
-	
-	public void testFail34() throws Exception{
-		helper1_0("m", "equals", new String[]{"QObject;"});
-	}
-	
-	public void testFail35() throws Exception{
-		helper1_0("m", "equals", new String[]{"Qjava.lang.Object;"});
-	}
-	
-	public void testFail36() throws Exception{
-		helper1_0("m", "getClass", new String[0]);
-	}
-	
-	public void testFail37() throws Exception{
-		helper1_0("m", "hashCode", new String[0]);
-	}
-
-	public void testFail38() throws Exception{
-		helper1_0("m", "notify", new String[0]);
-	}	
-
-	public void testFail39() throws Exception{
-		helper1_0("m", "notifyAll", new String[0]);
-	}	
-	
-	public void testFail40() throws Exception{
-		helper1_0("m", "wait", new String[]{Signature.SIG_LONG, Signature.SIG_INT});
-	}	
-
-	public void testFail41() throws Exception{
-		helper1_0("m", "wait", new String[]{Signature.SIG_LONG});
-	}	
-	
-	public void testFail42() throws Exception{
-		helper1_0("m", "wait", new String[0]);
-	}	
-	
-	public void testFail43() throws Exception{
-		helper1_0("m", "wait", new String[0]);
-	}	
-	
-	
-	public void test0() throws Exception{
-		helper2();
-	}
-	public void test1() throws Exception{
-		helper2();
-	}
-	public void test2() throws Exception{
-		helper2();
-	}
-	public void test3() throws Exception{
-		helper2();
-	}
-	public void test4() throws Exception{
-		helper2();
-	}
-	public void test5() throws Exception{
-		helper2();
-	}
-	public void test6() throws Exception{
-		helper2();
-	}
-	public void test7() throws Exception{
-		helper2();
-	}
-	public void test10() throws Exception{
-		helper2();
-	}
-	public void test11() throws Exception{
-		helper2();
-	}	
-	public void test12() throws Exception{
-		helper2();
-	}
-	
-	//test13 became testFail45
-	//public void test13() throws Exception{
-	//	helper2();
-	//}
-	public void test14() throws Exception{
-		helper2();
-	}
-	public void test15() throws Exception{
-		helper2();
-	}
-	public void test16() throws Exception{
-		helper2();
-	}
-	public void test17() throws Exception{
-		helper2();
-	}
-	public void test18() throws Exception{
-		helper2();
-	}
-	public void test19() throws Exception{
-		helper2();
-	}
-	public void test20() throws Exception{
-		helper2();
-	}
-	//anonymous inner class
-	public void test21() throws Exception{
-		printTestDisabledMessage("must fix - incorrect warnings");
-		//helper2_fail();
-	}
-	public void test22() throws Exception{
-		helper2();
-	}
-	
-	//test23 became testFail45
-	//public void test23() throws Exception{
-	//	helper2();
-	//}
-	
-	public void test24() throws Exception{
-		helper2();
-	}
-	public void test25() throws Exception{
-		helper2();
-	}
-	public void test26() throws Exception{
-		helper2();
-	}
-	public void test27() throws Exception{
-		helper2();
-	}
-	public void test28() throws Exception{
-		helper2();
-	}
-	public void test29() throws Exception{
-		helper2();
-	}
-	public void test30() throws Exception{
-		helper2();
-	}
-	//anonymous inner class
-	public void test31() throws Exception{
-		helper2();
-	}
-	//anonymous inner class
-	public void test32() throws Exception{
-		helper2();
-	}
-	public void test33() throws Exception{
-		helper2();
-	}
-	public void test34() throws Exception{
-		helper2();
-	}
-	public void test35() throws Exception{
-		helper2();
-	}
-	public void test36() throws Exception{
-		helper2();
-	}
-	public void test37() throws Exception{
-		helper2();
-	}
-	public void test38() throws Exception{
-		helper2();
-	}
-	public void test39() throws Exception{
-		helper2();
-	}
-	public void test40() throws Exception{
-		helper2();
-	}
-	public void test41() throws Exception{
-		helper2();
-	}
-	public void test42() throws Exception{
-		helper2();
-	}
-	public void test43() throws Exception{
-		helper2();
-	}
-	public void test44() throws Exception{
-		helper2();
-	}
-	public void test45() throws Exception{
-		helper2();
-	}
-	public void test46() throws Exception{
-		helper2(false);
-	}
-	public void test47() throws Exception{
-		helper2();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodTests.java
deleted file mode 100644
index afee834..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodTests.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class RenameMethodTests {
-	private static final Class clazz= RenameMethodTests.class;
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite(clazz.getName());
-		suite.addTest(RenameVirtualMethodInClassTests.suite());
-		suite.addTest(RenameMethodInInterfaceTests.suite());
-		suite.addTest(RenamePrivateMethodTests.suite());	
-		suite.addTest(RenameStaticMethodTests.suite());
-		return suite;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameNonPrivateFieldTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameNonPrivateFieldTests.java
deleted file mode 100644
index 408e10e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameNonPrivateFieldTests.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameFieldProcessor;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameNonPrivateFieldTests extends RefactoringTest{
-	
-	private static final Class clazz= RenameNonPrivateFieldTests.class;
-	private static final String REFACTORING_PATH= "RenameNonPrivateField/";
-
-	private Object fPrefixPref;
-	public RenameNonPrivateFieldTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}	
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		Hashtable options= JavaCore.getOptions();
-		fPrefixPref= options.get(JavaCore.CODEASSIST_FIELD_PREFIXES);
-		options.put(JavaCore.CODEASSIST_FIELD_PREFIXES, getPrefixes());
-		JavaCore.setOptions(options);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		Hashtable options= JavaCore.getOptions();
-		options.put(JavaCore.CODEASSIST_FIELD_PREFIXES, fPrefixPref);
-		JavaCore.setOptions(options);	
-	}
-	
-	private String getPrefixes(){
-		return "";
-	}
-	
-	private void helper1_0(String fieldName, String newFieldName) throws Exception{
-		IType classA= getType(createCUfromTestFile(getPackageP(), "A"), "A");
-		RenameFieldProcessor processor= new RenameFieldProcessor(classA.getField(fieldName));
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName(newFieldName);
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	private void helper1() throws Exception{
-		helper1_0("f", "g");
-	}
-	
-	private void helper2(String fieldName, String newFieldName, boolean updateReferences, boolean updateTextualMatches) throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-		IField field= classA.getField(fieldName);
-		String[] handles= ParticipantTesting.createHandles(field);
-		RenameFieldProcessor processor= new RenameFieldProcessor(field);
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName(newFieldName);
-		processor.setUpdateReferences(updateReferences);
-		processor.setUpdateTextualMatches(updateTextualMatches);
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertEquals("was supposed to pass", null, result);
-		assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName("A")), cu.getSource());
-		
-		ParticipantTesting.testRename(
-			handles,
-			new RenameArguments[] {
-				new RenameArguments(newFieldName, updateReferences)});
-		
-		assertTrue("anythingToUndo", RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("! anythingToRedo", !RefactoringCore.getUndoManager().anythingToRedo());
-		
-		RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-		assertEqualLines("invalid undo", getFileContents(getInputTestFileName("A")), cu.getSource());
-
-		assertTrue("! anythingToUndo", !RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("anythingToRedo", RefactoringCore.getUndoManager().anythingToRedo());
-		
-		RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-		assertEqualLines("invalid redo", getFileContents(getOutputTestFileName("A")), cu.getSource());
-	}
-	
-	private void helper2(String fieldName, String newFieldName) throws Exception{
-		helper2(fieldName, newFieldName, true, false);
-	}
-	
-	private void helper2() throws Exception{
-		helper2(true);
-	}
-	
-	private void helper2(boolean updateReferences) throws Exception{
-		helper2("f", "g", updateReferences, false);
-	}
-
-	//--------- tests ----------	
-	public void testFail0() throws Exception{
-		helper1();
-	}
-	
-	public void testFail1() throws Exception{
-		helper1();
-	}
-	
-	public void testFail2() throws Exception{
-		helper1();
-	}
-	
-	public void testFail3() throws Exception{
-		helper1();
-	}
-	
-	public void testFail4() throws Exception{
-		helper1();
-	}
-	
-	public void testFail5() throws Exception{
-		helper1();
-	}	
-	
-	public void testFail6() throws Exception{
-		helper1();
-	}
-	
-	public void testFail7() throws Exception{
-		helper1();
-	}
-	
-	public void testFail8() throws Exception{
-		helper1();
-	}
-	
-	public void testFail9() throws Exception{
-		helper1();
-	}
-	
-	public void testFail10() throws Exception{
-		helper1();
-	}
-	
-	public void testFail11() throws Exception{
-		helper1();
-	}
-	
-	public void testFail12() throws Exception{
-		helper1();
-	}	
-	
-	public void testFail13() throws Exception{
-		//printTestDisabledMessage("1GKZ8J6: ITPJCORE:WIN2000 - search: missing field occurrecnces");
-		helper1();
-	}
-	
-	public void testFail14() throws Exception{
-		//printTestDisabledMessage("1GKZ8J6: ITPJCORE:WIN2000 - search: missing field occurrecnces");
-		helper1();
-	}
-	
-	// ------ 
-	public void test0() throws Exception{
-		helper2();
-	}
-	
-	public void test1() throws Exception{
-		helper2();
-	}
-	
-	public void test2() throws Exception{
-		helper2();
-	}
-	
-	public void test3() throws Exception{
-		helper2();
-	}
-	
-	public void test4() throws Exception{
-		helper2();
-		//printTestDisabledMessage("1GKZ8J6: ITPJCORE:WIN2000 - search: missing field occurrecnces");
-	}
-
-	public void test5() throws Exception{
-		helper2();
-	}
-	
-	public void test6() throws Exception{
-		//printTestDisabledMessage("1GKB9YH: ITPJCORE:WIN2000 - search for field refs - incorrect results");
-		helper2();
-	}
-
-	public void test7() throws Exception{
-		helper2();
-	}
-	
-	public void test8() throws Exception{
-		//printTestDisabledMessage("1GD79XM: ITPJCORE:WINNT - Search - search for field references - not all found");
-		helper2();
-	}
-	
-	public void test9() throws Exception{
-		helper2();
-	}
-	
-	public void test10() throws Exception{
-		helper2();
-	}
-	
-	public void test11() throws Exception{
-		helper2();
-	}
-	
-	public void test12() throws Exception{
-		//System.out.println("\nRenameNonPrivateField::" + name() + " disabled (1GIHUQP: ITPJCORE:WINNT - search for static field should be more accurate)");
-		helper2();
-	}
-	
-	public void test13() throws Exception{
-		//System.out.println("\nRenameNonPrivateField::" + name() + " disabled (1GIHUQP: ITPJCORE:WINNT - search for static field should be more accurate)");
-		helper2();
-	}
-	
-	public void test14() throws Exception{
-		helper2(false);
-	}
-	
-	public void test15() throws Exception{
-		helper2(false);
-	}
-
-	public void test16() throws Exception{
-//		printTestDisabledMessage("text for bug 20693");
-		helper2();
-	}
-	
-	public void test17() throws Exception{
-//		printTestDisabledMessage("text for bug 66250 ");
-		helper2("f", "g", false, true);
-	}
-	
-	public void testBug5821() throws Exception{
-		helper2("test", "test1");
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePackageTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePackageTests.java
deleted file mode 100644
index b594ef7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePackageTests.java
+++ /dev/null

@@ -1,634 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenamePackageProcessor;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.DebugUtils;
-
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.MoveArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-
-public class RenamePackageTests extends RefactoringTest {
-	private static final boolean BUG_6054= true;
-	private static final boolean BUG_54962_71267= false;
-	
-	private static final Class clazz= RenamePackageTests.class;
-	private static final String REFACTORING_PATH= "RenamePackage/";
-	
-	private boolean fUpdateTextualMatches;
-	
-	public RenamePackageTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fUpdateTextualMatches= false;
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	// -------------
-	private RenameRefactoring createRefactoring(IPackageFragment pack, String newName) throws CoreException {
-		RenamePackageProcessor processor= new RenamePackageProcessor(pack);
-		RenameRefactoring result= new RenameRefactoring(processor);
-		processor.setNewElementName(newName);
-		return result;
-	}
-
-	/* non java-doc
-	 * the 0th one is the one to rename
-	 */
-	private void helper1(String packageNames[], String[][] packageFiles, String newPackageName) throws Exception{
-		try{
-			IPackageFragment[] packages= new IPackageFragment[packageNames.length];
-			for (int i= 0; i < packageFiles.length; i++){
-				packages[i]= getRoot().createPackageFragment(packageNames[i], true, null);
-				for (int j= 0; j < packageFiles[i].length; j++){
-					createCUfromTestFile(packages[i], packageFiles[i][j], packageNames[i].replace('.', '/') + "/");
-					//DebugUtils.dump(cu.getElementName() + "\n" + cu.getSource());
-				}	
-			}
-			IPackageFragment thisPackage= packages[0];
-			Refactoring ref= createRefactoring(thisPackage, newPackageName);
-			RefactoringStatus result= performRefactoring(ref);
-			assertNotNull("precondition was supposed to fail", result);
-			if (fIsVerbose)
-				DebugUtils.dump("" + result);
-		} finally{		
-			performDummySearch();
-		
-			for (int i= 0; i < packageNames.length; i++){
-				IPackageFragment pack= getRoot().getPackageFragment(packageNames[i]);
-				if (pack.exists())
-					pack.delete(true, null);
-			}	
-		}	
-	}
-	
-	/* non java-doc
-	 * the 0th one is the one to rename
-	 */
-	private void helper1(String[] packageNames, String newPackageName) throws Exception{
-		try{
-			IPackageFragment[] packages= new IPackageFragment[packageNames.length];
-			for (int i= 0; i < packageNames.length; i++){
-				packages[i]= getRoot().createPackageFragment(packageNames[i], true, null);
-			}
-			IPackageFragment thisPackage= packages[0];
-			Refactoring ref= createRefactoring(thisPackage, newPackageName);
-			RefactoringStatus result= performRefactoring(ref);
-			assertNotNull("precondition was supposed to fail", result);
-			if (fIsVerbose)
-				DebugUtils.dump("" + result);
-		} finally{		
-			performDummySearch();	
-			
-			for (int i= 0; i < packageNames.length; i++){
-				IPackageFragment pack= getRoot().getPackageFragment(packageNames[i]);
-				if (pack.exists())
-					pack.delete(true, null);
-			}		
-		}	
-	}
-	
-	private void helper1() throws Exception{
-		helper1(new String[]{"r"}, new String[][]{{"A"}}, "p1");
-	}
-	
-	private void helper2(String[] packageNames, String[][] packageFileNames, String newPackageName, boolean updateReferences) throws Exception{
-		try{
-			ParticipantTesting.reset();
-			IPackageFragment[] packages= new IPackageFragment[packageNames.length];
-			ICompilationUnit[][] cus= new ICompilationUnit[packageFileNames.length][packageFileNames[0].length];
-			for (int i= 0; i < packageNames.length; i++){
-				packages[i]= getRoot().createPackageFragment(packageNames[i], true, null);
-				for (int j= 0; j < packageFileNames[i].length; j++){
-					cus[i][j]= createCUfromTestFile(packages[i], packageFileNames[i][j], packageNames[i].replace('.', '/') + "/");
-				}
-			}
-			IPackageFragment thisPackage= packages[0];
-			
-			IPath path= thisPackage.getParent().getPath();
-			path= path.append(newPackageName.replace('.', '/'));
-			IFolder target= ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
-			String[] createHandles= ParticipantTesting.createHandles(target);
-			boolean targetExists= target.exists();
-			
-			IFolder source= (IFolder)thisPackage.getResource();
-			String[] deleteHandles= ParticipantTesting.createHandles(source);
-			IResource members[]= source.members();
-			List movedObjects= new ArrayList();
-			boolean doDelete= true;
-			for (int i= 0; i < members.length; i++) {
-				if (members[i] instanceof IFolder) {
-					doDelete= false;
-				} else {
-					movedObjects.add(members[i]);
-				}
-			}
-			String[] moveHandles= ParticipantTesting.createHandles(movedObjects.toArray());
-			String[] renameHandles= ParticipantTesting.createHandles(thisPackage);
-			RenameRefactoring ref= createRefactoring(thisPackage, newPackageName);
-			((RenamePackageProcessor)ref.getProcessor()).setUpdateReferences(updateReferences);
-			((RenamePackageProcessor) ref.getProcessor()).setUpdateTextualMatches(fUpdateTextualMatches);
-			RefactoringStatus result= performRefactoring(ref);
-			assertEquals("preconditions were supposed to pass", null, result);
-			
-			ParticipantTesting.testRename(renameHandles,
-				new RenameArguments[] {
-					new RenameArguments(newPackageName, updateReferences)});
-			
-			if (!targetExists) {
-				ParticipantTesting.testCreate(createHandles);
-			} else {
-				ParticipantTesting.testCreate(new String[0]);
-			}
-			
-			List args= new ArrayList();
-			for (int i= 0; i < packageFileNames[0].length; i++) {
-				args.add(new MoveArguments(target, updateReferences));
-			}
-			ParticipantTesting.testMove(moveHandles, (MoveArguments[]) args.toArray(new MoveArguments[args.size()]));
-			
-			if (doDelete) {
-				ParticipantTesting.testDelete(deleteHandles);
-			} else {
-				ParticipantTesting.testDelete(new String[0]);
-			}
-			
-			//---
-			
-			assertTrue("package not renamed", ! getRoot().getPackageFragment(packageNames[0]).exists());
-			IPackageFragment newPackage= getRoot().getPackageFragment(newPackageName);
-			assertTrue("new package does not exist", newPackage.exists());
-			
-			for (int i= 0; i < packageFileNames.length; i++){
-				String packageName= (i == 0) 
-								? newPackageName.replace('.', '/') + "/"
-								: packageNames[i].replace('.', '/') + "/";
-				for (int j= 0; j < packageFileNames[i].length; j++){
-					String s1= getFileContents(getOutputTestFileName(packageFileNames[i][j], packageName));
-					ICompilationUnit cu= 
-						(i == 0) 
-							? newPackage.getCompilationUnit(packageFileNames[i][j] + ".java")
-							: cus[i][j];
-					//DebugUtils.dump("cu:" + cu.getElementName());		
-					String s2= cu.getSource();
-					
-					//DebugUtils.dump("expected:" + s1);
-					//DebugUtils.dump("was:" + s2);
-					assertEqualLines("invalid update in file " + cu.getElementName(), s1,	s2);
-				}
-			}
-		} finally{
-			performDummySearch();
-			try {
-				getRoot().getPackageFragment(newPackageName).delete(true, null);
-				for (int i= 1; i < packageNames.length; i++) {
-					getRoot().getPackageFragment(packageNames[i]).delete(true, null);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}	
-		}	
-	}
-	
-	private void helper2(String[] packageNames, String[][] packageFileNames, String newPackageName) throws Exception{
-		helper2(packageNames, packageFileNames, newPackageName, true);
-	}
-	
-	/**
-	 * Custom project and source folder structure.
-	 * @param roots source folders
-	 * @param packageNames package names per root
-	 * @param newPackageName the new package name for packageNames[0][0]
-	 * @param cuNames cu names per package
-	 * @throws Exception
-	 */
-	private void helperMultiProjects(IPackageFragmentRoot[] roots, String[][] packageNames, String newPackageName, String[][][] cuNames) throws Exception{
-		ICompilationUnit[][][] cus=new ICompilationUnit[roots.length][][]; 
-		IPackageFragment thisPackage= null;
-
-		for (int r= 0; r < roots.length; r++) {
-			IPackageFragment[] packages= new IPackageFragment[packageNames[r].length];
-			cus[r]= new ICompilationUnit[packageNames[r].length][];
-			for (int pa= 0; pa < packageNames[r].length; pa++){
-				packages[pa]= roots[r].createPackageFragment(packageNames[r][pa], true, null);
-				cus[r][pa]= new ICompilationUnit[cuNames[r][pa].length];
-				if (r == 0 && pa == 0)
-					thisPackage= packages[pa];
-				for (int typ= 0; typ < cuNames[r][pa].length; typ++){
-					cus[r][pa][typ]= createCUfromTestFile(packages[pa], cuNames[r][pa][typ],
-							roots[r].getElementName() + "/" + packageNames[r][pa].replace('.', '/') + "/");
-				}
-			}
-		}
-		
-		RenameRefactoring ref= createRefactoring(thisPackage, newPackageName);
-		((RenamePackageProcessor) ref.getProcessor()).setUpdateReferences(true);
-		((RenamePackageProcessor) ref.getProcessor()).setUpdateTextualMatches(fUpdateTextualMatches);
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("preconditions were supposed to pass", null, result);
-		
-		assertTrue("package not renamed", ! roots[0].getPackageFragment(packageNames[0][0]).exists());
-		IPackageFragment newPackage= roots[0].getPackageFragment(newPackageName);
-		assertTrue("new package does not exist", newPackage.exists());
-		
-		for (int r = 0; r < cuNames.length; r++) {
-			for (int pa= 0; pa < cuNames[r].length; pa++){
-				String packageName= roots[r].getElementName() + "/"	+ 
-						((r == 0 && pa == 0) ? newPackageName : packageNames[r][pa]).replace('.', '/') + "/";
-				for (int typ= 0; typ < cuNames[r][pa].length; typ++){
-					String s1= getFileContents(getOutputTestFileName(cuNames[r][pa][typ], packageName));
-					ICompilationUnit cu= (r == 0 && pa == 0)
-							? newPackage.getCompilationUnit(cuNames[r][pa][typ] + ".java")
-							: cus[r][pa][typ];
-					//DebugUtils.dump("cu:" + cu.getElementName());		
-					String s2= cu.getSource();
-					
-					//DebugUtils.dump("expected:" + s1);
-					//DebugUtils.dump("was:" + s2);
-					assertEqualLines("invalid update in file " + cu.toString(), s1,	s2);
-				}
-			}
-		}
-	}
-		
-	/**
-	 * 2 Projects with a root each:
-	 * Project RenamePack2 (root: srcTest) requires project RenamePack1 (root: srcPrg).
-	 * @param packageNames package names per root
-	 * @param newPackageName the new package name for packageNames[0][0]
-	 * @param cuNames cu names per package
-	 * @throws Exception
-	 */
-	private void helperProjectsPrgTest(String[][] packageNames, String newPackageName, String[][][] cuNames) throws Exception{
-		IJavaProject projectPrg= null;
-		IJavaProject projectTest= null;
-		try {
-			projectPrg= JavaProjectHelper.createJavaProject("RenamePack1", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(projectPrg));
-			IPackageFragmentRoot srcPrg= JavaProjectHelper.addSourceContainer(projectPrg, "srcPrg");
-
-			projectTest= JavaProjectHelper.createJavaProject("RenamePack2", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(projectTest));
-			IPackageFragmentRoot srcTest= JavaProjectHelper.addSourceContainer(projectTest, "srcTest");
-
-			JavaProjectHelper.addRequiredProject(projectTest, projectPrg);
-
-			helperMultiProjects(new IPackageFragmentRoot[] { srcPrg, srcTest }, packageNames, newPackageName, cuNames);
-		} finally {
-			JavaProjectHelper.delete(projectPrg);
-			JavaProjectHelper.delete(projectTest);
-		}
-	}
-	
-	/*
-	 * Multiple source folders in the same project.
-	 * @param newPackageName the new package name for packageNames[0][0]
-	 */
-	private void helperMultiRoots(String[] rootNames, String[][] packageNames, String newPackageName, String[][][] typeNames) throws Exception{
-		IPackageFragmentRoot[] roots= new IPackageFragmentRoot[rootNames.length];
-		try {
-			for (int r= 0; r < roots.length; r++)
-				roots[r]= JavaProjectHelper.addSourceContainer(getRoot().getJavaProject(), rootNames[r]);
-			helperMultiProjects(roots, packageNames, newPackageName, typeNames);
-		} catch (CoreException e) {
-		}
-		for (int r= 0; r < roots.length; r++)
-			JavaProjectHelper.removeSourceContainer(getRoot().getJavaProject(), rootNames[r]);
-	}
-
-	// ---------- tests -------------	
-	public void testFail0() throws Exception{
-		helper1(new String[]{"r"}, new String[][]{{"A"}}, "9");
-	}
-	
-	public void testFail1() throws Exception{
-		printTestDisabledMessage("needs revisiting");
-		//helper1(new String[]{"r.p1"}, new String[][]{{"A"}}, "r");
-	}
-	
-	public void testFail2() throws Exception{
-		helper1(new String[]{"r.p1", "fred"}, "fred");
-	}	
-	
-	public void testFail3() throws Exception{
-		helper1(new String[]{"r"}, new String[][]{{"A"}}, "fred");
-	}
-	
-	public void testFail4() throws Exception{
-		helper1();
-	}
-	
-	public void testFail5() throws Exception{
-		helper1();
-	}
-	
-	public void testFail6() throws Exception{
-		helper1();
-	}
-	
-	public void testFail7() throws Exception{
-		//printTestDisabledMessage("1GK90H4: ITPJCORE:WIN2000 - search: missing package reference");
-		printTestDisabledMessage("corner case - name obscuring");
-//		helper1(new String[]{"r", "p1"}, new String[][]{{"A"}, {"A"}}, "fred");
-	}
-	
-	public void testFail8() throws Exception{
-		printTestDisabledMessage("corner case - name obscuring");
-//		helper1(new String[]{"r", "p1"}, new String[][]{{"A"}, {"A"}}, "fred");
-	}
-	
-	//native method used r.A as a paramter
-	public void testFail9() throws Exception{
-		printTestDisabledMessage("corner case - qualified name used  as a paramter of a native method");
-		//helper1(new String[]{"r", "p1"}, new String[][]{{"A"}, {"A"}}, "fred");
-	}
-	
-	public void testFail10() throws Exception{
-		helper1(new String[]{"r.p1", "r"}, new String[][]{{"A"}, {"A"}}, "r");
-	}
-
-	public void testFail11() throws Exception{
-		helper1(new String[]{"q.p1", "q", "r.p1"}, new String[][]{{"A"}, {"A"}, {}}, "r.p1");
-	}
-	
-	//-------
-	public void test0() throws Exception{
-		if (BUG_54962_71267) {
-			printTestDisabledMessage("bugs 54962, 71267");
-			return;
-		}
-		helper2(new String[]{"r"}, new String[][]{{"A"}}, "p1");
-	}
-	
-	public void test1() throws Exception{
-		helper2(new String[]{"r"}, new String[][]{{"A"}}, "p1");
-	}
-	
-	public void test2() throws Exception{
-		helper2(new String[]{"r", "fred"}, new String[][]{{"A"}, {"A"}}, "p1");
-	}
-	
-	public void test3() throws Exception{
-		helper2(new String[]{"fred", "r.r"}, new String[][]{{"A"}, {"B"}}, "r");
-	}
-	
-	public void test4() throws Exception{
-		helper2(new String[]{"r.p1", "r"}, new String[][]{{"A"}, {"A"}}, "q");
-	}
-	
-	public void test5() throws Exception{
-		helper2(new String[]{"r"}, new String[][]{{"A"}}, "p1", false);
-	}
-	
-	public void test6() throws Exception{ //bug 66250
-		fUpdateTextualMatches= true;
-		helper2(new String[]{"r"}, new String[][]{{"A"}}, "p1", false);
-	}
-	
-	public void testReadOnly() throws Exception{
-		if (BUG_6054) {
-			printTestDisabledMessage("see bug#6054 (renaming a read-only package resets the read-only flag)");
-			return;
-		}
-		
-		String[] packageNames= new String[]{"r"};
-		String[][] packageFileNames= new String[][]{{"A"}};
-		String newPackageName= "p1";
-		IPackageFragment[] packages= new IPackageFragment[packageNames.length];
-
-		ICompilationUnit[][] cus= new ICompilationUnit[packageFileNames.length][packageFileNames[0].length];
-		for (int i= 0; i < packageNames.length; i++){
-			packages[i]= getRoot().createPackageFragment(packageNames[i], true, null);
-			for (int j= 0; j < packageFileNames[i].length; j++){
-				cus[i][j]= createCUfromTestFile(packages[i], packageFileNames[i][j], packageNames[i].replace('.', '/') + "/");
-			}
-		}
-		IPackageFragment thisPackage= packages[0];
-		thisPackage.getCorrespondingResource().setReadOnly(true);
-		RenameRefactoring ref= createRefactoring(thisPackage, newPackageName);
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("preconditions were supposed to pass", null, result);
-		
-		assertTrue("package not renamed", ! getRoot().getPackageFragment(packageNames[0]).exists());
-		IPackageFragment newPackage= getRoot().getPackageFragment(newPackageName);
-		assertTrue("new package does not exist", newPackage.exists());
-		assertTrue("new package should be read-only", newPackage.getCorrespondingResource().isReadOnly());
-	}
-	
-	public void testImportFromMultiRoots1() throws Exception {
-		fUpdateTextualMatches= true;
-		helperProjectsPrgTest(
-			new String[][] {
-				new String[] { "p.p" }, new String[] { "p.p", "tests" }
-				},
-			"q",
-			new String[][][] {
-				new String[][] { new String[] { "A" }},
-				new String[][] { new String[] { "ATest" }, new String[] { "AllTests" }}
-		});
-	}
-	
-	public void testImportFromMultiRoots2() throws Exception {
-		helperProjectsPrgTest(
-				new String[][] {
-							new String[]{"p.p"},
-							new String[]{"p.p", "tests"}
-							},
-			"q",
-			new String[][][] {
-							  new String[][] {new String[]{"A"}},
-							  new String[][] {new String[]{"ATest", "TestHelper"}, new String[]{"AllTests", "QualifiedTests"}}
-							  }
-			);
-	}
-
-	public void testImportFromMultiRoots3() throws Exception {
-		helperMultiRoots(new String[]{"srcPrg", "srcTest"}, 
-			new String[][] {
-							new String[]{"p.p"},
-							new String[]{"p.p"}
-							},
-			"q",
-			new String[][][] {
-							  new String[][] {new String[]{"ToQ"}},
-							  new String[][] {new String[]{"Ref"}}
-							  }
-			);
-	}
-
-	public void testImportFromMultiRoots4() throws Exception {
-		//circular buildpath references
-		IJavaProject projectPrg= null;
-		IJavaProject projectTest= null;
-		Hashtable options= JavaCore.getOptions();
-		Object cyclicPref= JavaCore.getOption(JavaCore.CORE_CIRCULAR_CLASSPATH);
-		try {
-			projectPrg= JavaProjectHelper.createJavaProject("RenamePack1", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(projectPrg));
-			IPackageFragmentRoot srcPrg= JavaProjectHelper.addSourceContainer(projectPrg, "srcPrg");
-
-			projectTest= JavaProjectHelper.createJavaProject("RenamePack2", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(projectTest));
-			IPackageFragmentRoot srcTest= JavaProjectHelper.addSourceContainer(projectTest, "srcTest");
-
-			options.put(JavaCore.CORE_CIRCULAR_CLASSPATH, JavaCore.WARNING);
-			JavaCore.setOptions(options);
-			JavaProjectHelper.addRequiredProject(projectTest, projectPrg);
-			JavaProjectHelper.addRequiredProject(projectPrg, projectTest);
-			
-			helperMultiProjects(new IPackageFragmentRoot[] {srcPrg, srcTest},
-				new String[][] {
-						new String[]{"p"},
-						new String[]{"p"}
-				},
-				"a.b.c",
-				new String[][][] {
-						new String[][] {new String[]{"A", "B"}},
-						new String[][] {new String[]{"ATest"}}
-				}
-			);
-		} finally {
-			options.put(JavaCore.CORE_CIRCULAR_CLASSPATH, cyclicPref);
-			JavaCore.setOptions(options);	
-			JavaProjectHelper.delete(projectPrg);
-			JavaProjectHelper.delete(projectTest);
-		}
-	}
-	
-	public void testImportFromMultiRoots5() throws Exception {
-		//rename srcTest-p.p to q => ATest now must import p.p.A
-		IJavaProject projectPrg= null;
-		IJavaProject projectTest= null;
-		try {
-			projectPrg= JavaProjectHelper.createJavaProject("RenamePack1", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(projectPrg));
-			IPackageFragmentRoot srcPrg= JavaProjectHelper.addSourceContainer(projectPrg, "srcPrg");
-
-			projectTest= JavaProjectHelper.createJavaProject("RenamePack2", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(projectTest));
-			IPackageFragmentRoot srcTest= JavaProjectHelper.addSourceContainer(projectTest, "srcTest");
-
-			JavaProjectHelper.addRequiredProject(projectTest, projectPrg);
-
-			helperMultiProjects(new IPackageFragmentRoot[] { srcTest, srcPrg },
-				new String[][] {
-					new String[] {"p.p"}, new String[] {"p.p"}
-				},
-				"q",
-				new String[][][] {
-					new String[][] {new String[] {"ATest"}},
-					new String[][] {new String[] {"A"}}
-				}
-			);
-		} finally {
-			JavaProjectHelper.delete(projectPrg);
-			JavaProjectHelper.delete(projectTest);
-		}
-		
-	}
-	
-	public void testImportFromMultiRoots6() throws Exception {
-		//rename srcTest-p.p to a.b.c => ATest must retain import p.p.A
-		helperMultiRoots(new String[]{"srcTest", "srcPrg"}, 
-				new String[][] {
-								new String[]{"p.p"},
-								new String[]{"p.p"}
-								},
-				"cheese",
-				new String[][][] {
-								  new String[][] {new String[]{"ATest"}},
-								  new String[][] {new String[]{"A"}}
-								  }
-		);
-	}
-
-	public void testImportFromMultiRoots7() throws Exception {
-		IJavaProject prj= null;
-		IJavaProject prjRef= null;
-		IJavaProject prjOther= null;
-		try {
-			prj= JavaProjectHelper.createJavaProject("prj", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(prj));
-			IPackageFragmentRoot srcPrj= JavaProjectHelper.addSourceContainer(prj, "srcPrj"); //$NON-NLS-1$
-
-			prjRef= JavaProjectHelper.createJavaProject("prj.ref", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(prjRef));
-			IPackageFragmentRoot srcPrjRef= JavaProjectHelper.addSourceContainer(prjRef, "srcPrj.ref"); //$NON-NLS-1$
-
-			prjOther= JavaProjectHelper.createJavaProject("prj.other", "bin");
-			assertNotNull(JavaProjectHelper.addRTJar(prjOther));
-			IPackageFragmentRoot srcPrjOther= JavaProjectHelper.addSourceContainer(prjRef, "srcPrj.other"); //$NON-NLS-1$
-
-			JavaProjectHelper.addRequiredProject(prjRef, prj);
-			JavaProjectHelper.addRequiredProject(prjRef, prjOther);
-
-			helperMultiProjects(
-				new IPackageFragmentRoot[] { srcPrj, srcPrjRef, srcPrjOther },
-				new String[][] {
-					new String[] {"pack"},
-					new String[] {"pack", "pack.man"},
-					new String[] {"pack"}
-				},
-				"com.packt",
-				new String[][][] {
-					new String[][] {new String[] {"DingsDa"}},
-					new String[][] {new String[] {"Referer"}, new String[] {"StarImporter"}},
-					new String[][] {new String[] {"Namesake"}}
-				}
-			);
-		} finally {
-			JavaProjectHelper.delete(prj);
-			JavaProjectHelper.delete(prjRef);
-			JavaProjectHelper.delete(prjOther);
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameParametersTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameParametersTests.java
deleted file mode 100644
index 68d6cee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameParametersTests.java
+++ /dev/null

@@ -1,361 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo;
-import org.eclipse.jdt.internal.corext.refactoring.structure.ChangeSignatureRefactoring;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class RenameParametersTests extends RefactoringTest{
-	
-	private static final Class clazz= RenameParametersTests.class;
-	private static final String REFACTORING_PATH= "RenameParameters/";
-	
-	public RenameParametersTests(String name){
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	private String getSimpleTestFileName(boolean canRename, boolean input){
-		String fileName = "A_" + getName();
-		if (canRename)
-			fileName += input ? "_in": "_out";
-		return fileName + ".java"; 
-	}
-	
-	private String getTestFileName(boolean canRename, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += (canRename ? "canRename/": "cannotRename/");
-		return fileName + getSimpleTestFileName(canRename, input);
-	}
-	
-	//------------
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean canRename, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(canRename, input), getFileContents(getTestFileName(canRename, input)));
-	}
-	
-	private void helper1(String[] newNames, String[] signature) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		IType classA= getType(cu, "A");
-		IMethod method= classA.getMethod("m", signature);
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-		//ref.setUpdateReferences(updateReferences);
-		//ref.setNewParameterNames(newNames);
-		//ref.setNewNames(createRenamings(method, newNames));
-		modifyInfos(ref.getParameterInfos(), newNames);
-		
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("precondition was supposed to pass", null, result);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		assertEquals("invalid renaming", getFileContents(getTestFileName(true, false)).length(), newcu.getSource().length());
-		assertEqualLines("invalid renaming", getFileContents(getTestFileName(true, false)), newcu.getSource());
-	}
-	
-	private void helper2(String[] newNames, String[] signature) throws Exception{
-		IType classA= getType(createCUfromTestFile(getPackageP(), false, false), "A");
-		//DebugUtils.dump("classA" + classA);
-		IMethod method= classA.getMethod("m", signature);
-		ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method);
-		modifyInfos(ref.getParameterInfos(), newNames);
-		
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);		
-	}
-
-	private void modifyInfos(List list, String[] newNames) {
-		int i= 0;
-		for (Iterator iter= list.iterator(); iter.hasNext(); i++) {
-			ParameterInfo info= (ParameterInfo) iter.next();
-			info.setNewName(newNames[i]);
-		}
-	}
-
-	
-	public void test0() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test1() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test2() throws Exception{
-		helper1(new String[]{"j", "k"}, new String[]{"I", "I"});
-	}
-	
-	public void test3() throws Exception{
-		helper1(new String[]{"j", "j1"}, new String[]{"I", "I"});
-	}
-	
-	public void test4() throws Exception{
-		helper1(new String[]{"k"}, new String[]{"QA;"});
-	}
-	
-	public void test5() throws Exception{
-		helper1(new String[]{"k"}, new String[]{"I"});
-	}
-	
-	public void test6() throws Exception{
-		helper1(new String[]{"k"}, new String[]{"I"});
-	}
-	
-	public void test7() throws Exception{
-		helper1(new String[]{"k"}, new String[]{"QA;"});
-	}
-	
-	public void test8() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test9() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test10() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test11() throws Exception{
-		printTestDisabledMessage("revisit in the context of anonymous types in type hierarchies");
-		// helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test12() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-
-	public void test13() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test14() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"QA;"});
-	}
-
-	public void test15() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}
-
-	public void test16() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-
-	public void test17() throws Exception{
-		helper1(new String[]{"j", "i", "k"}, new String[]{"I", "I", "I"});
-	}
-
-	public void test18() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"QObject;"});
-	}
-	
-	public void test19() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"QA;"});
-	}
-
-	public void test20() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"Qi;"});
-	}
-	
-	public void test21() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}	
-	
-	public void test22() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test23() throws Exception{
-		helper1(new String[]{"j", "i"}, new String[]{"I", "I"});
-	}	
-	
-	public void test24() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void test25() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}	
-	
-	public void test26() throws Exception{
-		printTestDisabledMessage("revisit in the context of anonymous types in type hierarchies");
-		//helper1(new String[]{"j"}, new String[]{"I"});
-	}
-
-//removed - see testFail21	
-//	public void test27() throws Exception{
-//		helper1(new String[]{"j"}, new String[]{"I"});
-//	}	
-	
-	public void test28() throws Exception{
-		helper1(new String[]{"j"}, new String[]{"[I"});
-	}		
-	
-	public void test29() throws Exception{
-		helper1(new String[]{"b"}, new String[]{"QA;"});
-	}
-
-	public void test30() throws Exception{
-		helper1(new String[]{"i", "k"}, new String[]{"I", "I"});
-	}	
-	
-	public void test31() throws Exception{
-		helper1(new String[]{"kk", "j"}, new String[]{"I", "I"});
-	}	
-	
-	public void test32() throws Exception{
-		printTestDisabledMessage("must do - constructor params");
-	}
-	
-	public void test33() throws Exception{
-		printTestDisabledMessage("revisit - removed the 'no ref update' option");
-//		helper1(new String[]{"b"}, new String[]{"QA;"}, false);
-	}
-	
-	public void test34() throws Exception{
-//		printTestDisabledMessage("regression test for bug#9001");
-		helper1(new String[]{"test2"}, new String[]{"Z"});
-	}
-	
-	public void test35() throws Exception{
-		printTestDisabledMessage("regression test for bug#6224");
-//		helper1(new String[]{"j"}, new String[]{"I"});
-	}	
-
-	public void test36() throws Exception{
-//		printTestDisabledMessage("regression test for bug#21163");
-		helper1(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	// -----
-	
-	public void testFail0() throws Exception{
-		printTestDisabledMessage("must fix - name collision with an instance var");
-//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail1() throws Exception{
-		helper2(new String[0], new String[0]);
-	}
-	
-	public void testFail2() throws Exception{
-		helper2(new String[]{"i", "i"}, new String[]{"I", "I"});
-	}
-	
-	public void testFail3() throws Exception{
-		helper2(new String[]{"i", "9"}, new String[]{"I", "I"});
-	}
-	
-	public void testFail4() throws Exception{
-		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail5() throws Exception{
-		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail6() throws Exception{
-		printTestDisabledMessage("must fix - name collision with an instance var");
-//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail7() throws Exception{
-		printTestDisabledMessage("waiting for better conflict detection story from DB");
-//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail8() throws Exception{
-		printTestDisabledMessage("waiting for better conflict detection story from DB");
-//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail9() throws Exception{
-		printTestDisabledMessage("waiting for better conflict detection story from DB");
-//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail10() throws Exception{
-		helper2(new String[]{"j", "j"}, new String[]{"I", "I"});
-	}
-	
-	public void testFail11() throws Exception{
-		helper2(new String[]{"j", "j"}, new String[]{"I", "I"});
-	}
-	
-	public void testFail12() throws Exception{
-		printTestDisabledMessage("waiting for better conflict detection story from DB");
-		//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail13() throws Exception{
-		printTestDisabledMessage("waiting for better conflict detection story from DB");
-//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail14() throws Exception{
-		printTestDisabledMessage("waiting for better conflict detection story from DB");
-//		helper2(new String[]{"j"}, new String[]{"QA;"});
-	}
-	
-	public void testFail15() throws Exception{
-		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail16() throws Exception{
-		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail17() throws Exception{
-		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail18() throws Exception{
-		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail19() throws Exception{
-		printTestDisabledMessage("waiting for better conflict detection story from DB");
-//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-
-	public void testFail20() throws Exception{
-		printTestDisabledMessage("waiting for better conflict detection story from DB");
-//		helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-	public void testFail21() throws Exception{
-		printTestDisabledMessage("Disabled since 1.4 compliance level doesn't produce error message");
-		// helper2(new String[]{"j"}, new String[]{"I"});
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePrivateFieldTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePrivateFieldTests.java
deleted file mode 100644
index c0fa366..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePrivateFieldTests.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameFieldProcessor;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenamePrivateFieldTests extends RefactoringTest {
-
-	private static final Class clazz= RenamePrivateFieldTests.class;
-	private static final String REFACTORING_PATH= "RenamePrivateField/";
-
-	private Object fPrefixPref;
-	public RenamePrivateFieldTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup( new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}	
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		Hashtable options= JavaCore.getOptions();
-		fPrefixPref= options.get(JavaCore.CODEASSIST_FIELD_PREFIXES);
-		options.put(JavaCore.CODEASSIST_FIELD_PREFIXES, getPrefixes());
-		JavaCore.setOptions(options);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		Hashtable options= JavaCore.getOptions();
-		options.put(JavaCore.CODEASSIST_FIELD_PREFIXES, fPrefixPref);
-		JavaCore.setOptions(options);	
-	}
-
-	private String getPrefixes(){
-		return "f";
-	}
-	
-	private void helper1_0(String fieldName, String newFieldName, String typeName,
-							boolean renameGetter, boolean renameSetter) throws Exception{
-		IType declaringType= getType(createCUfromTestFile(getPackageP(), "A"), typeName);
-		RenameFieldProcessor processor= new RenameFieldProcessor(declaringType.getField(fieldName));
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName(newFieldName);
-		processor.setRenameGetter(renameGetter);
-		processor.setRenameSetter(renameSetter);
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	private void helper1_0(String fieldName, String newFieldName) throws Exception{
-		helper1_0(fieldName, newFieldName, "A", false, false);
-	}
-
-	private void helper1() throws Exception{
-		helper1_0("f", "g");
-	}
-	
-	//--
-		
-	private void helper2(String fieldName, String newFieldName, boolean updateReferences, boolean updateTextualMatches,
-											boolean renameGetter, boolean renameSetter,
-											boolean expectedGetterRenameEnabled, boolean expectedSetterRenameEnabled) throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-		IField field= classA.getField(fieldName);
-		RenameFieldProcessor processor= new RenameFieldProcessor(field);
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setUpdateReferences(updateReferences);
-		processor.setUpdateTextualMatches(updateTextualMatches);
-		assertEquals("getter rename enabled", expectedGetterRenameEnabled, processor.canEnableGetterRenaming() == null);
-		assertEquals("setter rename enabled", expectedSetterRenameEnabled, processor.canEnableSetterRenaming() == null);
-		processor.setRenameGetter(renameGetter);
-		processor.setRenameSetter(renameSetter);
-		processor.setNewElementName(newFieldName);
-		String newGetterName= processor.getNewGetterName();
-		String newSetterName= processor.getNewSetterName();
-
-		int numbers= 1;
-		List elements= new ArrayList();
-		elements.add(field);
-		List args= new ArrayList();
-		args.add(new RenameArguments(newFieldName, updateReferences));
-		if (renameGetter && expectedGetterRenameEnabled) {
-			elements.add(processor.getGetter());
-			args.add(new RenameArguments(newGetterName, updateReferences));
-			numbers++;
-		}
-		if (renameSetter && expectedSetterRenameEnabled) {
-			elements.add(processor.getSetter());
-			args.add(new RenameArguments(newSetterName, updateReferences));
-			numbers++;
-		}
-		String[] renameHandles= ParticipantTesting.createHandles(elements.toArray());
-		
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertEquals("was supposed to pass", null, result);
-		assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName("A")), cu.getSource());
-
-		ParticipantTesting.testRename(
-			renameHandles, 
-			(RenameArguments[]) args.toArray(new RenameArguments[args.size()]));
-		
-		assertTrue("anythingToUndo", RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("! anythingToRedo", !RefactoringCore.getUndoManager().anythingToRedo());
-		
-		RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-		assertEqualLines("invalid undo", getFileContents(getInputTestFileName("A")), cu.getSource());
-
-		assertTrue("! anythingToUndo", !RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("anythingToRedo", RefactoringCore.getUndoManager().anythingToRedo());
-		
-		RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-		assertEqualLines("invalid redo", getFileContents(getOutputTestFileName("A")), cu.getSource());
-	}
-
-	private void helper2(boolean updateReferences) throws Exception{
-		helper2("f", "g", updateReferences, false, false, false, false, false);
-	}
-	
-	private void helper2() throws Exception{
-		helper2(true);
-	}
-
-	//--------- tests ----------	
-	public void testFail0() throws Exception{
-		helper1();
-	}
-	
-	public void testFail1() throws Exception{
-		helper1();
-	}
-	
-	public void testFail2() throws Exception{
-		helper1();
-	}
-	
-	public void testFail3() throws Exception{
-		helper1();
-	}
-	
-	public void testFail4() throws Exception{
-		helper1();
-	}
-	
-	public void testFail5() throws Exception{
-		helper1();
-	}	
-	
-	public void testFail6() throws Exception{
-		helper1();
-	}
-	
-	public void testFail7() throws Exception{
-		helper1();
-	}
-	
-	public void testFail8() throws Exception{
-		helper1_0("gg", "f", "A", false, false);
-	}	
-
-	public void testFail9() throws Exception{
-		helper1_0("y", "e", "getE", true, true);
-	}	
-
-	public void testFail10() throws Exception{
-		helper1_0("y", "e", "setE", true, true);
-	}	
-	
-	// ------ 
-	public void test0() throws Exception{
-		helper2();
-	}
-	
-	public void test1() throws Exception{
-		helper2();
-	}
-
-	public void test2() throws Exception{
-		helper2(false);
-	}	
-	
-	public void test3() throws Exception{
-		helper2("f", "gg", true, true, false, false, false, false);
-	}	
-
-	public void test4() throws Exception{
-		helper2("fMe", "fYou", true, false, true, true, true, true);
-	}		
-	
-	public void test5() throws Exception{
-		//regression test for 9895
-		helper2("fMe", "fYou", true, false, true, false, true, false);
-	}		
-	
-	public void test6() throws Exception{
-		//regression test for 9895 - opposite case
-		helper2("fMe", "fYou", true, false, false, true, false, true);
-	}		
-
-	public void test7() throws Exception{
-		//regression test for 21292 
-		helper2("fBig", "fSmall", true, false, true, true, true, true);
-	}		
-	
-	public void test8() throws Exception{
-		//regression test for 26769
-		helper2("f", "g", true, false, true, false, true, false);
-	}
-
-	public void test9() throws Exception{
-		//regression test for 30906
-		helper2("fBig", "fSmall", true, false, true, true, true, true);
-	}		
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePrivateMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePrivateMethodTests.java
deleted file mode 100644
index 06d78c0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenamePrivateMethodTests.java
+++ /dev/null

@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameMethodProcessor;
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameNonVirtualMethodProcessor;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenamePrivateMethodTests extends RefactoringTest {
-	
-	private static final Class clazz= RenamePrivateMethodTests.class;
-	private static final String REFACTORING_PATH= "RenamePrivateMethod/";
-
-	public RenamePrivateMethodTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	private void helper1_0(String methodName, String newMethodName, String[] signatures) throws Exception{
-		IType classA= getType(createCUfromTestFile(getPackageP(), "A"), "A");
-		RenameMethodProcessor processor= new RenameNonVirtualMethodProcessor(classA.getMethod(methodName, signatures));
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName(newMethodName);
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	private void helper1() throws Exception{
-		helper1_0("m", "k", new String[0]);
-	}
-	
-	private void helper2_0(String methodName, String newMethodName, String[] signatures, boolean updateReferences) throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-		IMethod method= classA.getMethod(methodName, signatures);
-		String[] handles= ParticipantTesting.createHandles(method);
-		RenameMethodProcessor processor= new RenameNonVirtualMethodProcessor(method);
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setUpdateReferences(updateReferences);
-		processor.setNewElementName(newMethodName);
-		assertEquals("was supposed to pass", null, performRefactoring(refactoring));
-		assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName("A")), cu.getSource());
-		
-		ParticipantTesting.testRename(
-			handles,
-			new RenameArguments[] {
-				new RenameArguments(newMethodName, updateReferences)});
-		
-		assertTrue("anythingToUndo", RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("! anythingToRedo", !RefactoringCore.getUndoManager().anythingToRedo());
-		//assertEquals("1 to undo", 1, Refactoring.getUndoManager().getRefactoringLog().size());
-		
-		RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-		assertEqualLines("invalid undo", getFileContents(getInputTestFileName("A")), cu.getSource());
-
-		assertTrue("! anythingToUndo", !RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("anythingToRedo", RefactoringCore.getUndoManager().anythingToRedo());
-		//assertEquals("1 to redo", 1, Refactoring.getUndoManager().getRedoStack().size());
-		
-		RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-		assertEqualLines("invalid redo", getFileContents(getOutputTestFileName("A")), cu.getSource());
-	}
-	
-	private void helper2_0(String methodName, String newMethodName, String[] signatures) throws Exception{
-		helper2_0(methodName, newMethodName, signatures, true);
-	}
-	
-	private void helper2(boolean updateReferences) throws Exception{
-		helper2_0("m", "k", new String[0], updateReferences);
-	}
-	
-	private void helper2() throws Exception{
-		helper2(true);
-	}
-
-	public void testFail0() throws Exception{
-		helper1();
-	}
-	
-	public void testFail1() throws Exception{
-		helper1();
-	}
-	
-	public void testFail2() throws Exception{
-		helper1();
-	}
-		
-	public void testFail5() throws Exception{
-		helper1();
-	}
-	
-	public void test0() throws Exception{
-		helper2();
-	}	
-	
-	public void test10() throws Exception{
-		helper2();
-	}	
-
-	public void test11() throws Exception{
-		helper2();
-	}	
-
-	public void test12() throws Exception{
-		helper2();
-	}	
-
-	public void test13() throws Exception{
-		helper2();
-	}	
-	
-	public void test14() throws Exception{
-		helper2();
-	}	
-
-	public void test15() throws Exception{
-		helper2_0("m", "k", new String[]{"I"});
-	}	
-
-	public void test16() throws Exception{
-		helper2_0("m", "fred", new String[]{"I"});
-	}	
-
-	public void test17() throws Exception{
-		helper2_0("m", "kk", new String[]{"I"});
-	}	
-
-	public void test18() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuC= createCUfromTestFile(getPackageP(), "C");
-		
-		IType classB= getType(cu, "B");
-		RenameMethodProcessor processor= new RenameNonVirtualMethodProcessor(classB.getMethod("m", new String[]{"I"}));
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName("kk");
-		
-		assertEquals("was supposed to pass", null, performRefactoring(refactoring));
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("A")), cu.getSource());
-		assertEqualLines("invalid renaming C", getFileContents(getOutputTestFileName("C")), cuC.getSource());
-		
-	}
-
-	public void test2() throws Exception{
-		helper2_0("m", "fred", new String[0]);
-	}	
-
-	public void test20() throws Exception{
-		helper2_0("m", "fred", new String[]{"I"});
-	}	
-
-	public void test23() throws Exception{
-		helper2_0("m", "k", new String[0]);
-	}			
-
-	public void test24() throws Exception{
-		helper2_0("m", "k", new String[]{"QString;"});
-	}	
-	
-	public void test25() throws Exception{
-		helper2_0("m", "k", new String[]{"[QString;"});
-	}
-	
-	public void test26() throws Exception{
-		helper2_0("m", "k", new String[0]);
-	}
-	
-	public void test27() throws Exception{
-		helper2_0("m", "k", new String[0], false);
-	}
-
-	public void testAnon0() throws Exception{
-		helper2();
-	}			
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameResourceChangeTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameResourceChangeTests.java
deleted file mode 100644
index 5180e72..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameResourceChangeTests.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.internal.corext.refactoring.changes.RenameResourceChange;
-import org.eclipse.ltk.core.refactoring.Change;
-
-public class RenameResourceChangeTests extends RefactoringTest {
-	
-	private static final Class clazz= RenameResourceChangeTests.class;
-	public RenameResourceChangeTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public void testFile0() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getCorrespondingResource();	
-		String newName= "b.txt";
-		try{
-			
-			String oldName= "a.txt";
-			IFile file= folder.getFile(oldName);
-			assertTrue("should not exist", ! file.exists());
-			String content= "aaaaaaaaa";
-			file.create(getStream(content), true, new NullProgressMonitor());
-			assertTrue("should exist", file.exists());
-			
-			Change change= new RenameResourceChange(file, newName);
-			change.initializeValidationData(new NullProgressMonitor());
-			performChange(change);
-			assertTrue("after: should exist", folder.getFile(newName).exists());
-			assertTrue("after: old should not exist", ! folder.getFile(oldName).exists());
-		} finally{	
-			performDummySearch();
-			folder.getFile(newName).delete(true, false, new NullProgressMonitor());
-		}	
-	}
-	
-	public void testFile1() throws Exception{
-		
-		IFolder folder= (IFolder)getPackageP().getCorrespondingResource();	
-		String newName= "b.txt";
-		try{
-			String oldName= "a.txt";
-			IFile file= folder.getFile(oldName);
-			assertTrue("should not exist", ! file.exists());
-			String content= "";
-			file.create(getStream(content), true, new NullProgressMonitor());
-			assertTrue("should exist", file.exists());
-			
-			
-			Change change= new RenameResourceChange(file, newName);
-			change.initializeValidationData(new NullProgressMonitor());
-			performChange(change);
-			assertTrue("after: should exist", folder.getFile(newName).exists());
-			assertTrue("after: old should not exist", ! folder.getFile(oldName).exists());
-		} finally{	
-			performDummySearch();
-			folder.getFile(newName).delete(true, false, new NullProgressMonitor());
-		}	
-	}
-	
-	public void testFile2() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getCorrespondingResource();	
-		String oldName= "a.txt";
-		String newName= "b.txt";
-		try{ 
-			IFile file= folder.getFile(oldName);
-			assertTrue("should not exist", ! file.exists());
-			String content= "aaaaaaaaa";
-			file.create(getStream(content), true, new NullProgressMonitor());
-			assertTrue("should exist", file.exists());
-			
-			Change change= new RenameResourceChange(file, newName);
-			change.initializeValidationData(new NullProgressMonitor());
-			Change undo= performChange(change);
-			assertTrue("after: should exist", folder.getFile(newName).exists());
-			assertTrue("after: old should not exist", ! folder.getFile(oldName).exists());
-			//------
-			
-			assertTrue("should be undoable", undo != null);	
-			undo.initializeValidationData(new NullProgressMonitor());
-			performChange(undo);
-			assertTrue("after undo: should exist", folder.getFile(oldName).exists());
-			assertTrue("after undo: old should not exist", ! folder.getFile(newName).exists());
-		} finally{		
-			performDummySearch();
-			folder.getFile(oldName).delete(true, false, new NullProgressMonitor());
-		}	
-	}
-	
-	
-	public void testFolder0() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getCorrespondingResource();	
-		String newName= "b";
-		try{
-			String oldName= "a";
-			IFolder subFolder= folder.getFolder(oldName);
-			assertTrue("should not exist", ! subFolder.exists());
-			subFolder.create(true, true, null);
-			assertTrue("should exist", subFolder.exists());
-			
-			
-			Change change= new RenameResourceChange(subFolder, newName);
-			change.initializeValidationData(new NullProgressMonitor());
-			performChange(change);
-			assertTrue("after: should exist", folder.getFolder(newName).exists());
-			assertTrue("after: old should not exist", ! folder.getFolder(oldName).exists());
-		} finally{	
-			performDummySearch();
-			folder.getFolder(newName).delete(true, false, new NullProgressMonitor());
-		}	
-	}
-	
-	public void testFolder1() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getCorrespondingResource();	
-		String newName= "b";
-		
-		try{
-			String oldName= "a";
-			IFolder subFolder= folder.getFolder(oldName);
-			assertTrue("should not exist", ! subFolder.exists());
-			subFolder.create(true, true, null);
-			IFile file1= subFolder.getFile("a.txt");
-			IFile file2= subFolder.getFile("b.txt");
-			file1.create(getStream("123"), true, null);
-			file2.create(getStream("123345"), true, null);
-			
-			assertTrue("should exist", subFolder.exists());
-			assertTrue("file1 should exist", file1.exists());
-			assertTrue("file2 should exist", file2.exists());
-			
-			Change change= new RenameResourceChange(subFolder, newName);
-			change.initializeValidationData(new NullProgressMonitor());
-			performChange(change);
-			assertTrue("after: should exist", folder.getFolder(newName).exists());
-			assertTrue("after: old should not exist", ! folder.getFolder(oldName).exists());
-			assertEquals("after: child count", 2, folder.getFolder(newName).members().length);
-		} finally{	
-			performDummySearch();
-			folder.getFolder(newName).delete(true, false, new NullProgressMonitor());
-		}	
-	}	
-	
-	public void testFolder2() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getCorrespondingResource();	
-		String oldName= "a";
-		String newName= "b";
-		try{
-			IFolder subFolder= folder.getFolder(oldName);
-			assertTrue("should not exist", ! subFolder.exists());
-			subFolder.create(true, true, null);
-			assertTrue("should exist", subFolder.exists());
-			
-			
-			Change change= new RenameResourceChange(subFolder, newName);
-			change.initializeValidationData(new NullProgressMonitor());
-			Change undo= performChange(change);
-			assertTrue("after: should exist", folder.getFolder(newName).exists());
-			assertTrue("after: old should not exist", ! folder.getFolder(oldName).exists());
-		
-			//---
-			assertTrue("should be undoable", undo != null);	
-			undo.initializeValidationData(new NullProgressMonitor());
-			performChange(undo);
-			assertTrue("after undo: should exist", folder.getFolder(oldName).exists());
-			assertTrue("after undo: old should not exist", ! folder.getFolder(newName).exists());
-		} finally{		
-			performDummySearch();
-			folder.getFolder(oldName).delete(true, false, new NullProgressMonitor());
-		}
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameSourceFolderChangeTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameSourceFolderChangeTests.java
deleted file mode 100644
index a195244..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameSourceFolderChangeTests.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.internal.corext.refactoring.changes.RenameSourceFolderChange;
-
-
-public class RenameSourceFolderChangeTests extends RefactoringTest {
-	
-	private static final Class clazz= RenameSourceFolderChangeTests.class;
-
-	public RenameSourceFolderChangeTests(String name){
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public void test0() throws Exception {
-		String oldName= "oldName";
-		String newName= "newName";
-		
-		try{
-			IJavaProject testProject= RefactoringTestSetup.getProject();
-			IPackageFragmentRoot oldRoot= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), oldName);
-			
-			assertTrue("old folder should exist here", oldRoot.exists());
-			
-			RenameSourceFolderChange change= new RenameSourceFolderChange(oldRoot, newName);
-			change.initializeValidationData(new NullProgressMonitor());
-			performChange(change);
-			
-			assertTrue("old folder should not exist", ! oldRoot.exists());
-			assertEquals("expected 3 pfr's", 3, testProject.getPackageFragmentRoots().length);
-			IPackageFragmentRoot[] newRoots= testProject.getPackageFragmentRoots();
-			for (int i= 0; i < newRoots.length; i++){
-				assertTrue("should exist " + i, newRoots[i].exists());
-			}
-		} finally{
-			JavaProjectHelper.removeSourceContainer(RefactoringTestSetup.getProject(), newName);
-		}	
-	}
-	
-	public void test1() throws Exception {
-		String oldName1= "oldName1";
-		String oldName2= "oldName2";
-		String newName1= "newName";
-		
-		try{
-			
-			IJavaProject testProject= RefactoringTestSetup.getProject();
-			IPackageFragmentRoot oldRoot1= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), oldName1);
-			IPackageFragmentRoot oldRoot2= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), oldName2);
-			
-			assertTrue("old folder should exist here", oldRoot1.exists());
-			assertTrue("old folder 2 should exist here", oldRoot2.exists());
-			
-			RenameSourceFolderChange change= new RenameSourceFolderChange(oldRoot1, newName1);
-			change.initializeValidationData(new NullProgressMonitor());
-			performChange(change);
-			
-			assertTrue("old folder should not exist", ! oldRoot1.exists());
-			assertEquals("expected 4 pfr's", 4, testProject.getPackageFragmentRoots().length);
-			IPackageFragmentRoot[] newRoots= testProject.getPackageFragmentRoots();
-			for (int i= 0; i < newRoots.length; i++){
-				//DebugUtils.dump(newRoots[i].getElementName());
-				assertTrue("should exist " + i, newRoots[i].exists());
-				if (i == 2)
-					assertEquals("3rd position should be:" + newName1, newName1, newRoots[i].getElementName());
-			} 
-		}finally{		
-			JavaProjectHelper.removeSourceContainer(RefactoringTestSetup.getProject(), newName1);
-			JavaProjectHelper.removeSourceContainer(RefactoringTestSetup.getProject(), oldName2);
-		}	
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameStaticMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameStaticMethodTests.java
deleted file mode 100644
index 0c04aff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameStaticMethodTests.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameMethodProcessor;
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameNonVirtualMethodProcessor;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameStaticMethodTests extends RefactoringTest {
-	private static final Class clazz= RenameStaticMethodTests.class;
-	private static final String REFACTORING_PATH= "RenameStaticMethod/";
-
-	public RenameStaticMethodTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	private void helper1_0(String methodName, String newMethodName, String[] signatures) throws Exception{
-			IType classA= getType(createCUfromTestFile(getPackageP(), "A"), "A");
-		try{
-			RenameMethodProcessor processor= new RenameNonVirtualMethodProcessor(classA.getMethod(methodName, signatures));
-			RenameRefactoring refactoring= new RenameRefactoring(processor);
-			processor.setNewElementName(newMethodName);
-			RefactoringStatus result= performRefactoring(refactoring);
-			assertNotNull("precondition was supposed to fail", result);
-		} finally{
-			performDummySearch();
-			classA.getCompilationUnit().delete(true, null);
-		}	
-	}
-	
-	private void helper1() throws Exception{
-		helper1_0("m", "k", new String[0]);
-	}
-	
-	private void helper2_0(String methodName, String newMethodName, String[] signatures, boolean updateReferences) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		try{
-			IType classA= getType(cu, "A");
-			RenameMethodProcessor processor= new RenameNonVirtualMethodProcessor(classA.getMethod(methodName, signatures));
-			RenameRefactoring refactoring= new RenameRefactoring(processor);
-			processor.setUpdateReferences(updateReferences);
-			processor.setNewElementName(newMethodName);
-			assertEquals("was supposed to pass", null, performRefactoring(refactoring));
-			assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName("A")), cu.getSource());
-			
-			assertTrue("anythingToUndo", RefactoringCore.getUndoManager().anythingToUndo());
-			assertTrue("! anythingToRedo", !RefactoringCore.getUndoManager().anythingToRedo());
-			//assertEquals("1 to undo", 1, Refactoring.getUndoManager().getRefactoringLog().size());
-			
-			RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-			assertEqualLines("invalid undo", getFileContents(getInputTestFileName("A")), cu.getSource());
-	
-			assertTrue("! anythingToUndo", !RefactoringCore.getUndoManager().anythingToUndo());
-			assertTrue("anythingToRedo", RefactoringCore.getUndoManager().anythingToRedo());
-			//assertEquals("1 to redo", 1, Refactoring.getUndoManager().getRedoStack().size());
-			
-			RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-			assertEqualLines("invalid redo", getFileContents(getOutputTestFileName("A")), cu.getSource());
-		} finally{
-			performDummySearch();
-			cu.delete(true, null);
-		}
-	}
-	private void helper2_0(String methodName, String newMethodName, String[] signatures) throws Exception{
-		helper2_0(methodName, newMethodName, signatures, true);
-	}
-	
-	private void helper2(boolean updateReferences) throws Exception{
-		helper2_0("m", "k", new String[0], updateReferences);
-	}
-	
-	private void helper2() throws Exception{
-		helper2(true);
-	}
-
-	public void testFail0() throws Exception {
-		helper1();
-	}
-	
-	public void testFail1() throws Exception{
-		helper1();
-	}
-	
-	public void testFail2() throws Exception{
-		helper1();
-	}
-	
-	//testFail3 deleted
-	
-	public void testFail4() throws Exception{
-		helper1();
-	}
-	
-	public void testFail5() throws Exception{
-		helper1();
-	}
-	
-	public void testFail6() throws Exception{
-		helper1();
-	}
-	
-	public void testFail7() throws Exception{
-		helper1();
-	}
-	
-	public void testFail8() throws Exception{
-		helper1();
-	}
-	
-	public void test0() throws Exception{
-		helper2();
-	}
-	
-	public void test1() throws Exception{
-		helper2();
-	}
-	
-	public void test2() throws Exception{
-		helper2();
-	}
-	
-	public void test3() throws Exception{
-		helper2();
-	}
-	
-	public void test4() throws Exception{
-		helper2();
-	}
-	
-	public void test5() throws Exception{
-		helper2();
-	}
-	
-	public void test6() throws Exception{
-		helper2();
-	}
-	
-	public void test7() throws Exception{
-		helper2_0("m", "k", new String[]{Signature.SIG_INT});
-	}
-	
-	public void test8() throws Exception{
-		helper2_0("m", "k", new String[]{Signature.SIG_INT});
-	}
-	
-	public void test9() throws Exception{
-		helper2_0("m", "k", new String[]{Signature.SIG_INT}, false);
-	}
-	
-	public void test10() throws Exception{
-//		printTestDisabledMessage("bug 40628");
-//		if (true)	return;
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-
-		IType classB= getType(cuB, "B");
-		RenameMethodProcessor processor= new RenameNonVirtualMethodProcessor(classB.getMethod("method", new String[0]));
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setUpdateReferences(true);
-		processor.setNewElementName("newmethod");
-		assertEquals("was supposed to pass", null, performRefactoring(refactoring));
-		assertEqualLines("invalid renaming in A", getFileContents(getOutputTestFileName("A")), cuA.getSource());
-		assertEqualLines("invalid renaming in B", getFileContents(getOutputTestFileName("B")), cuB.getSource());
-	}
-
-	public void test11() throws Exception{
-//		printTestDisabledMessage("bug 40452");
-//		if (true)	return;
-		IPackageFragment packageA= getRoot().createPackageFragment("a", false, new NullProgressMonitor());
-		IPackageFragment packageB= getRoot().createPackageFragment("b", false, new NullProgressMonitor());
-		try {
-			ICompilationUnit cuA= createCUfromTestFile(packageA, "A");
-			ICompilationUnit cuB= createCUfromTestFile(packageB, "B");
-	
-			IType classA= getType(cuA, "A");
-			RenameMethodProcessor processor= new RenameNonVirtualMethodProcessor(classA.getMethod("method2", new String[0]));
-			RenameRefactoring refactoring= new RenameRefactoring(processor);
-			processor.setUpdateReferences(true);
-			processor.setNewElementName("fred");
-			assertEquals("was supposed to pass", null, performRefactoring(refactoring));
-			assertEqualLines("invalid renaming in A", getFileContents(getOutputTestFileName("A")), cuA.getSource());
-			assertEqualLines("invalid renaming in B", getFileContents(getOutputTestFileName("B")), cuB.getSource());
-		} finally{
-			packageA.delete(true, new NullProgressMonitor());
-			packageB.delete(true, new NullProgressMonitor());
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTempTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTempTests.java
deleted file mode 100644
index aa8c21e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTempTests.java
+++ /dev/null

@@ -1,500 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.internal.corext.SourceRange;
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameTempRefactoring;
-import org.eclipse.jdt.ui.tests.refactoring.infra.TextRangeUtil;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class RenameTempTests extends RefactoringTest{
-	
-	private static final Class clazz= RenameTempTests.class;
-	private static final String REFACTORING_PATH= "RenameTemp/";
-	
-	public RenameTempTests(String name){
-		super(name);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-	
-	private String getSimpleTestFileName(boolean canRename, boolean input){
-		String fileName = "A_" + getName();
-		if (canRename)
-			fileName += input ? "_in": "_out";
-		return fileName + ".java"; 
-	}
-	
-	private String getTestFileName(boolean canRename, boolean input){
-		String fileName= TEST_PATH_PREFIX + getRefactoringPath();
-		fileName += (canRename ? "canRename/": "cannotRename/");
-		return fileName + getSimpleTestFileName(canRename, input);
-	}
-		
-	//------------
-	protected ICompilationUnit createCUfromTestFile(IPackageFragment pack, boolean canRename, boolean input) throws Exception {
-		return createCU(pack, getSimpleTestFileName(canRename, input), getFileContents(getTestFileName(canRename, input)));
-	}
-	
-	private ISourceRange getSelection(ICompilationUnit cu) throws Exception{
-		String source= cu.getSource();
-		int offset= source.indexOf(AbstractSelectionTestCase.SQUARE_BRACKET_OPEN);
-		int end= source.indexOf(AbstractSelectionTestCase.SQUARE_BRACKET_CLOSE);
-		return new SourceRange(offset, end - offset);
-	}
-
-	private void helper1(String newName, boolean updateReferences, ISourceRange selection, ICompilationUnit cu) throws Exception{
-//		IType classA= getType(cu, "A");
-		RenameTempRefactoring ref= RenameTempRefactoring.create(cu, selection.getOffset(), selection.getLength());
-		ref.setUpdateReferences(updateReferences);
-		ref.setNewElementName(newName);
-		
-		RefactoringStatus result= performRefactoring(ref);
-		assertEquals("precondition was supposed to pass", null, result);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String newCuName= getSimpleTestFileName(true, true);
-		ICompilationUnit newcu= pack.getCompilationUnit(newCuName);
-		assertTrue(newCuName + " does not exist", newcu.exists());
-		assertEqualLines("incorrect renaming", getFileContents(getTestFileName(true, false)), newcu.getSource());
-	}
-	
-	private void helper1(String newName, boolean updateReferences) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		helper1(newName, updateReferences, getSelection(cu), cu);
-	}	
-	
-	private void helper1(String newName, boolean updateReferences, int startLine, int startColumn, int endLine, int endColumn) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		helper1(newName, updateReferences, selection, cu);
-	}	
-	
-	private void helper1(String newName) throws Exception{
-		helper1(newName, true);
-	}
-
-	private void helper2(String newName, boolean updateReferences) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);
-		ISourceRange selection= getSelection(cu);
-		failTestHelper(newName, updateReferences, cu, selection);
-	}
-
-	private void helper2(String newName, boolean updateReferences, int startLine, int startColumn, int endLine, int endColumn)  throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), false, true);
-		ISourceRange selection= TextRangeUtil.getSelection(cu, startLine, startColumn, endLine, endColumn);
-		failTestHelper(newName, updateReferences, cu, selection);
-	}
-
-	private void failTestHelper(String newName, boolean updateReferences, ICompilationUnit cu, ISourceRange selection) throws Exception {
-		RenameTempRefactoring ref= RenameTempRefactoring.create(cu, selection.getOffset(), selection.getLength());
-		ref.setUpdateReferences(updateReferences);
-		ref.setNewElementName(newName);
-		
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	private void helper2(String newName) throws Exception{
-		helper2(newName, true);
-	}
-	
-	public void test0() throws Exception{
-		helper1("j");
-	}
-	
-	public void test1() throws Exception{
-		helper1("j");
-	}
-	
-//	public void test2() throws Exception{
-//		Map renaming= new HashMap();
-//		renaming.put("x", "j");
-//		renaming.put("y", "k");
-//		helper1(renaming, new String[0]);
-//	}
-	
-	public void test3() throws Exception{
-		helper1("j1");
-	}
-
-	public void test4() throws Exception{
-		helper1("k");
-	}
-
-	public void test5() throws Exception{
-		helper1("k");
-	}
-
-	public void test6() throws Exception{
-		helper1("k");
-	}
-
-	public void test7() throws Exception{
-		helper1("k");
-	}
-//
-//	//8, 9, 10 removed
-//	
-//
-	public void test11() throws Exception{
-		helper1("j");
-	}
-
-	public void test12() throws Exception{
-		helper1("j");
-	}
-
-	public void test13() throws Exception{
-		helper1("j");
-	}
-
-	public void test14() throws Exception{
-		helper1("j");
-	}
-
-// disabled
-//	public void test15() throws Exception{
-//		Map renaming= new HashMap();
-//		renaming.put("i", "j");
-//		renaming.put("j", "i");
-//		helper1(renaming, new String[0]);
-//	}
-//
-	public void test16() throws Exception{
-		helper1("j");
-	}
-
-// disabled
-//	public void test17() throws Exception{
-//		Map renaming= new HashMap();
-//		renaming.put("i", "j");
-//		renaming.put("j", "i");
-//		helper1(renaming, new String[0]);
-//	}
-//
-	public void test18() throws Exception{
-		helper1("j");
-	}
-
-	public void test19() throws Exception{
-		helper1("j");
-	}
-
-	public void test20() throws Exception{
-		helper1("j");
-	}
-
-	public void test21() throws Exception{
-		helper1("j");
-	}
-	
-	public void test22() throws Exception{
-		helper1("j");
-	}
-
-//	disabled
-//	public void test23() throws Exception{
-//		Map renaming= new HashMap();
-//		renaming.put("i", "j");
-//		renaming.put("j", "i");
-//		helper1(renaming, new String[0]);
-//	}
-
-	public void test24() throws Exception{
-		helper1("j");
-	}
-
-	public void test25() throws Exception{
-		helper1("j");
-	}
-
-	public void test26() throws Exception{
-		helper1("j");
-	}
-
-//  deleted - incorrect. see testFail26
-//	public void test27() throws Exception{
-//		helper1("j");
-//	}
-
-	public void test28() throws Exception{
-		helper1("j");
-	}
-
-	public void test29() throws Exception{
-		helper1("b");
-	}
-
-	public void test30() throws Exception{
-		helper1("k");
-	}
-
-	public void test31() throws Exception{
-		helper1("kk");
-	}
-
-	public void test32() throws Exception{
-		helper1("j");
-	}
-
-	public void test33() throws Exception{
-		helper1("b", false);
-	}
-	
-	public void test34() throws Exception{
-		helper1("j");
-	}
-	
-	public void test35() throws Exception{
-//		printTestDisabledMessage("regression test for bug#9001");
-		helper1("test2");
-	}
-	
-	public void test36() throws Exception{
-//		printTestDisabledMessage("regression test for bug#7630");
-		helper1("j", true, 5, 13, 5, 14);
-	}
-
-	public void test37() throws Exception{
-//		printTestDisabledMessage("regression test for bug#7630");
-		helper1("j", true, 5, 16, 5, 17);
-	}
-	
-	public void test38() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#11453");
-		helper1("i", true, 7, 12, 7, 13);
-	}
-	
-	public void test39() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#11440");
-		helper1("j", true, 7, 16, 7, 18);
-	}
-	
-	public void test40() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#10660");
-		helper1("j", true, 4, 12, 4, 17);
-	}
-	
-	public void test41() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#10660");
-		helper1("j", true, 3, 13, 3, 18);
-	}
-
-	public void test42() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#10660");
-		helper1("j", true, 3, 25, 3, 26);
-	}
-
-	public void test43() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#10660");
-		helper1("j", true, 4, 19, 4, 24);
-	}
-	
-	public void test44() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#12200");
-		helper1("j", true, 6, 11, 6, 14);
-	}
-	
-	public void test45() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#12210");
-		helper1("j", true, 4, 14, 4, 14);
-	}
-
-	public void test46() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#12210");
-		helper1("j", true, 5, 18, 5, 18);
-	}
-	
-	public void test47() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#17922");
-		helper1("newname", true, 7, 13, 7, 17);
-	}
-
-	public void test48() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#22938");
-		helper1("newname", true, 4, 16, 4, 20);
-	}
-
-	public void test49() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#30923 ");
-		helper1("newname", true, 4, 16, 4, 20);
-	}
-	
-	public void test50() throws Exception{
-//		printTestDisabledMessage("regression test for Bug#30923 ");
-		helper1("newname", true, 4, 16, 4, 20);
-	}
-	
-	public void test51() throws Exception {
-//		printTestDisabledMessage("regression test for Bug#47822");
-		helper1("qwerty", true, 5, 19, 5, 20);
-	}
-	
-// -----
-	public void testFail0() throws Exception{
-		printTestDisabledMessage("fails - must revisit");
-//		helper2("j");
-	}
-	
-	public void testFail1() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail2() throws Exception{
-		helper2("i");
-	}
-	
-	public void testFail3() throws Exception{
-		helper2("9");
-	}
-
-	public void testFail4() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail5() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail6() throws Exception{
-		printTestDisabledMessage("fails - must revisit");
-//		helper2("j");
-	}
-
-	public void testFail7() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail8() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail9() throws Exception{
-		helper2("j");
-	}
-	
-	public void testFail10() throws Exception{
-		helper2("uu");
-	}
-
-// disabled - it's allowed now
-//	public void testFail11() throws Exception{
-//		helper2("uu");
-//	}
-	
-	public void testFail12() throws Exception{
-//		printTestDisabledMessage("http://dev.eclipse.org/bugs/show_bug.cgi?id=11638");
-		helper2("j");
-	}
-	
-	public void testFail13() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail14() throws Exception{
-		helper2("j");
-	}	
-
-	public void testFail15() throws Exception{
-		helper2("j");
-	}	
-
-	public void testFail16() throws Exception{
-		helper2("j");
-	}	
-	
-	public void testFail17() throws Exception{
-		helper2("j");
-	}	
-
-	public void testFail18() throws Exception{
-		helper2("j");
-	}	
-
-	public void testFail19() throws Exception{
-		helper2("j");
-	}	
-	
-	public void testFail20() throws Exception{
-		helper2("j");
-	}	
-
-// disabled - it's allowed now	
-//	public void testFail21() throws Exception{
-//		helper2("j");
-//	}
-
-	public void testFail22() throws Exception{
-		helper2("j");
-	}
-
-// disabled - it's allowed now
-//	public void testFail23() throws Exception{
-//		helper2("j");
-//	}
-	
-	public void testFail24() throws Exception{
-		printTestDisabledMessage("compile errors are ok now");
-		//helper2("j");
-	}
-	
-	public void testFail25() throws Exception{
-		helper2("j");
-	}
-	
-	public void testFail26() throws Exception{
-		printTestDisabledMessage("Test disable until it is clear how 1.4 treats this");
-		// helper2("j");
-	}
-	
-	public void testFail27() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail28() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail29() throws Exception{
-		helper2("j");
-	}
-
-	public void testFail30() throws Exception{
-//		printTestDisabledMessage("bug#19851");
-		helper2("j");
-	}
-	public void testFail31() throws Exception{
-		helper2("j", true, 3, 9, 3, 13);
-	}
-	
-	public void testFail32() throws Exception {
-//		printTestDisabledMessage("bug#47822");
-		helper2("j", true, 6, 19, 6, 20);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTests.java
deleted file mode 100644
index 6d5e247..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTests.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class RenameTests {
-
-	private static final Class clazz= RenameTests.class;
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite(clazz.getName());
-
-		suite.addTest(RenameVirtualMethodInClassTests.suite());
-		suite.addTest(RenameMethodInInterfaceTests.suite());
-		suite.addTest(RenamePrivateMethodTests.suite());	
-		suite.addTest(RenameStaticMethodTests.suite());
-		suite.addTest(RenameParametersTests.suite());
-		suite.addTest(RenameTypeTests.suite());	
-		suite.addTest(RenamePackageTests.suite());
-		suite.addTest(RenamePrivateFieldTests.suite());
-		suite.addTest(RenameTypeParameterTests.suite());
-		suite.addTest(RenameNonPrivateFieldTests.suite());
-		suite.addTest(RenameJavaProjectTests.suite());
-				
-		return suite;
-	}
-}
- 

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeParameterTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeParameterTests.java
deleted file mode 100644
index 6131856..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeParameterTests.java
+++ /dev/null

@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameTypeParameterProcessor;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameTypeParameterTests extends RefactoringTest {
-
-	private static final Class clazz= RenameTypeParameterTests.class;
-
-	private static final String REFACTORING_PATH= "RenameTypeParameter/";
-
-	public static Test setUpTest(Test someTest) {
-		return new Java15Setup(someTest);
-	}
-
-	public static Test suite() {
-		return new Java15Setup(new TestSuite(clazz));
-	}
-
-	public RenameTypeParameterTests(String name) {
-		super(name);
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	private void helper1(String parameterName, String newParameterName, String typeName, boolean references) throws Exception {
-		IType declaringType= getType(createCUfromTestFile(getPackageP(), "A"), typeName);
-		RenameTypeParameterProcessor processor= new RenameTypeParameterProcessor(declaringType.getTypeParameter(parameterName));
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName(newParameterName);
-		processor.setUpdateReferences(references);
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	private void helper1(String parameterName, String newParameterName, String typeName, String methodName, String[] methodSignature, boolean references) throws Exception {
-		IType declaringType= getType(createCUfromTestFile(getPackageP(), "A"), typeName);
-		IMethod[] declaringMethods= getMethods(declaringType, new String[] { methodName}, new String[][] { methodSignature});
-		RenameTypeParameterProcessor processor= new RenameTypeParameterProcessor(declaringMethods[0].getTypeParameter(parameterName));
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName(newParameterName);
-		processor.setUpdateReferences(references);
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	private void helper2(String parameterName, String newParameterName, String typeName, boolean references) throws Exception {
-		ParticipantTesting.reset();
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType declaringType= getType(cu, typeName);
-		ITypeParameter typeParameter= declaringType.getTypeParameter(parameterName);
-		RenameTypeParameterProcessor processor= new RenameTypeParameterProcessor(typeParameter);
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName(newParameterName);
-		processor.setUpdateReferences(references);
-
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertEquals("was supposed to pass", null, result);
-		assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName("A")), cu.getSource());
-
-		assertTrue("anythingToUndo", RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("! anythingToRedo", !RefactoringCore.getUndoManager().anythingToRedo());
-
-		RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-		assertEqualLines("invalid undo", getFileContents(getInputTestFileName("A")), cu.getSource());
-
-		assertTrue("! anythingToUndo", !RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("anythingToRedo", RefactoringCore.getUndoManager().anythingToRedo());
-
-		RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-		assertEqualLines("invalid redo", getFileContents(getOutputTestFileName("A")), cu.getSource());
-	}
-
-	private void helper2(String parameterName, String newParameterName, String typeName, String methodName, String[] methodSignature, boolean references) throws Exception {
-		ParticipantTesting.reset();
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType declaringType= getType(cu, typeName);
-		IMethod[] declaringMethods= getMethods(declaringType, new String[] { methodName}, new String[][] { methodSignature});
-		ITypeParameter typeParameter= declaringMethods[0].getTypeParameter(parameterName);
-		RenameTypeParameterProcessor processor= new RenameTypeParameterProcessor(typeParameter);
-		RenameRefactoring refactoring= new RenameRefactoring(processor);
-		processor.setNewElementName(newParameterName);
-		processor.setUpdateReferences(references);
-
-		RefactoringStatus result= performRefactoring(refactoring);
-		assertEquals("was supposed to pass", null, result);
-		assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName("A")), cu.getSource());
-
-		assertTrue("anythingToUndo", RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("! anythingToRedo", !RefactoringCore.getUndoManager().anythingToRedo());
-
-		RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-		assertEqualLines("invalid undo", getFileContents(getInputTestFileName("A")), cu.getSource());
-
-		assertTrue("! anythingToUndo", !RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("anythingToRedo", RefactoringCore.getUndoManager().anythingToRedo());
-
-		RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-		assertEqualLines("invalid redo", getFileContents(getOutputTestFileName("A")), cu.getSource());
-	}
-
-	public void test0() throws Exception {
-		helper2("T", "S", "A", true);
-	}
-
-	public void test1() throws Exception {
-		helper2("T", "S", "A", true);
-	}
-
-	public void test2() throws Exception {
-		helper2("T", "S", "A", false);
-	}
-
-	public void test3() throws Exception {
-		helper2("T", "S", "A", true);
-	}
-
-	public void test4() throws Exception {
-		helper2("T", "S", "A", false);
-	}
-
-	public void test5() throws Exception {
-		helper2("T", "S", "A", true);
-	}
-
-	public void test6() throws Exception {
-		helper2("S", "T", "A", true);
-	}
-
-	public void test7() throws Exception {
-		helper2("T", "S", "A", false);
-	}
-
-	public void test8() throws Exception {
-		helper2("S", "T", "A", false);
-	}
-
-	public void test9() throws Exception {
-		helper2("T", "S", "A", "f", new String[] { "QT;"}, true);
-	}
-
-	public void test10() throws Exception {
-		helper2("T", "S", "B", "f", new String[] { "QT;"}, true);
-	}
-
-	public void test11() throws Exception {
-		helper2("T", "S", "A", "f", new String[] { "QT;"}, false);
-	}
-
-	public void test12() throws Exception {
-		helper2("T", "S", "B", "f", new String[] { "QT;"}, false);
-	}
-
-	public void testFail0() throws Exception {
-		helper1("T", "S", "A", true);
-	}
-
-	public void testFail1() throws Exception {
-		helper1("T", "S", "A", true);
-	}
-
-	public void testFail2() throws Exception {
-		helper1("T", "S", "A", true);
-	}
-
-	public void testFail3() throws Exception {
-		helper1("T", "S", "A", true);
-	}
-
-	public void testFail4() throws Exception {
-		helper1("T", "S", "A", true);
-	}
-
-	public void testFail5() throws Exception {
-		helper1("T", "S", "B", "f", new String[] { "QT;"}, true);
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeTests.java
deleted file mode 100644
index 16424d8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameTypeTests.java
+++ /dev/null

@@ -1,1038 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameTypeProcessor;
-import org.eclipse.jdt.internal.corext.refactoring.tagging.IQualifiedNameUpdating;
-import org.eclipse.jdt.ui.tests.refactoring.infra.DebugUtils;
-
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameTypeTests extends RefactoringTest {
-	
-	private static final Class clazz= RenameTypeTests.class;
-	private static final String REFACTORING_PATH= "RenameType/";
-	
-	public RenameTypeTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-		
-	private IType getClassFromTestFile(IPackageFragment pack, String className) throws Exception{
-		return getType(createCUfromTestFile(pack, className), className);
-	}
-		
-	private RenameRefactoring createRefactoring(IType type, String newName) throws CoreException {
-		RenameTypeProcessor processor= new RenameTypeProcessor(type);
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		processor.setNewElementName(newName);
-		return ref;
-	}
-	
-	private void helper1_0(String className, String newName) throws Exception{
-		IType classA= getClassFromTestFile(getPackageP(), className);
-		Refactoring ref= createRefactoring(classA, newName);
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);
-		if (fIsVerbose)
-			DebugUtils.dump("result: " + result);
-	}
-	
-	private void helper1() throws Exception{
-		helper1_0("A", "B");
-	}
-		
-	private String[] helperWithTextual(String oldCuName, String oldName, String newName, String newCUName, boolean updateReferences, boolean updateTextualMatches) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), oldCuName);
-		IType classA= getType(cu, oldName);
-		
-		IPackageFragment pack= (IPackageFragment)cu.getParent();
-		String[] renameHandles= null;
-		if (classA.getDeclaringType() == null && cu.getElementName().startsWith(classA.getElementName())) {
-			renameHandles= ParticipantTesting.createHandles(classA, cu, cu.getResource());
-		} else {
-			renameHandles= ParticipantTesting.createHandles(classA);
-		}
-		RenameRefactoring ref= createRefactoring(classA, newName);
-		RenameTypeProcessor processor= (RenameTypeProcessor)ref.getProcessor();
-		processor.setUpdateReferences(updateReferences);
-		processor.setUpdateTextualMatches(updateTextualMatches);
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		ICompilationUnit newcu= pack.getCompilationUnit(newCUName + ".java");
-		assertTrue("cu " + newcu.getElementName()+ " does not exist", newcu.exists());
-		assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName(newCUName)), newcu.getSource());
-		return renameHandles;
-	}
-	
-	private String[] helper2_0(String oldName, String newName, String newCUName, boolean updateReferences) throws Exception{
-		return helperWithTextual(oldName, oldName, newName, newCUName, updateReferences, false);
-	}
-	
-	private void helper2(String oldName, String newName, boolean updateReferences) throws Exception{
-		helper2_0(oldName, newName, newName, updateReferences);
-	}
-
-	private String[] helper2(String oldName, String newName) throws Exception{
-		return helper2_0(oldName, newName, newName, true);
-	}
-				
-	public void testIllegalInnerClass() throws Exception {
-		helper1();
-	}
-	
-	public void testIllegalTypeName1() throws Exception {
-		helper1_0("A", "X ");
-	}
-	
-	public void testIllegalTypeName2() throws Exception {
-		helper1_0("A", " X");
-	}
-	
-	public void testIllegalTypeName3() throws Exception {
-		helper1_0("A", "34");
-	}
-
-	public void testIllegalTypeName4() throws Exception {
-		helper1_0("A", "this");
-	}
-
-	public void testIllegalTypeName5() throws Exception {
-		helper1_0("A", "fred");
-	}
-	
-	public void testIllegalTypeName6() throws Exception {
-		helper1_0("A", "class");
-	}
-	
-	public void testIllegalTypeName7() throws Exception {
-		helper1_0("A", "A.B");
-	}
-
-	public void testIllegalTypeName8() throws Exception {
-		helper1_0("A", "A$B");
-	}
-	
-	public void testIllegalTypeName9() throws Exception {
-		if (Platform.getOS().equals(Platform.OS_WIN32))
-			helper1_0("A", "aux");
-	}
-
-	public void testNoOp() throws Exception {
-		helper1_0("A", "A");
-	}
-
-	public void testWrongArg1() throws Exception {
-		helper1_0("A", "");
-	}
-	
-	public void testFail0() throws Exception {
-		helper1();
-	}
-	
-	public void testFail1() throws Exception {
-		helper1();
-	}
-
-	public void testFail2() throws Exception {
-		helper1();
-	}
-	
-	public void testFail3() throws Exception {
-		helper1();
-	}
-	
-	public void testFail4() throws Exception {
-		IType classA= getClassFromTestFile(getPackageP(), "A");
-		getClassFromTestFile(getPackageP(), "B");
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-		
-	public void testFail5() throws Exception {
-		IType classA= getClassFromTestFile(getPackageP(), "A");
-		getClassFromTestFile(getPackageP(), "B");
-		getClassFromTestFile(getPackageP(), "C");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	public void testFail6() throws Exception {
-		IType classA= getClassFromTestFile(getPackageP(), "A");
-		getClassFromTestFile(getPackageP(), "B");
-		getClassFromTestFile(getPackageP(), "C");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	public void testFail7() throws Exception {
-		helper1();
-	}
-	
-	public void testFail8() throws Exception {
-		IType classA= getClassFromTestFile(getPackageP(), "A");
-		getClassFromTestFile(getPackageP(), "B");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	public void testFail9() throws Exception {
-		helper1();
-	}
-	
-	public void testFail10() throws Exception {
-		helper1();
-	}
-
-	public void testFail11() throws Exception {
-		helper1();
-	}
-
-	public void testFail12() throws Exception {
-		helper1();
-	}
-
-	public void testFail16() throws Exception {
-		helper1();
-	}
-
-	public void testFail17() throws Exception {
-		helper1();
-	}
-
-	public void testFail18() throws Exception {
-		helper1();
-	}
-
-	public void testFail19() throws Exception {
-		helper1();
-	}
-
-	public void testFail20() throws Exception {
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		IPackageFragment packageP2= getRoot().createPackageFragment("p2", true, null);
-
-		IType classA= getClassFromTestFile(packageP1, "A");
-		getClassFromTestFile(packageP2, "AA");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	public void testFail22() throws Exception {
-		IType classA= getClassFromTestFile(getPackageP(), "A");
-		getClassFromTestFile(getPackageP(), "B");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	public void testFail23() throws Exception {
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		IPackageFragment packageP2= getRoot().createPackageFragment("p2", true, null);
-		IPackageFragment packageP3= getRoot().createPackageFragment("p3", true, null);
-
-		IType classA= getClassFromTestFile(packageP1, "A");
-		getClassFromTestFile(packageP3, "B");
-		getClassFromTestFile(packageP2, "Bogus");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	public void testFail24() throws Exception {
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		IPackageFragment packageP2= getRoot().createPackageFragment("p2", true, null);
-
-		IType classA= getClassFromTestFile(packageP1, "A");
-		getClassFromTestFile(packageP2, "B");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	public void testFail25() throws Exception {
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		IPackageFragment packageP2= getRoot().createPackageFragment("p2", true, null);
-
-		IType classA= getClassFromTestFile(packageP1, "A");
-		getClassFromTestFile(packageP2, "B");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	public void testFail26() throws Exception {
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		IPackageFragment packageP2= getRoot().createPackageFragment("p2", true, null);
-
-		IType classA= getClassFromTestFile(packageP1, "A");
-		getClassFromTestFile(packageP2, "B");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	public void testFail27() throws Exception {
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		IPackageFragment packageP2= getRoot().createPackageFragment("p2", true, null);
-
-		IType classA= getClassFromTestFile(packageP1, "A");
-		getClassFromTestFile(packageP2, "B");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	public void testFail28() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail29() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail30() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail31() throws Exception {
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		IPackageFragment packageP2= getRoot().createPackageFragment("p2", true, null);
-		IPackageFragment packageP3= getRoot().createPackageFragment("p3", true, null);
-
-		IType classA= getClassFromTestFile(packageP1, "A");
-		getClassFromTestFile(packageP2, "B");
-		getClassFromTestFile(packageP3, "C");
-
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-
-	public void testFail32() throws Exception {
-		IType classA= getClassFromTestFile(getPackageP(), "A");
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		getClassFromTestFile(packageP1, "B");
-		
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	public void testFail33() throws Exception {
-		helper1();
-	}
-
-	public void testFail34() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail35() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail36() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-		
-	public void testFail37() throws Exception {
-		IType classA= getClassFromTestFile(getPackageP(), "A");
-		getClassFromTestFile(getPackageP(), "B");
-		
-		RefactoringStatus result= performRefactoring(createRefactoring(classA, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	public void testFail38() throws Exception {
-		helper1();
-	}
-	
-	public void testFail39() throws Exception {
-		helper1();
-	}
-	
-	public void testFail40() throws Exception {
-		helper1();
-	}
-	
-	public void testFail41() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail42() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-
-	public void testFail43() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-
-	public void testFail44() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail45() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail46() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail47() throws Exception {
-		printTestDisabledMessage("obscuring");
-//		helper1();
-	}
-	
-	public void testFail48() throws Exception {
-		helper1();
-	}
-	
-	public void testFail49() throws Exception {
-		helper1();
-	}
-	
-	public void testFail50() throws Exception {
-		helper1();
-	}
-
-	public void testFail51() throws Exception {
-		helper1();
-	}
-
-	public void testFail52() throws Exception {
-		helper1();
-	}
-	
-	public void testFail53() throws Exception {
-		helper1();
-	}
-	
-	public void testFail54() throws Exception {
-		helper1();
-	}
-	
-	public void testFail55() throws Exception {
-		helper1();
-	}
-	
-	public void testFail56() throws Exception {
-		helper1();
-	}
-	
-	public void testFail57() throws Exception {
-		helper1();
-	}
-	
-	public void testFail58() throws Exception {
-		helper1();
-	}
-
-	public void testFail59() throws Exception {
-		helper1();
-	}
-
-	public void testFail60() throws Exception {
-		helper1();
-	}
-	
-	public void testFail61() throws Exception {
-		helper1();
-	}
-	
-	public void testFail62() throws Exception {
-		helper1();
-	}
-	
-	public void testFail63() throws Exception {
-		helper1();
-	}
-	
-	public void testFail64() throws Exception {
-		helper1();
-	}
-	
-	public void testFail65() throws Exception {
-		helper1();
-	}
-	
-	public void testFail66() throws Exception {
-		helper1();
-	}
-
-	public void testFail67() throws Exception {
-		helper1();
-	}
-
-	public void testFail68() throws Exception {
-		helper1();
-	}
-	
-	public void testFail69() throws Exception {
-		helper1();
-	}
-	
-	public void testFail70() throws Exception {
-		helper1();
-	}
-	
-	public void testFail71() throws Exception {
-		helper1();
-	}
-	
-	public void testFail72() throws Exception {
-		helper1();
-	}
-	
-	public void testFail73() throws Exception {
-		helper1();
-	}
-	
-	public void testFail74() throws Exception {
-		helper1();
-	}
-	
-	public void testFail75() throws Exception {
-		helper1();
-	}
-	
-	public void testFail76() throws Exception {
-		helper1();
-	}
-
-	public void testFail77() throws Exception {
-		helper1();
-	}
-
-	public void testFail78() throws Exception {
-		helper1();
-	}
-	
-	public void testFail79() throws Exception {
-		helper1();
-	}
-
-	public void testFail80() throws Exception {
-		helper1();
-	}
-	
-	public void testFail81() throws Exception {
-		helper1();
-	}
-	
-	public void testFail82() throws Exception {
-		helper1();
-	}
-	
-	public void testFail83() throws Exception {
-		helper1_0("A", "Cloneable");
-	}
-	
-	public void testFail84() throws Exception {
-		helper1_0("A", "List");
-	}
-	
-	public void testFail85() throws Exception {
-		helper1();
-	}
-	
-	public void testFail86() throws Exception {
-		printTestDisabledMessage("native method with A as parameter (same CU)");
-//		helper1();
-	}
-
-	public void testFail87() throws Exception {
-		printTestDisabledMessage("native method with A as parameter (same CU)");
-//		helper1();
-	}
-	
-	public void testFail88() throws Exception {
-		helper1();
-	}
-	
-	public void testFail89() throws Exception {
-		helper1();
-	}
-	
-	public void testFail90() throws Exception {
-		helper1();
-	}
-	
-	public void testFail91() throws Exception {
-		helper1();
-	}
-
-	public void testFail92() throws Exception {
-//		printTestDisabledMessage("needs fixing - double nested local type named B");
-		helper1();
-	}
-
-	public void testFail93() throws Exception {
-//		printTestDisabledMessage("needs fixing - double nested local type named B");
-		helper1();
-	}
-	
-	public void testFail94() throws Exception {
-		helper1();
-	}
-	
-	public void testFail95() throws Exception {
-		helper1();
-	}
-
-	public void testFail00() throws Exception {
-		helper1();
-	}
-	
-	public void testFail01() throws Exception {
-		helper1_0("A", "B");
-	}
-
-	public void testFail02() throws Exception {
-		helper1();
-	}
-
-	public void testFail03() throws Exception {
-		helper1_0("A", "C");
-	}
-
-	public void testFail04() throws Exception {
-		helper1_0("A", "A");
-	}
-	
-	public void testFailRegression1GCRKMQ() throws Exception {
-		IPackageFragment myPackage= getRoot().createPackageFragment("", true, new NullProgressMonitor());
-		IType myClass= getClassFromTestFile(myPackage, "Blinky");
-		
-		RefactoringStatus result= performRefactoring(createRefactoring(myClass, "B"));
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	public void test0() throws Exception { 
-		ParticipantTesting.reset();
-		String newName= "B";
-		String[] renameHandles= helper2("A", newName);
-		ParticipantTesting.testRename(
-			renameHandles,
-			new RenameArguments[] {
-				new RenameArguments(newName, true), 
-				new RenameArguments(newName + ".java", true),
-				new RenameArguments(newName + ".java", true)});
-	}
-	
-	public void test1() throws Exception { 
-		helper2("A", "B");
-	}
-	
-	public void test10() throws Exception { 
-		helper2("A", "B");
-	}
-	
-	public void test12() throws Exception { 
-		helper2("A", "B");
-	}
-	
-	public void test13() throws Exception { 
-		helper2("A", "B");
-	}
-	
-	public void test14() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test15() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test16() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test17() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test18() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test19() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test2() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test20() throws Exception { 
-		//printTestDisabledMessage("failb because of bug#9479");
-		//if (true)
-		//	return;
-		IPackageFragment packageA= getRoot().createPackageFragment("A", true, null);
-		
-		ICompilationUnit cu= createCUfromTestFile(packageA, "A");
-		IType classA= getType(cu, "A");
-		
-		Refactoring ref= createRefactoring(classA, "B");
-		
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		
-		ICompilationUnit newcu= packageA.getCompilationUnit("B.java");
-		assertEqualLines("invalid renaming", getFileContents(getOutputTestFileName("B")), newcu.getSource());
-	}
-	
-	public void test21() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test22() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test23() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test24() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test25() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test26() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test27() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test28() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test29() throws Exception { 
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		createCUfromTestFile(packageP1, "C");
-		
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-				
-		Refactoring ref= createRefactoring(classA, "B");
-		
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		
-		ICompilationUnit newcu= getPackageP().getCompilationUnit("B.java");
-		ICompilationUnit newcuC= packageP1.getCompilationUnit("C.java");
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("B")), newcu.getSource());
-		assertEqualLines("invalid renaming C", getFileContents(getOutputTestFileName("C")), newcuC.getSource());		
-		
-	}
-	
-	public void test3() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test30() throws Exception { 
-		createCUfromTestFile(getPackageP(), "AA");
-		
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-				
-		Refactoring ref= createRefactoring(classA, "B");
-		
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		
-		ICompilationUnit newcu= getPackageP().getCompilationUnit("B.java");
-		ICompilationUnit newcuAA= getPackageP().getCompilationUnit("AA.java");
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("B")), newcu.getSource());
-		assertEqualLines("invalid renaming AA", getFileContents(getOutputTestFileName("AA")), newcuAA.getSource());		
-	}
-	public void test31() throws Exception {
-		createCUfromTestFile(getPackageP(), "AA");
-		
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-				
-		Refactoring ref= createRefactoring(classA, "B");
-		
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		
-		ICompilationUnit newcu= getPackageP().getCompilationUnit("B.java");
-		ICompilationUnit newcuAA= getPackageP().getCompilationUnit("AA.java");
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("B")), newcu.getSource());
-		assertEqualLines("invalid renaming AA", getFileContents(getOutputTestFileName("AA")), newcuAA.getSource());		
-	}
-	public void test32() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test33() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test34() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test35() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test36() throws Exception { 
-		helper2("A", "B");		
-	}
-
-	public void test37() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test38() throws Exception { 
-		helper2("A", "B");			
-	}
-
-	public void test39() throws Exception { 
-		helper2("A", "B");		
-	}
-		
-	public void test4() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test40() throws Exception { 
-		//printTestDisabledMessage("search engine bug");
-		helper2("A", "B");		
-	}
-	
-	public void test41() throws Exception { 
-		helper2("A", "B");		
-	}
-		
-	public void test42() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test43() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test44() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test45() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test46() throws Exception { 	
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		createCUfromTestFile(packageP1, "C");
-		
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-				
-		Refactoring ref= createRefactoring(classA, "B");
-		
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		
-		ICompilationUnit newcu= getPackageP().getCompilationUnit("B.java");
-		ICompilationUnit newcuC= packageP1.getCompilationUnit("C.java");
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("B")), newcu.getSource());
-		assertEqualLines("invalid renaming C", getFileContents(getOutputTestFileName("C")), newcuC.getSource());		
-	}
-	
-	public void test47() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test48() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test49() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test50() throws Exception { 
-		printTestDisabledMessage("https://bugs.eclipse.org/bugs/show_bug.cgi?id=54948");
-		if (false)
-			helper2("A", "B");
-	}
-	
-	public void test51() throws Exception { 
-		IPackageFragment packageP1= getRoot().createPackageFragment("p1", true, null);
-		createCUfromTestFile(packageP1, "C");
-		
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-				
-		Refactoring ref= createRefactoring(classA, "B");
-		
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		
-		ICompilationUnit newcu= getPackageP().getCompilationUnit("B.java");
-		ICompilationUnit newcuC= packageP1.getCompilationUnit("C.java");
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("B")), newcu.getSource());
-		assertEqualLines("invalid renaming C", getFileContents(getOutputTestFileName("C")), newcuC.getSource());		
-	}
-	
-	public void test52() throws Exception {
-		//printTestDisabledMessage("1GJY2XN: ITPJUI:WIN2000 - rename type: error when with reference");
-		helper2("A", "B");		
-	}
-
-	public void test53() throws Exception { 
-		helper2("A", "B", false);		
-	}
-	
-	public void test54() throws Exception { 
-		//printTestDisabledMessage("waiting for: 1GKAQJS: ITPJCORE:WIN2000 - search: incorrect results for nested types");
-		helperWithTextual("A", "X", "XYZ", "A", true, false);		
-	}
-	
-	public void test55() throws Exception { 
-		//printTestDisabledMessage("waiting for: 1GKAQJS: ITPJCORE:WIN2000 - search: incorrect results for nested types");
-		helperWithTextual("A", "X", "XYZ", "A", false, false);		
-	}
-	
-	public void test57() throws Exception {
-		helperWithTextual("A", "A", "B", "B", true, true);
-	}
-	
-	public void test58() throws Exception {
-		//printTestDisabledMessage("bug#16751");
-		helper2("A", "B");
-	}
-
-	public void test59() throws Exception {
-//		printTestDisabledMessage("bug#22938");
-		helper2("A", "B");
-	}
-
-	public void test60() throws Exception {
-//		printTestDisabledMessage("test for bug 24740");
-		helperWithTextual("A", "A", "B", "B", true, true);
-	}
-	
-	public void test61() throws Exception {
-		ParticipantTesting.reset();
-		String[] renameHandles= helperWithTextual("A" , "Inner", "InnerB", "A", true, false);
-		ParticipantTesting.testRename(renameHandles,
-			new RenameArguments[] {
-				new RenameArguments("InnerB", true), 
-			});
-	}
-	
-	public void test62() throws Exception {
-//		printTestDisabledMessage("test for bug 66250");
-		helperWithTextual("A", "A", "B", "B", false, true);
-	}
-		
-	public void test5() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test6() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test7() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test8() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void test9() throws Exception { 
-		helper2("A", "B");		
-	}
-	
-	public void testQualifiedName1() throws Exception {
-		getRoot().createPackageFragment("p", true, null);
-		
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-		
-		String content= getFileContents(getTestPath() + "testQualifiedName1/in/build.xml");
-		IProject project= classA.getJavaProject().getProject();
-		IFile file= project.getFile("build.xml");
-		file.create(new ByteArrayInputStream(content.getBytes()), true, null);
-				
-		RenameRefactoring ref= createRefactoring(classA, "B");
-		
-		IQualifiedNameUpdating qr= (IQualifiedNameUpdating)ref.getProcessor();
-		qr.setUpdateQualifiedNames(true);
-		qr.setFilePatterns("*.xml");
-		
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		
-		ICompilationUnit newcu= getPackageP().getCompilationUnit("B.java");
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("B")), newcu.getSource());
-		InputStreamReader reader= new InputStreamReader(file.getContents(true));
-		StringBuffer newContent= new StringBuffer();
-		int ch;
-		try {
-			while((ch= reader.read()) != -1)
-				newContent.append((char)ch);
-		} finally {
-			if (reader != null)
-				reader.close();
-		}
-		String definedContent= getFileContents(getTestPath() + "testQualifiedName1/out/build.xml");
-		assertEqualLines("invalid updating build.xml", newContent.toString(), definedContent);
-		
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameVirtualMethodInClassTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameVirtualMethodInClassTests.java
deleted file mode 100644
index cfb5619..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameVirtualMethodInClassTests.java
+++ /dev/null

@@ -1,442 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameMethodProcessor;
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameVirtualMethodProcessor;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameVirtualMethodInClassTests extends RefactoringTest {
-	
-	private static final Class clazz= RenameVirtualMethodInClassTests.class;
-	private static final String REFACTORING_PATH= "RenameVirtualMethodInClass/";
-		
-	public RenameVirtualMethodInClassTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-	
-	protected String getRefactoringPath(){
-		return REFACTORING_PATH;
-	}
-
-	private void helper1_not_available(String methodName, String[] signatures) throws Exception{
-		IType classA= getType(createCUfromTestFile(getPackageP(), "A"), "A");
-		RenameMethodProcessor processor= new RenameVirtualMethodProcessor(classA.getMethod(methodName, signatures));
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		assertTrue(! ref.isApplicable());
-	}	
-	
-	private void helper1_0(String methodName, String newMethodName, String[] signatures) throws Exception{
-		IType classA= getType(createCUfromTestFile(getPackageP(), "A"), "A");
-		RenameMethodProcessor processor= new RenameVirtualMethodProcessor(classA.getMethod(methodName, signatures));
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		processor.setNewElementName(newMethodName);
-		RefactoringStatus result= performRefactoring(ref);
-		assertNotNull("precondition was supposed to fail", result);
-	}
-	
-	private void helper1() throws Exception{
-		helper1_0("m", "k", new String[0]);
-	}
-	
-	private void helper2_0(String methodName, String newMethodName, String[] signatures, boolean shouldPass, boolean updateReferences) throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType classA= getType(cu, "A");
-		RenameMethodProcessor processor= new RenameVirtualMethodProcessor(classA.getMethod(methodName, signatures));
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		processor.setUpdateReferences(updateReferences);
-		processor.setNewElementName(newMethodName);
-		
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		if (!shouldPass){
-			assertTrue("incorrect renaming because of java model", ! getFileContents(getOutputTestFileName("A")).equals(cu.getSource()));
-			return;
-		}
-		String expectedRenaming= getFileContents(getOutputTestFileName("A"));
-		String actuaRenaming= cu.getSource();
-		assertEqualLines("incorrect renaming", expectedRenaming, actuaRenaming);
-		
-		assertTrue("anythingToUndo", RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("! anythingToRedo", !RefactoringCore.getUndoManager().anythingToRedo());
-		//assertEquals("1 to undo", 1, Refactoring.getUndoManager().getRefactoringLog().size());
-		
-		RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-		assertEqualLines("invalid undo", getFileContents(getInputTestFileName("A")), cu.getSource());
-
-		assertTrue("! anythingToUndo", !RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue("anythingToRedo", RefactoringCore.getUndoManager().anythingToRedo());
-		//assertEquals("1 to redo", 1, Refactoring.getUndoManager().getRedoStack().size());
-		
-		RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-		assertEqualLines("invalid redo", getFileContents(getOutputTestFileName("A")), cu.getSource());
-	}
-	
-	private void helper2_0(String methodName, String newMethodName, String[] signatures, boolean shouldPass) throws Exception{
-		helper2_0(methodName, newMethodName, signatures, shouldPass, true);
-	}
-	
-	private void helper2_0(String methodName, String newMethodName, String[] signatures) throws Exception{
-		helper2_0(methodName, newMethodName, signatures, true);
-	}
-	
-	private void helper2(boolean updateReferences) throws Exception{
-		helper2_0("m", "k", new String[0], true, updateReferences);
-	}
-
-	private void helper2() throws Exception{
-		helper2(true);
-	}
-	
-	private void helper2_fail() throws Exception{
-		helper2_0("m", "k", new String[0], false);
-	}
-	
-	public void testFail0() throws Exception{
-		helper1();
-	}
-	
-	public void testFail1() throws Exception{
-		helper1_not_available("toString", new String[0]);
-	}
-	
-	public void testFail2() throws Exception{
-		helper1();
-	}
-	
-	public void testFail3() throws Exception{
-		helper1();
-	}
-	
-	public void testFail4() throws Exception{
-		helper1();
-	}
-	
-	public void testFail5() throws Exception{
-		helper1();
-	}
-	
-	public void testFail6() throws Exception{
-		helper1();
-	}
-	
-	public void testFail7() throws Exception{
-		helper1();
-	}
-	
-	public void testFail8() throws Exception{
-		helper1();
-	}
-	
-	public void testFail9() throws Exception{
-		helper1_0("m", "k", new String[]{Signature.SIG_INT});
-	}
-	
-	public void testFail10() throws Exception{
-		helper1();
-	}
-	
-	public void testFail11() throws Exception{
-		helper1();
-	}
-
-	public void testFail12() throws Exception{
-		helper1();
-	}
-	
-	public void testFail13() throws Exception{
-		helper1();
-	}
-	
-	public void testFail14() throws Exception{
-		helper1_0("m", "k", new String[]{Signature.SIG_INT});
-	}
-	
-	public void testFail15() throws Exception{
-		helper1();
-	}
-	
-	public void testFail17() throws Exception{
-		helper1();
-	}
-	
-	public void testFail18() throws Exception{
-		helper1();
-	}
-	
-	public void testFail19() throws Exception{
-		helper1();
-	}
-	
-	public void testFail20() throws Exception{
-		helper1();
-	}
-	
-	public void testFail21() throws Exception{
-		helper1();
-	}
-	
-	public void testFail22() throws Exception{
-		helper1();
-	}
-	
-	public void testFail23() throws Exception{
-		helper1();
-	}
-	
-	public void testFail24() throws Exception{
-		helper1();
-	}
-	
-	public void testFail25() throws Exception{
-		helper1();
-	}
-	
-	public void testFail26() throws Exception{
-		helper1();
-	}
-	
-	public void testFail27() throws Exception{
-		helper1();
-	}
-	
-	public void testFail28() throws Exception{
-		helper1();
-	}
-	
-	public void testFail29() throws Exception{
-		helper1();
-	}
-		
-	public void testFail30() throws Exception{
-		helper1();
-	}
-	
-	public void testFail31() throws Exception{
-		helper1_0("m", "k", new String[]{"QString;"});
-	}
-	
-	public void testFail32() throws Exception{
-		helper1_0("m", "k", new String[]{"QObject;"});
-	}
-	
-	public void testFail33() throws Exception{
-		helper1_not_available("toString", new String[0]);
-	}
-	
-	public void testFail34() throws Exception{
-		helper1_0("m", "k", new String[]{"QString;"});
-	}
-	
-//	//test removed - was invalid
-//	public void testFail35() throws Exception{
-//	}
-	
-	public void testFail36() throws Exception{
-		helper1();
-	}
-	
-	public void testFail37() throws Exception{
-		helper1();
-	}
-	
-	public void testFail38() throws Exception{
-		//printTestDisabledMessage("must fix - nested type");
-		helper1();
-	}
-	
-	public void testFail39() throws Exception{
-		helper1();
-	}
-	
-	public void test1() throws Exception{
-		ParticipantTesting.reset();
-		helper2();
-	}	
-
-	public void test10() throws Exception{
-		helper2();
-	}	
-	
-	public void test11() throws Exception{
-		helper2();
-	}	
-
-	public void test12() throws Exception{
-		helper2();
-	}	
-
-	public void test13() throws Exception{
-		helper2();
-	}	
-	
-	public void test14() throws Exception{
-		helper2();
-	}
-	
-	public void test15() throws Exception{
-		helper2_0("m", "k", new String[]{Signature.SIG_INT});
-	}		
-	
-	public void test16() throws Exception{
-		helper2_0("m", "fred", new String[]{Signature.SIG_INT});
-	}		
-	
-	public void test17() throws Exception{
-		//printTestDisabledMessage("overloading");
-		helper2_0("m", "kk", new String[]{Signature.SIG_INT});
-	}		
-	
-	public void test18() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuC= createCUfromTestFile(getPackageP(), "C");
-		
-		IType classB= getType(cu, "B");
-		RenameMethodProcessor processor= new RenameVirtualMethodProcessor(classB.getMethod("m", new String[]{"I"}));
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		processor.setNewElementName("kk");
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("A")), cu.getSource());
-		assertEqualLines("invalid renaming C", getFileContents(getOutputTestFileName("C")), cuC.getSource());
-		
-	}
-	
-	public void test19() throws Exception{
-		helper2_0("m", "fred", new String[0]);
-	}		
-	
-	public void test2() throws Exception{
-		helper2_0("m", "fred", new String[0]);
-	}		
-	
-	public void test20() throws Exception{
-		helper2_0("m", "fred", new String[]{Signature.SIG_INT});
-	}		
-	
-	public void test21() throws Exception{
-		helper2_0("m", "fred", new String[]{Signature.SIG_INT});
-	}
-	
-	public void test22() throws Exception{
-		helper2();
-	}		
-	
-	//anonymous inner class
-	public void test23() throws Exception{
-		helper2_fail();
-	}		
-	
-	public void test24() throws Exception{
-		helper2_0("m", "k", new String[]{"QString;"});
-	}		
-	
-	public void test25() throws Exception{
-		//printTestDisabledMessage("waiting for 1GIIBC3: ITPJCORE:WINNT - search for method references - missing matches");
-		helper2();
-	}		
-	
-	public void test26() throws Exception{
-		helper2();
-	}		
-	
-	public void test27() throws Exception{
-		helper2();
-	}		
-	
-	public void test28() throws Exception{
-		helper2();
-	}		
-	
-	public void test29() throws Exception{
-		helper2();
-	}		
-	
-	public void test30() throws Exception{
-		helper2();
-	}
-	
-	public void test31() throws Exception{
-		helper2();
-	}
-	
-	public void test32() throws Exception{
-		helper2(false);
-	}
-	
-	public void test33() throws Exception{
-		helper2();
-	}
-
-	public void test34() throws Exception{
-		printTestDisabledMessage("test for bug#18553");
-//		helper2_0("A", "foo", new String[0], true, true);
-	}
-
-	public void test35() throws Exception{
-		helper2_0("foo", "bar", new String[] {"QObject;"}, true);
-	}
-
-	public void test36() throws Exception{
-		helper2_0("foo", "bar", new String[] {"QString;"}, true);
-	}
-
-	public void test37() throws Exception{
-		helper2_0("foo", "bar", new String[] {"QA;"}, true);
-	}
-	
-	public void test38() throws Exception {
-		printTestDisabledMessage("difficult to set up test in current testing framework");
-//		helper2();
-	}
-	
-	public void test39() throws Exception {
-		helper2();
-	}
-	
-	public void test40() throws Exception { // test for bug 68592
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		IType localClass= cu.getType("A").getMethod("doit", new String[0]).getType("LocalClass", 1);
-		IMethod method= localClass.getMethod("method", new String[]{"I"});
-		RenameMethodProcessor processor= new RenameVirtualMethodProcessor(method);
-		RenameRefactoring ref= new RenameRefactoring(processor);
-		processor.setNewElementName("method2");
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("A")), cu.getSource());
-	}
-	
-	//anonymous inner class
-	public void testAnon0() throws Exception{
-		helper2();
-	}		
-	
-	public void testLocal0() throws Exception{
-		helper2();
-	}			
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTestSetup.java
deleted file mode 100644
index bba7c69..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTestSetup.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-
-public class SefTestSetup extends TestSetup {
-	
-	private IJavaProject fJavaProject;
-	private IPackageFragmentRoot fRoot;
-	private static final String CONTAINER= "src";
-
-	private IPackageFragment fBaseTypes;
-	private IPackageFragment fObjectTypes;
-	private IPackageFragment fInvalid;
-	
-	public SefTestSetup(Test test) {
-		super(test);
-	}	
-	
-	public IPackageFragmentRoot getRoot() {
-		return fRoot;
-	}
-		
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);
-		TestOptions.initializeCodeGenerationOptions();
-		JavaPlugin.getDefault().getCodeTemplateStore().load();		
-		
-		fJavaProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
-		JavaProjectHelper.addRTJar(fJavaProject);
-		fRoot= JavaProjectHelper.addSourceContainer(fJavaProject, CONTAINER);
-		
-		RefactoringCore.getUndoManager().flush();
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IWorkspaceDescription description= workspace.getDescription();
-		description.setAutoBuilding(false);
-		workspace.setDescription(description);
-		
-		fBaseTypes= getRoot().createPackageFragment("base_in", true, null);
-		fObjectTypes= getRoot().createPackageFragment("object_in", true, null);
-		fInvalid= getRoot().createPackageFragment("invalid", true, null);
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		RefactoringTest.performDummySearch(fJavaProject);
-		JavaProjectHelper.delete(fJavaProject);		
-	}
-	
-	public IPackageFragment getBasePackage() {
-		return fBaseTypes;
-	}	
-
-	public IPackageFragment getObjectPackage() {
-		return fObjectTypes;
-	}	
-
-	public IPackageFragment getInvalidPackage() {
-		return fInvalid;
-	}	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTests.java
deleted file mode 100644
index d2935f4..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SefTests.java
+++ /dev/null

@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Dmitry Stalnov (dstalnov@fusionone.com) - contributed fix for
- *       bug Encapuslate field can fail when two variables in one variable declaration (see
- *       https://bugs.eclipse.org/bugs/show_bug.cgi?id=51540).
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Preferences;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.refactoring.sef.SelfEncapsulateFieldRefactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class SefTests extends AbstractSelectionTestCase {
-
-	private static SefTestSetup fgTestSetup;
-	
-	public SefTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		fgTestSetup= new SefTestSetup(new TestSuite(SefTests.class));
-		return fgTestSetup;
-	}
-
-	protected IPackageFragmentRoot getRoot() {
-		return fgTestSetup.getRoot();
-	}
-	
-	protected String getResourceLocation() {
-		return "SefWorkSpace/SefTests/";
-	}
-	
-	protected String adaptName(String name) {
-		return Character.toUpperCase(name.charAt(0)) + name.substring(1) + ".java";
-	}	
-	
-	protected void performTest(IPackageFragment packageFragment, String id, String outputFolder, String fieldName) throws Exception {
-		ICompilationUnit unit= createCU(packageFragment, id);
-		IField field= getField(unit, fieldName);
-		assertNotNull(field);
-		
-		Preferences preferences= JavaCore.getPlugin().getPluginPreferences();
-		preferences.setValue(JavaCore.CODEASSIST_FIELD_PREFIXES, "");
-		preferences.setValue(JavaCore.CODEASSIST_STATIC_FIELD_PREFIXES, "");
-		preferences.setValue(JavaCore.CODEASSIST_FIELD_SUFFIXES, "");
-		preferences.setValue(JavaCore.CODEASSIST_STATIC_FIELD_SUFFIXES, "");
-
-		SelfEncapsulateFieldRefactoring refactoring= SelfEncapsulateFieldRefactoring.create(field);
-		performTest(unit, refactoring, COMPARE_WITH_OUTPUT, getProofedContent(outputFolder, id), true);
-	}
-	
-	protected void performInvalidTest(IPackageFragment packageFragment, String id, String fieldName) throws Exception {
-		ICompilationUnit unit= createCU(packageFragment, id);
-		IField field= getField(unit, fieldName);
-		assertNotNull(field);
-
-		Preferences preferences= JavaCore.getPlugin().getPluginPreferences();
-		preferences.setValue(JavaCore.CODEASSIST_FIELD_PREFIXES, "");
-		preferences.setValue(JavaCore.CODEASSIST_STATIC_FIELD_PREFIXES, "");
-		preferences.setValue(JavaCore.CODEASSIST_FIELD_SUFFIXES, "");
-		preferences.setValue(JavaCore.CODEASSIST_STATIC_FIELD_SUFFIXES, "");
-
-
-		SelfEncapsulateFieldRefactoring refactoring= SelfEncapsulateFieldRefactoring.create(field);
-		RefactoringStatus status= refactoring.checkAllConditions(new NullProgressMonitor());
-		assertTrue(status.hasError());
-	}	
-	
-	private static IField getField(ICompilationUnit unit, String fieldName) throws Exception {
-		IField result= null;
-		IType[] types= unit.getAllTypes();
-		for (int i= 0; i < types.length; i++) {
-			IType type= types[i];
-			result= type.getField(fieldName);
-			if (result != null && result.exists())
-				break;
-		}
-		return result;
-	}
-
-	private IPackageFragment getObjectPackage() throws JavaModelException {
-		return fgTestSetup.getObjectPackage();
- 	}
-	
-	private IPackageFragment getBasePackage() throws JavaModelException {
-		return fgTestSetup.getBasePackage();
- 	}
-	
-	private IPackageFragment getInvalidPackage() throws JavaModelException {
-		return fgTestSetup.getInvalidPackage();
-	}
-	
-	private void objectTest(String fieldName) throws Exception {
-		performTest(getObjectPackage(), getName(), "object_out", fieldName);
-	}
-	
-	private void baseTest(String fieldName) throws Exception {
-		performTest(getBasePackage(), getName(), "base_out", fieldName);
-	}
-	
-	private void invalidTest(String fieldName) throws Exception {
-		performInvalidTest(getInvalidPackage(), getName(), fieldName);
-	}
-	
-	//=====================================================================================
-	// Invalid
-	//=====================================================================================
-	
-	public void testPostfixExpression() throws Exception {
-		invalidTest("field");
-	}
-	
-	public void testInvalidOverwrite() throws Exception {
-		invalidTest("field");
-	}
-	
-	//=====================================================================================
-	// Primitiv Data Test
-	//=====================================================================================
-	
-	public void testPrefixInt() throws Exception {
-		baseTest("field");
-	}
-	
-	public void testPrefixBoolean() throws Exception {
-		baseTest("field");
-	}
-	
-	public void testPostfixInt() throws Exception {
-		baseTest("field");
-	}
-	
-	public void testThisExpression() throws Exception {
-		baseTest("field");
-	}
-	
-	public void testThisExpressionInner() throws Exception {
-		baseTest("field");
-	}
-	
-	public void testFinal() throws Exception {
-		baseTest("field");
-	}
-	
-	public void testTwoFragments() throws Exception {
-		baseTest("field");
-	}
-	
-	//=====================================================================================
-	// Basic Object Test
-	//=====================================================================================
-	
-	public void testSimpleRead() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testSimpleWrite() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testSimpleReadWrite() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testNestedRead() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testArrayRead() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testSetterInAssignment() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testSetterInExpression() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testSetterInInitialization() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testSetterAsReceiver() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testCompoundWrite() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testCompoundWrite2() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testCompoundWrite3() throws Exception {
-		objectTest("field");
-	}
-	
-	public void testFinalField() throws Exception {
-		objectTest("field");
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SurroundWithTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SurroundWithTestSetup.java
deleted file mode 100644
index 70cb12a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SurroundWithTestSetup.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.Hashtable;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-
-public class SurroundWithTestSetup extends TestSetup {
-	
-	private IJavaProject fJavaProject;
-	private IPackageFragmentRoot fRoot;
-	private static final String CONTAINER= "src";
-
-	private IPackageFragment fTryCatchPackage;
-	
-	public SurroundWithTestSetup(Test test) {
-		super(test);
-	}	
-	
-	public IPackageFragmentRoot getRoot() {
-		return fRoot;
-	}
-		
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);		
-		TestOptions.initializeCodeGenerationOptions();
-		JavaPlugin.getDefault().getCodeTemplateStore().load();		
-		
-		fJavaProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
-		JavaProjectHelper.addRTJar(fJavaProject);
-		fRoot= JavaProjectHelper.addSourceContainer(fJavaProject, CONTAINER);
-		
-		RefactoringCore.getUndoManager().flush();
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IWorkspaceDescription description= workspace.getDescription();
-		description.setAutoBuilding(false);
-		workspace.setDescription(description);
-		
-		fTryCatchPackage= getRoot().createPackageFragment("trycatch_in", true, null);
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CATCHBLOCK).setPattern("");
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		RefactoringTest.performDummySearch(fJavaProject);
-		JavaProjectHelper.delete(fJavaProject);
-	}
-	
-	public IPackageFragment getTryCatchPackage() {
-		return fTryCatchPackage;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SurroundWithTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SurroundWithTests.java
deleted file mode 100644
index 67af3ff..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/SurroundWithTests.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.internal.corext.refactoring.surround.SurroundWithTryCatchRefactoring;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-public class SurroundWithTests extends AbstractSelectionTestCase {
-
-	private static SurroundWithTestSetup fgTestSetup;
-	
-	public SurroundWithTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		fgTestSetup= new SurroundWithTestSetup(new TestSuite(SurroundWithTests.class));
-		return fgTestSetup;
-	}
-
-	protected IPackageFragmentRoot getRoot() {
-		return fgTestSetup.getRoot();
-	}
-	
-	protected String getResourceLocation() {
-		return "SurroundWithWorkSpace/SurroundWithTests/";
-	}
-	
-	protected String adaptName(String name) {
-		return Character.toUpperCase(name.charAt(0)) + name.substring(1) + ".java";
-	}	
-
-	protected void performTest(IPackageFragment packageFragment, String name, String outputFolder, int mode) throws Exception {
-		ICompilationUnit unit= createCU(packageFragment, name);
-		SurroundWithTryCatchRefactoring refactoring= SurroundWithTryCatchRefactoring.create(unit, 
-			getTextSelection(unit.getSource()), JavaPreferencesSettings.getCodeGenerationSettings(), null);
-		String out= null;
-		if (mode == COMPARE_WITH_OUTPUT)
-			out= getProofedContent(outputFolder, name);
-		performTest(unit, refactoring, mode, out, true);
-	}
-	
-	protected void tryCatchInvalidTest() throws Exception {
-		performTest(fgTestSetup.getTryCatchPackage(), getName(), "trycatch_out", INVALID_SELECTION);
-	}	
-	
-	protected void tryCatchTest() throws Exception {
-		performTest(fgTestSetup.getTryCatchPackage(), getName(), "trycatch_out", COMPARE_WITH_OUTPUT);
-	}	
-	
-	public void testNoException() throws Exception {
-		tryCatchInvalidTest();
-	}
-	
-	public void testAlreadyCaught() throws Exception {
-		tryCatchInvalidTest();
-	}
-	
-	public void testInvalidParent1() throws Exception {
-		tryCatchInvalidTest();
-	}
-	
-	public void testInvalidParent2() throws Exception {
-		tryCatchInvalidTest();
-	}
-	
-	public void testThisConstructorCall() throws Exception {
-		tryCatchInvalidTest();
-	}
-	
-	public void testSuperConstructorCall() throws Exception {
-		tryCatchInvalidTest();
-	}
-	
-	public void testSimple() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testOneLine() throws Exception {
-		System.out.println("test SurroundWithTests.testOneLine disabled for bug 55221");
-		//tryCatchTest();
-	}	
-	
-	public void testMultiLine() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testExceptionOrder()	throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testWrappedLocal1() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testWrappedLocal2() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testWrappedLocal3() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testWrappedLocal4() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testWrappedLocal5() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testWrappedLocal6() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testInitializerThrowsException() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testThrowInCatch() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testExpression() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testExpressionStatement() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testInitializer() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testSuperCall() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testRuntimeException1() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testNested() throws Exception {
-		tryCatchTest();
-	}
-	
-	public void testRuntimeException2() throws Exception {
-		tryCatchInvalidTest();
-	}	
-
-	public void testStaticField() throws Exception {
-		tryCatchInvalidTest();
-	}
-	
-	public void testDeclarationInitializer() throws Exception {
-		 tryCatchTest();
-	}
-	
-	public void testThenStatement() throws Exception {
-		 tryCatchTest();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestCreateParticipantShared.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestCreateParticipantShared.java
deleted file mode 100644
index 2356213..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestCreateParticipantShared.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.CreateParticipant;
-import org.eclipse.ltk.core.refactoring.participants.ISharableParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringArguments;
-
-public class TestCreateParticipantShared extends CreateParticipant implements ISharableParticipant {
-	
-	static TestCreateParticipantShared fgInstance;
-	
-	List fElements= new ArrayList(3);
-	List fHandles= new ArrayList(3);
-	List fArguments= new ArrayList(3);
-
-	public boolean initialize(Object element) {
-		fgInstance= this;
-		fElements.add(element);
-		fArguments.add(getArguments());
-		if (element instanceof IJavaElement)
-			fHandles.add(((IJavaElement)element).getHandleIdentifier());
-		else
-			fHandles.add(((IResource)element).getFullPath().toString());
-		return true;
-	}
-
-	public void addElement(Object element, RefactoringArguments args) {
-		fElements.add(element);
-		fArguments.add(args);
-		if (element instanceof IJavaElement)
-			fHandles.add(((IJavaElement)element).getHandleIdentifier());
-		else
-			fHandles.add(((IResource)element).getFullPath().toString());
-	}
-		
-	public String getName() {
-		return getClass().getName();
-	}
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		return null;
-	}
-	
-	public static void testNumberOfElements(int expected) {
-		if (expected == 0) {
-			Assert.assertTrue(fgInstance == null);
-		} else {
-			Assert.assertEquals(expected, fgInstance.fElements.size());
-			Assert.assertEquals(expected, fgInstance.fArguments.size());
-		}
-	}
-	
-	public static void reset() {
-		fgInstance= null;
-	}
-
-	public static boolean isLoaded() {
-		return fgInstance != null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestCreateParticipantSingle.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestCreateParticipantSingle.java
deleted file mode 100644
index b804346..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestCreateParticipantSingle.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.CreateParticipant;
-
-public class TestCreateParticipantSingle extends CreateParticipant {
-	
-	private static List fgInstances= new ArrayList();
-	
-	private Object fElement;
-	private String fHandle;
-	
-	public boolean initialize(Object element) {
-		fgInstances.add(this);
-		fElement= element;
-		ref(fElement);
-		if (fElement instanceof IJavaElement) {
-			fHandle= ((IJavaElement)fElement).getHandleIdentifier();
-		} else {
-			fHandle= ((IResource)fElement).getFullPath().toString();
-		}
-		return true;
-	}
-	
-	public String getName() {
-		return getClass().getName();
-	}
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		return null;
-	}
-	
-	public static void testNumberOfInstances(int instances) {
-		Assert.assertEquals(instances, fgInstances.size());
-	}
-	
-	public static void testElements(Class[] classes) {
-		testNumberOfInstances(classes.length);
-		for (int i= 0; i < classes.length; i++) {
-			Assert.assertTrue(classes[i].isInstance(getInstance(i).fElement));
-		}
-	}
-	
-	public static void testElements(String[] handles) {
-		testNumberOfInstances(handles.length);
-		List l1= new ArrayList(Arrays.asList(handles));
-		for (int i= 0; i < l1.size(); i++) {
-			Assert.assertTrue(l1.contains(getInstance(i).fHandle));
-		}
-	}
-	
-	public static void reset() {
-		fgInstances= new ArrayList();
-	}
-	
-	private static TestCreateParticipantSingle getInstance(int i) {
-		return ((TestCreateParticipantSingle)fgInstances.get(i));
-	}
-
-	/* package */ void ref(Object element) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestDeleteParticipantShared.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestDeleteParticipantShared.java
deleted file mode 100644
index d3447f3..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestDeleteParticipantShared.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.DeleteParticipant;
-import org.eclipse.ltk.core.refactoring.participants.ISharableParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringArguments;
-
-public class TestDeleteParticipantShared extends DeleteParticipant implements ISharableParticipant {
-	
-	static TestDeleteParticipantShared fgInstance;
-	
-	List fElements= new ArrayList(3);
-	List fHandles= new ArrayList(3);
-	List fArguments= new ArrayList(3);
-
-	public boolean initialize(Object element) {
-		fgInstance= this;
-		fElements.add(element);
-		fArguments.add(getArguments());
-		if (element instanceof IJavaElement)
-			fHandles.add(((IJavaElement)element).getHandleIdentifier());
-		else
-			fHandles.add(((IResource)element).getFullPath().toString());
-		return true;
-	}
-
-	public void addElement(Object element, RefactoringArguments args) {
-		fElements.add(element);
-		fArguments.add(args);
-		if (element instanceof IJavaElement)
-			fHandles.add(((IJavaElement)element).getHandleIdentifier());
-		else
-			fHandles.add(((IResource)element).getFullPath().toString());
-	}
-		
-	public String getName() {
-		return getClass().getName();
-	}
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		return null;
-	}
-	
-	public static void testNumberOfElements(int expected) {
-		if (expected == 0) {
-			Assert.assertTrue(fgInstance == null);
-		} else {
-			Assert.assertEquals(expected, fgInstance.fElements.size());
-			Assert.assertEquals(expected, fgInstance.fArguments.size());
-		}
-	}
-	
-	public static void reset() {
-		fgInstance= null;
-	}
-
-	public static boolean isLoaded() {
-		return fgInstance != null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestDeleteParticipantSingle.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestDeleteParticipantSingle.java
deleted file mode 100644
index d97d0fb..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestDeleteParticipantSingle.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.DeleteParticipant;
-
-public class TestDeleteParticipantSingle extends DeleteParticipant {
-	
-	private static List fgInstances= new ArrayList();
-	
-	private Object fElement;
-	private String fHandle;
-	
-	public boolean initialize(Object element) {
-		fgInstances.add(this);
-		fElement= element;
-		ref(fElement);
-		if (fElement instanceof IJavaElement) {
-			fHandle= ((IJavaElement)fElement).getHandleIdentifier();
-		} else {
-			fHandle= ((IResource)fElement).getFullPath().toString();
-		}
-		return true;
-	}
-
-	public String getName() {
-		return getClass().getName();
-	}
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		return null;
-	}
-	
-	public static void testNumberOfInstances(int instances) {
-		Assert.assertEquals(instances, fgInstances.size());
-	}
-	
-	public static void testElements(Class[] classes) {
-		testNumberOfInstances(classes.length);
-		for (int i= 0; i < classes.length; i++) {
-			Assert.assertTrue(classes[i].isInstance(getInstance(i).fElement));
-		}
-	}
-	
-	public static void testElements(String[] handles) {
-		testNumberOfInstances(handles.length);
-		List l1= new ArrayList(Arrays.asList(handles));
-		for (int i= 0; i < l1.size(); i++) {
-			Assert.assertTrue(l1.contains(getInstance(i).fHandle));
-		}
-	}
-	
-	public static void reset() {
-		fgInstances= new ArrayList();
-	}
-	
-	private static TestDeleteParticipantSingle getInstance(int i) {
-		return ((TestDeleteParticipantSingle)fgInstances.get(i));
-	}
-
-	/* package */ void ref(Object element) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestMoveParticipantShared.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestMoveParticipantShared.java
deleted file mode 100644
index d592702..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestMoveParticipantShared.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.ISharableParticipant;
-import org.eclipse.ltk.core.refactoring.participants.MoveArguments;
-import org.eclipse.ltk.core.refactoring.participants.MoveParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringArguments;
-
-public class TestMoveParticipantShared extends MoveParticipant implements ISharableParticipant {
-
-	static TestMoveParticipantShared fgInstance;
-	
-	List fElements= new ArrayList(3);
-	List fHandles= new ArrayList(3);
-	List fArguments= new ArrayList(3);
-
-	public boolean initialize(Object element) {
-		fgInstance= this;
-		fElements.add(element);
-		fArguments.add(getArguments());
-		if (element instanceof IJavaElement)
-			fHandles.add(((IJavaElement)element).getHandleIdentifier());
-		else
-			fHandles.add(((IResource)element).getFullPath().toString());
-		return true;
-	}
-
-	public void addElement(Object element, RefactoringArguments args) {
-		fElements.add(element);
-		fArguments.add(args);
-		if (element instanceof IJavaElement)
-			fHandles.add(((IJavaElement)element).getHandleIdentifier());
-		else
-			fHandles.add(((IResource)element).getFullPath().toString());
-	}
-	
-	public String getName() {
-		return getClass().getName();
-	}
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		return null;
-	}
-	
-	public static void testNumberOfElements(int expected) {
-		if (expected == 0) {
-			Assert.assertTrue(fgInstance == null);
-		} else {
-			Assert.assertEquals(expected, fgInstance.fElements.size());
-			Assert.assertEquals(expected, fgInstance.fArguments.size());
-		}
-	}
-	
-	public static void testArguments(MoveArguments[] args) {
-		testNumberOfElements(args.length);
-		for (int i= 0; i < args.length; i++) {
-			MoveArguments expected= args[i];
-			MoveArguments actual= (MoveArguments)fgInstance.fArguments.get(i);
-			Assert.assertEquals(expected.getDestination(), actual.getDestination());
-			Assert.assertEquals(expected.getUpdateReferences(), actual.getUpdateReferences());
-		}
-	}
-	
-	public static void reset() {
-		fgInstance= null;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestMoveParticipantSingle.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestMoveParticipantSingle.java
deleted file mode 100644
index b2e0d31..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestMoveParticipantSingle.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.MoveArguments;
-import org.eclipse.ltk.core.refactoring.participants.MoveParticipant;
-
-public class TestMoveParticipantSingle extends MoveParticipant {
-
-	static List fgInstances= new ArrayList();
-	
-	private Object fElement;
-	private String fHandle;
-	
-	public boolean initialize(Object element) {
-		fgInstances.add(this);
-		fElement= element;
-		ref(fElement);
-		if (fElement instanceof IJavaElement) {
-			fHandle= ((IJavaElement)fElement).getHandleIdentifier();
-		} else {
-			fHandle= ((IResource)fElement).getFullPath().toString();
-		}
-		return true;
-	}
-
-	public String getName() {
-		return getClass().getName();
-	}
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		return null;
-	}
-	
-	public static void testNumberOfInstances(int instances) {
-		Assert.assertEquals(instances, fgInstances.size());
-	}
-	
-	public static void testElements(String[] handles) {
-		testNumberOfInstances(handles.length);
-		List l1= new ArrayList(Arrays.asList(handles));
-		for (int i= 0; i < l1.size(); i++) {
-			Assert.assertTrue(l1.contains(getInstance(i).fHandle));
-		}
-	}
-	
-	public static void testArguments(MoveArguments[] args) {
-		testNumberOfInstances(args.length);
-		for (int i= 0; i < args.length; i++) {
-			MoveArguments expected= args[i];
-			MoveArguments actual= getInstance(i).getArguments();
-			Assert.assertEquals(expected.getDestination(), actual.getDestination());
-			Assert.assertEquals(expected.getUpdateReferences(), actual.getUpdateReferences());
-		}
-	}
-	
-	public static void reset() {
-		fgInstances= new ArrayList();
-	}
-	
-	private static TestMoveParticipantSingle getInstance(int i) {
-		return ((TestMoveParticipantSingle)fgInstances.get(i));
-	}
-
-	/* package */ void ref(Object element) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantShared.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantShared.java
deleted file mode 100644
index ca719b5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantShared.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.ISharableParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-
-public class TestRenameParticipantShared extends RenameParticipant implements ISharableParticipant {
-
-	static TestRenameParticipantShared fgInstance;
-	List fElements= new ArrayList(3);
-	List fHandles= new ArrayList(3);
-	List fArguments= new ArrayList(3);
-
-	public boolean initialize(Object element) {
-		fgInstance= this;
-		fElements.add(element);
-		fArguments.add(getArguments());
-		if (element instanceof IJavaElement)
-			fHandles.add(((IJavaElement)element).getHandleIdentifier());
-		else
-			fHandles.add(((IResource)element).getFullPath().toString());
-		return true;
-	}
-
-	public void addElement(Object element, RefactoringArguments args) {
-		fElements.add(element);
-		fArguments.add(args);
-		if (element instanceof IJavaElement)
-			fHandles.add(((IJavaElement)element).getHandleIdentifier());
-		else
-			fHandles.add(((IResource)element).getFullPath().toString());
-	}
-		
-	public String getName() {
-		return getClass().getName();
-	}
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		return null;
-	}
-	
-	public static void testNumberOfElements(int expected) {
-		if (expected == 0) {
-			Assert.assertTrue(fgInstance == null);
-		} else {
-			Assert.assertEquals(expected, fgInstance.fElements.size());
-			Assert.assertEquals(expected, fgInstance.fArguments.size());
-		}
-	}
-	
-	public static void testArguments(RenameArguments[] args) {
-		testNumberOfElements(args.length);
-		for (int i= 0; i < args.length; i++) {
-			RenameArguments expected= args[i];
-			RenameArguments actual= (RenameArguments)fgInstance.fArguments.get(i);
-			Assert.assertEquals(expected.getNewName(), actual.getNewName());
-			Assert.assertEquals(expected.getUpdateReferences(), actual.getUpdateReferences());
-		}
-	}
-	
-	public static void reset() {
-		fgInstance= null;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantSingle.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantSingle.java
deleted file mode 100644
index 2d7beec..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestRenameParticipantSingle.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-
-public class TestRenameParticipantSingle extends RenameParticipant {
-
-	private static List fgInstances= new ArrayList();
-	
-	private Object fElement;
-	private String fHandle;
-	
-	public boolean initialize(Object element) {
-		fgInstances.add(this);
-		fElement= element;
-		ref(fElement);
-		if (fElement instanceof IJavaElement) {
-			fHandle= ((IJavaElement)fElement).getHandleIdentifier();
-		} else {
-			fHandle= ((IResource)fElement).getFullPath().toString();
-		}
-		return true;
-	}
-
-	public String getName() {
-		return getClass().getName();
-	}
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		return null;
-	}
-	
-	public static void testNumberOfInstances(int instances) {
-		Assert.assertEquals(instances, fgInstances.size());
-	}
-	
-	public static void testElements(String[] handles) {
-		testNumberOfInstances(handles.length);
-		List l1= new ArrayList(Arrays.asList(handles));
-		for (int i= 0; i < l1.size(); i++) {
-			Assert.assertTrue(l1.contains(getInstance(i).fHandle));
-		}
-	}
-	
-	public static void testArguments(RenameArguments[] args) {
-		testNumberOfInstances(args.length);
-		for (int i= 0; i < args.length; i++) {
-			RenameArguments expected= args[i];
-			RenameArguments actual= getInstance(i).getArguments();
-			Assert.assertEquals(expected.getNewName(), actual.getNewName());
-			Assert.assertEquals(expected.getUpdateReferences(), actual.getUpdateReferences());
-		}
-	}
-		
-	public static void reset() {
-		fgInstances= new ArrayList();
-	}
-	
-	private static TestRenameParticipantSingle getInstance(int i) {
-		return ((TestRenameParticipantSingle)fgInstances.get(i));
-	}
-
-	/* package */ void ref(Object element) {
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/UndoManagerTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/UndoManagerTests.java
deleted file mode 100644
index ff506ee..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/UndoManagerTests.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.internal.core.refactoring.UndoManager;
-
-public class UndoManagerTests extends RefactoringTest {
-	
-	private static final Class clazz= UndoManagerTests.class;
-	public UndoManagerTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	private void checkState(boolean undo, boolean redo, int undoCount, int redoCount){
-		checkState(0, undo, redo, undoCount, redoCount);
-	}
-	
-	protected IUndoManager getUndoManager() {
-		return RefactoringCore.getUndoManager();
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		RefactoringCore.getUndoManager().flush();
-	}
-	
-	private void checkState(int iterationCount, boolean undo, boolean redo, int undoCount, int redoCount){
-		assertTrue(iterationCount + " undo", undo == RefactoringCore.getUndoManager().anythingToUndo());
-		assertTrue(iterationCount + " redo", redo == RefactoringCore.getUndoManager().anythingToRedo());
-		UndoManager manager= (UndoManager)RefactoringCore.getUndoManager();
-		assertTrue(iterationCount + "undo stack", manager.testHasNumberOfUndos(undoCount));
-		assertTrue(iterationCount + "redo stack", manager.testHasNumberOfRedos(redoCount));
-	}
-	
-	private void performUndo() throws Exception {
-		RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-	}
-	
-	private void performRedo() throws Exception {
-		RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-	}
-	
-	public void test0() throws Exception{
-		checkState(false, false, 0, 0);
-	}
-	
-	public void test1() throws Exception{	
-		performRefactoring(new NullRefactoring());
-		checkState(true, false, 1, 0);
-	}
-	
-	public void test2() throws Exception{	
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		checkState(false, true, 0, 1);
-	}
-	
-	public void test3() throws Exception{	
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		performRedo();
-		checkState(true, false, 1, 0);
-	}
-	
-	public void test4() throws Exception{	
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		performRedo();
-		performUndo();
-		checkState(false, true, 0, 1);
-	}
-
-	public void test5() throws Exception{	
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		performRedo();
-		performRefactoring(new NullRefactoring());
-		checkState(true, false, 2, 0);
-	}
-	
-	public void test6() throws Exception{	
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		performRedo();
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		performUndo();
-		checkState(false, true, 0, 2);
-	}	
-	
-	public void test7() throws Exception{	
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		performRedo();
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		checkState(true, true, 1, 1);
-	}	
-	
-	public void test8() throws Exception{
-		// limit is 6 since the stack is limited to 6 entries
-		int limit= 6;
-		for (int i= 0; i < limit; i++){
-			checkState(i, i != 0, false, i, 0);			
-			performRefactoring(new NullRefactoring());
-		}
-		for (int i= 0; i < limit; i++){
-			checkState(i, i != limit, i != 0, limit - i, i);			
-			performUndo();
-		}
-		
-		for (int i= 0; i < limit; i++){
-			checkState(i, i != 0, i != limit, i, limit - i);			
-			performRedo();
-		}
-	}
-	
-
-	public void test9() throws Exception{	
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		performRedo();
-		performRefactoring(new NullRefactoring());
-		performUndo();
-		RefactoringCore.getUndoManager().flush();
-		checkState(false, false, 0, 0);
-	}		
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/UseSupertypeWherePossibleTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/UseSupertypeWherePossibleTests.java
deleted file mode 100644
index 18272f8..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/UseSupertypeWherePossibleTests.java
+++ /dev/null

@@ -1,475 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.templates.Template;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.refactoring.structure.UseSupertypeWherePossibleRefactoring;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-public class UseSupertypeWherePossibleTests extends RefactoringTest {
-
-	private static final Class clazz= UseSupertypeWherePossibleTests.class;
-	private static final String REFACTORING_PATH= "UseSupertypeWherePossible/";
-	
-	public UseSupertypeWherePossibleTests(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		Template[] templates= JavaPlugin.getDefault().getTemplateStore().getTemplates();
-		for (int i= 0; i < templates.length; i++) {
-			if (templates[i].getName().equals("typecomment"))
-				templates[i].setPattern("/** typecomment template*/");	
-		}
-		for (int i= 0; i < templates.length; i++) {
-			if (templates[i].getName().equals("filecomment"))
-				templates[i].setPattern("/** filecomment template */");	
-		}
-	}
-		
-	private IType getClassFromTestFile(IPackageFragment pack, String className) throws Exception{
-		return getType(createCUfromTestFile(pack, className), className);
-	}
-
-	private void validatePassingTest(String className, String[] cuNames, String superTypeFullName, boolean updateInstanceOf) throws Exception {
-		IType clas= getClassFromTestFile(getPackageP(), className);
-				
-		UseSupertypeWherePossibleRefactoring ref= UseSupertypeWherePossibleRefactoring.create(clas, JavaPreferencesSettings.getCodeGenerationSettings());
-		ref.setUseSupertypeInInstanceOf(updateInstanceOf);
-			
-		ICompilationUnit[] cus= new ICompilationUnit[cuNames.length];
-		for (int i= 0; i < cuNames.length; i++) {
-			cus[i]= createCUfromTestFile(clas.getPackageFragment(), cuNames[i]);			
-		}
-		ref.setSuperTypeToUse(JavaModelUtil.findType(clas.getJavaProject(), superTypeFullName));
-		assertEquals("was supposed to pass", null, performRefactoring(ref));
-
-		for (int i= 0; i < cus.length; i++) {
-			String expected= getFileContents(getOutputTestFileName(cuNames[i]));
-			String actual= cus[i].getSource();
-			String message= "incorrect changes in " + cus[i].getElementName();
-			assertEqualLines(message, expected, actual);
-		}
-	}
-
-	private void validatePassingTest(String className, String[] cuNames, String superTypeFullName) throws Exception {
-		validatePassingTest(className, cuNames, superTypeFullName, false);
-	}
-
-	//---------------tests ----------------------
-	
-	public void testNew0() throws Exception{
-		validatePassingTest("A", new String[]{"A"}, "java.lang.Object");
-	}
-
-	public void testNew1() throws Exception{
-//		printTestDisabledMessage("bug 23597 ");
-		validatePassingTest("A", new String[]{"A"}, "java.lang.Object");
-	}
-
-	public void testNew2() throws Exception{
-		validatePassingTest("A", new String[]{"A"}, "java.lang.Object");
-	}
-
-	public void testNew3() throws Exception{
-		validatePassingTest("A", new String[]{"A"}, "java.lang.Object");
-	}
-
-	public void testNew4() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test"}, "java.lang.Object");
-	}
-
-	public void testNew5() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test"}, "java.lang.Object");
-	}
-
-	public void testNew6() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test"}, "java.lang.Object");
-	}
-
-	public void testNew7() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-	
-	public void testNew8() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-
-	public void testNew9() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test"}, "java.lang.Object");
-	}
-
-	public void testNew10() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-
-	public void testNew11() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-
-	public void testNew12() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-
-	public void testNew13() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-
-	public void testNew14() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-
-	public void testNew15() throws Exception{
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-
-	public void testNew16() throws Exception{
-//		printTestDisabledMessage("instanceof ");
-		validatePassingTest("A", new String[]{"A", "Test", "B"}, "p.B");
-	}
-
-	public void testNew17() throws Exception{
-		validatePassingTest("A", new String[]{"A"}, "p.C");
-	}
-
-	public void testNew18() throws Exception{
-		validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-	public void testNew19() throws Exception{
-		validatePassingTest("A", new String[]{"A"}, "p.I");
-	}
-
-	public void testNew20() throws Exception{
-//		printTestDisabledMessage("http://dev.eclipse.org/bugs/show_bug.cgi?id=23829");
-		validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-	public void testNew21() throws Exception{
-		validatePassingTest("A", new String[]{"A"}, "java.lang.Object");
-	}
-
-	public void testNew22() throws Exception{
-		validatePassingTest("A", new String[]{"A", "B", "Test"}, "p.B");
-	}
-
-	public void testNew23() throws Exception{
-		validatePassingTest("A", new String[]{"A", "B", "Test"}, "java.lang.Object");
-	}
-
-	public void testNew24() throws Exception{
-		validatePassingTest("A", new String[]{"A", "B"}, "java.lang.Object");
-	}
-
-	public void testNew25() throws Exception{
-		validatePassingTest("A", new String[]{"A", "B", "C"}, "java.lang.Object");
-	}
-
-	public void testNew26() throws Exception{
-		validatePassingTest("A", new String[]{"A", "B"}, "java.lang.Object");
-	}
-
-	public void testNew27() throws Exception{
-		validatePassingTest("A", new String[]{"A", "B"}, "p.B");
-	}
-
-	public void testNew28() throws Exception{
-		validatePassingTest("A", new String[]{"A", "B"}, "p.B");
-	}
-
-	public void testNew29() throws Exception{
-//		printTestDisabledMessage("bug 24278");
-		validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-	public void testNew30() throws Exception{
-//		printTestDisabledMessage("bug 24278");
-		validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-	public void testNew31() throws Exception{
-//		printTestDisabledMessage("bug 24278");
-		validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-	public void testNew32() throws Exception{
-//		printTestDisabledMessage();
-		validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-    public void testNew33() throws Exception{
-    //		printTestDisabledMessage("bug 26282");
-       validatePassingTest("A", new String[]{"A"}, "java.util.Vector");
-	}
-
-    public void testNew34() throws Exception{
-    //		printTestDisabledMessage("bug 26282");
-       validatePassingTest("A", new String[]{"A"}, "java.util.Vector");
-    }
-
-    public void testNew35() throws Exception{
-    //		printTestDisabledMessage("bug 26282");
-       validatePassingTest("A", new String[]{"A"}, "java.util.Vector");
-    }
-
-	public void testNew36() throws Exception{
-	//		printTestDisabledMessage("bug 26288");
-	   validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-	public void testNew37() throws Exception{
-	//		printTestDisabledMessage("bug 26288");
-	   validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-	public void testNew38() throws Exception{
-	//		printTestDisabledMessage("bug 40373");
-	   validatePassingTest("A", new String[]{"A"}, "p.B");
-	}
-
-	/* i had to rename tests 0-15 because of cvs problems*/
-	
-	
-	public void test0_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test1_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test2_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test3_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test4_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test5_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test6_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test7_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test8_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test9_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test10_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test11_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test12_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test13_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test14_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test15_() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test16() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test17() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test18() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test19() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test20() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test21() throws Exception{
-		//disable for exceptions
-//		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test22() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test23() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test24() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test25() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test26() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test27() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test28() throws Exception{
-//		printTestDisabledMessage("bug 22883");
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test29() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test30() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test31() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test32() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test33() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test34() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test35() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test36() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test37() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test38() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test39() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test40() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test41() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test42() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test43() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test44() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test45() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test46() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test47() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test48() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test49() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test50() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test51() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test52() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test53() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test54() throws Exception{
-		validatePassingTest("A", new String[]{"A", "A1", "I"}, "p.I");
-	}
-	public void test55() throws Exception{
-		validatePassingTest("A", new String[]{"A", "A1", "I"}, "p.I");
-	}
-	public void test56() throws Exception{
-		validatePassingTest("A", new String[]{"A", "A1", "I"}, "p.I");
-	}
-	public void test57() throws Exception{
-		validatePassingTest("A", new String[]{"A", "A1", "I"}, "p.I");
-	}
-	public void test58() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test59() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test60() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test61() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test62() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test63() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test64() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I", "Inter"}, "p.I");
-	}
-	public void test65() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test66() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test67() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-	public void test68() throws Exception{
-		validatePassingTest("A", new String[]{"A", "As", "I"}, "p.I");
-	}
-	public void test69() throws Exception{
-		validatePassingTest("A", new String[]{"A", "As", "I"}, "p.I");
-	}
-	public void test70() throws Exception{
-		validatePassingTest("A", new String[]{"A", "I"}, "p.I");
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/AllTests.java
deleted file mode 100644
index 3fe0916..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/AllTests.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.extensions;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite(AllTests.class.getName());
-		suite.addTest(ExtensionPointTests.suite());
-		return suite;
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/ExtensionPointTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/ExtensionPointTestSetup.java
deleted file mode 100644
index 6e08634..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/ExtensionPointTestSetup.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.extensions;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-public class ExtensionPointTestSetup extends TestSetup {
-	
-	private IJavaProject fJavaProject;
-	private IPackageFragmentRoot fRoot;
-	private static final String CONTAINER= "src";
-
-	public ExtensionPointTestSetup(Test test) {
-		super(test);
-	}	
-	
-	public IPackageFragmentRoot getRoot() {
-		return fRoot;
-	}
-		
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		fJavaProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
-		JavaProjectHelper.addRTJar(fJavaProject);
-		fRoot= JavaProjectHelper.addSourceContainer(fJavaProject, CONTAINER);
-		
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IWorkspaceDescription description= workspace.getDescription();
-		description.setAutoBuilding(false);
-		workspace.setDescription(description);
-		
-		getRoot().createPackageFragment("test", true, null);
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		JavaProjectHelper.delete(fJavaProject);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/ExtensionPointTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/ExtensionPointTests.java
deleted file mode 100644
index d32ce70..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/extensions/ExtensionPointTests.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.extensions;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.corext.SourceRange;
-import org.eclipse.jdt.internal.corext.refactoring.base.JavaStatusContext;
-import org.eclipse.jdt.internal.corext.refactoring.base.JavaStringStatusContext;
-
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.ltk.core.refactoring.RefactoringStatusContext;
-import org.eclipse.ltk.internal.ui.refactoring.StatusContextViewerDescriptor;
-
-
-public class ExtensionPointTests extends TestCase {
-
-	public static Test suite() {
-		return new ExtensionPointTestSetup(new TestSuite(ExtensionPointTests.class));
-	}
-	
-	public void testJavaStringStatusContextViewer() throws Exception {
-		JavaStringStatusContext context= new JavaStringStatusContext("test", new SourceRange(0, 0));
-		StatusContextViewerDescriptor descriptor= StatusContextViewerDescriptor.get(context);
-		assertNotNull(descriptor);
-		assertNotNull(descriptor.createViewer());
-	}
-	
-	public void testJavaStatusContextViewer() throws Exception {
-		IPackageFragment pack= getTestPackage();
-		ICompilationUnit unit= pack.createCompilationUnit(
-			"A.java", 
-			"package test; class A { }",
-			true, null);
-		RefactoringStatusContext context= JavaStatusContext.create(unit);
-		StatusContextViewerDescriptor descriptor= StatusContextViewerDescriptor.get(context);
-		assertNotNull(descriptor);
-		assertNotNull(descriptor.createViewer());
-		JavaProjectHelper.performDummySearch();
-		unit.delete(true, new NullProgressMonitor());
-	}
-	
-	private IPackageFragment getTestPackage() {
-		IFolder folder= ResourcesPlugin.getWorkspace().getRoot().getFolder(
-			new Path("/TestProject/src/test"));
-		return (IPackageFragment)JavaCore.create(folder);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/AbstractCUTestCase.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/AbstractCUTestCase.java
deleted file mode 100644
index 00a38c1..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/AbstractCUTestCase.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-
-public abstract class AbstractCUTestCase extends TestCase {
-
-	public AbstractCUTestCase(String name) {
-		super(name);
-	}
-	
-	protected String getFileContents(InputStream in) throws IOException {
-		BufferedReader br= new BufferedReader(new InputStreamReader(in));
-		
-		StringBuffer sb= new StringBuffer();
-		try {
-			int read= 0;
-			while ((read= br.read()) != -1)
-				sb.append((char) read);
-		} finally {
-			br.close();
-		}
-		return sb.toString();
-	}
-	
-	protected ICompilationUnit createCU(IPackageFragment pack, String name, String contents) throws Exception {
-		ICompilationUnit cu= pack.createCompilationUnit(name, contents, true, null);
-		cu.save(null, true);
-		return cu;
-	}
-	
-	protected ICompilationUnit createCU(IPackageFragment pack, String name, InputStream contents) throws Exception {
-		return createCU(pack, name, getFileContents(contents));
-	}
-
-	//--- creating a compilation unit from a resource folder relative to a plugin ----------------------------------
-	
-	protected abstract InputStream getFileInputStream(String fileName) throws IOException;
-
-	protected String getResourceLocation() {
-		return "";
-	}
-
-	protected ICompilationUnit createCU(IPackageFragment pack, String name) throws Exception {
-		name= adaptName(name);
-		return createCU(pack, name, getFileInputStream(getFilePath(pack, name)));
-	}
-	
-	protected String adaptName(String name) {
-		return name + ".java";
-	}
-	
-	protected String getProofedContent(String folder, String name) throws Exception {
-		name= adaptName(name);
-		return getFileContents(getFileInputStream(getFilePath(folder, name)));
-	}
-	
-	private String getFilePath(String path, String name) {
-		return getResourceLocation() + path + "/" + name;
-	}
-	
-	private String getFilePath(IPackageFragment pack, String name) {
-		return getFilePath(pack.getElementName(), name);		
-	}
-	
-	//---- helper to compare two file without considering the package statement
-	
-	public static void compareSource(String refactored, String proofed) {
-		compareSource(refactored, proofed, true);
-	}
-	
-	public static void compareSource(String refactored, String proofed, boolean skipPackageDeclaration) {
-		int index= skipPackageDeclaration ? refactored.indexOf(';'): 0;
-		refactored= refactored.substring(index);
-		index= skipPackageDeclaration ? proofed.indexOf(';') : 0;
-		proofed= proofed.substring(index);
-		RefactoringTest.assertEqualLines(proofed, refactored);
-	}
-			
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/AbstractRefactoringTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/AbstractRefactoringTestSetup.java
deleted file mode 100644
index f01d161..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/AbstractRefactoringTestSetup.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import java.util.Hashtable;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-public class AbstractRefactoringTestSetup extends TestSetup {
-
-	private boolean fWasAutobuild;
-	
-	public AbstractRefactoringTestSetup(Test test) {
-		super(test);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		fWasAutobuild= JavaProjectHelper.setAutoBuilding(false);
-		if (JavaPlugin.getActivePage() != null)
-			JavaPlugin.getActivePage().close();
-
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.TAB);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "0");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);
-		TestOptions.initializeCodeGenerationOptions();
-		JavaPlugin.getDefault().getCodeTemplateStore().load();		
-		
-		StringBuffer comment= new StringBuffer();
-		comment.append("/**\n");
-		comment.append(" * ${tags}\n");
-		comment.append(" */");
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CONSTRUCTORCOMMENT).setPattern(comment.toString());
-	}
-	
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.setAutoBuilding(fWasAutobuild);
-		/* 
-		 * ensure the workbench state gets saved when running with the Automated Testing Framework
-         * TODO: remove when https://bugs.eclipse.org/bugs/show_bug.cgi?id=71362 is fixed
-         */
-		/* Not needed for JDT/UI tests right now.
-		StackTraceElement[] elements=  new Throwable().getStackTrace();
-		for (int i= 0; i < elements.length; i++) {
-			StackTraceElement element= elements[i];
-			if (element.getClassName().equals("org.eclipse.test.EclipseTestRunner")) {
-				PlatformUI.getWorkbench().close();
-				break;
-			}
-		}
-		*/
-		super.tearDown();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/DebugUtils.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/DebugUtils.java
deleted file mode 100644
index b1ac363..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/DebugUtils.java
+++ /dev/null

@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
- 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-
-public final class DebugUtils {
-
-	private DebugUtils(){
-	}
-	
-	public static void dumpCharCharArray(String msg, char[][] o){
-		dump("DUMPING char[][]:" + msg); //$NON-NLS-1$
-		for (int i= 0; i < o.length; i++){
-			dump(new String(o[i]));
-		}
-	}
-	
-	public static void dumpArray(String msg, Object[] refs){
-		System.out.println("DUMPING array: "+  msg); //$NON-NLS-1$
-		if (refs == null){
-			System.out.println("null"); //$NON-NLS-1$
-			return;
-		}	
-		for (int i= 0; i < refs.length; i++)
-			System.out.println(refs[i].toString());
-	}
-	
-	public static void dumpCollectionCollection(String msg, Collection c){
-		for (Iterator iter= c.iterator(); iter.hasNext(); ){
-			dumpCollection("", (List)iter.next()); //$NON-NLS-1$
-		}
-	}
-	
-	public static void dumpCollection(String msg, Collection c){
-		System.out.println("DUMPING collection: "+  msg); //$NON-NLS-1$
-		if (c == null){
-			System.out.println("null"); //$NON-NLS-1$
-			return;
-		}	
-		for (Iterator iter= c.iterator(); iter.hasNext(); ){
-			System.out.println(iter.next().toString());
-		}
-	}
-	
-	public static void dumpIMethod(IMethod method){
-		try{
-			if (method == null){
-				System.out.println("DUMPING method: null"); //$NON-NLS-1$
-				return;
-			}
-			System.out.println("DUMPING method:" +  method.getElementName() + "\n " + method.getSignature() + "\n declared in " + JavaModelUtil.getFullyQualifiedName(method.getDeclaringType()) //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-			+ "\nreturnType:" + method.getReturnType() ); //$NON-NLS-1$
-			dumpArray("paramTypes:", method.getParameterTypes()); //$NON-NLS-1$
-			dumpArray("exceptions:", method.getExceptionTypes()); //$NON-NLS-1$
-		}catch (JavaModelException e){
-			System.out.println("JavaModelException: "+ e.getMessage()); //$NON-NLS-1$
-		}
-	}
-	
-	public static void dumpIMethodList(String msg, List l){
-		System.out.println("DUMPING IMethodList: "+  msg); //$NON-NLS-1$
-		if (l == null){
-			System.out.println("null"); //$NON-NLS-1$
-			return;
-		}	
-		Iterator iter= l.iterator();
-		while(iter.hasNext()){
-			dumpIMethod((IMethod)iter.next());			
-		}
-	}
-	
-	public static void dumpIType(String msg, IType type){
-		System.out.println("DUMPING IType:"+ msg); //$NON-NLS-1$
-		System.out.println("exists:" + type.exists()); //$NON-NLS-1$
-		try{
-			System.out.println("correspondingResource:" + type.getCorrespondingResource()); //$NON-NLS-1$
-			System.out.println("underResource:" + type.getUnderlyingResource()); //$NON-NLS-1$
-			System.out.println("source:\n" + type.getSource()); //$NON-NLS-1$
-			
-			//System.out.println("cu.orig.under" + type.getCompilationUnit().getOriginalElement().getUnderlyingResource());
-			System.out.println("cu:" + type.getCompilationUnit().getSource());		 //$NON-NLS-1$
-		}catch (JavaModelException e){
-			System.out.println("JavaModelException: "+ e.getMessage()); //$NON-NLS-1$
-		}
-		
-	}
-
-	public static void dumpIResource(String msg, IResource res){
-		System.out.println("DUMPING IResource:"+ msg); //$NON-NLS-1$
-		System.out.println("name:" + res.getFullPath().toString()); //$NON-NLS-1$
-		System.out.println("exists" + res.exists()); //$NON-NLS-1$
-	}
-
-	public static void dump(Object o){
-		if (o == null)
-			dump("null");		 //$NON-NLS-1$
-		else
-			dump(o.toString());	
-	}
-	public static void dump(String msg){
-		System.out.println("DUMP:" + msg); //$NON-NLS-1$
-	}
-	
-	public static void dumpImports(ICompilationUnit cu) throws JavaModelException{
-		IImportDeclaration[] imports= cu.getImports();
-		if (imports == null)
-			return;
-		DebugUtils.dump("Compilation Unit: " + cu.getElementName());	 //$NON-NLS-1$
-		for (int k= 0; k < imports.length; k ++){
-			DebugUtils.dump("import " + imports[k].getElementName() + " on demand: " + imports[k].isOnDemand()); //$NON-NLS-2$ //$NON-NLS-1$
-		}
-	}
-	
-	public static void dumpImports(IPackageFragment pack) throws JavaModelException{
-		ICompilationUnit[] cus= pack.getCompilationUnits();
-		if (cus == null)
-			return;
-		//DebugUtils.dump("Package " + pack.getElementName());	
-		for (int j= 0; j < cus.length; j++){
-			dumpImports(cus[j]);
-		}
-	}
-	
-	public static void dumpImports(IJavaProject project) throws JavaModelException{
-		IPackageFragment[] packages= project.getPackageFragments();
-		if (packages == null)
-			return;
-		//DebugUtils.dump("Project " + project.getElementName());	
-		for (int i= 0; i < packages.length; i++){
-			dumpImports(packages[i]);
-		}	
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockClipboard.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockClipboard.java
deleted file mode 100644
index 1c7796f..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockClipboard.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.widgets.Display;
-
-
-//have to create this class because of bug 40095
-public class MockClipboard extends Clipboard{
-
-	private Map fContents; //Transfer -> Object
-	 
-	public MockClipboard(Display display) {
-		super(display);
-		fContents= new HashMap();
-	}
-
-	protected void checkSubclass() {
-		//do nothing
-	}
-	
-	public TransferData[] getAvailableTypes() {
-		Set result= new HashSet();
-		for (Iterator iter= fContents.keySet().iterator(); iter.hasNext();) {
-			Transfer transfer= (Transfer)iter.next();
-			result.addAll(Arrays.asList(transfer.getSupportedTypes()));
-		}
-		return (TransferData[]) result.toArray(new TransferData[result.size()]);
-	}
-	
-	public Object getContents(Transfer transfer) {
-		return fContents.get(transfer);		
-	}
-	
-	public void setContents(Object[] data, Transfer[] dataTypes) {
-		if (data == null || dataTypes == null || data.length != dataTypes.length) {
-			DND.error(SWT.ERROR_INVALID_ARGUMENT);
-		}
-		fContents.clear();
-		for (int i= 0; i < dataTypes.length; i++) {
-			fContents.put(dataTypes[i], data[i]);
-		}
-	}
-	
-	public void dispose() {
-		fContents.clear();
-		super.dispose();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockWorkbenchSite.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockWorkbenchSite.java
deleted file mode 100644
index b0a9740..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/MockWorkbenchSite.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.PlatformObject;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.IWorkbenchWindow;
-
-import org.eclipse.jdt.internal.corext.Assert;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-public class MockWorkbenchSite extends PlatformObject implements IWorkbenchSite {
-	
-	private ISelectionProvider fProvider;
-	
-	public MockWorkbenchSite(ISelectionProvider provider){
-		setSelectionProvider(provider);
-	}
-	
-	public MockWorkbenchSite(Object[] elements){
-		this(new SimpleSelectionProvider(elements));
-	}
-	
-	public MockWorkbenchSite(List elements){
-		this(new SimpleSelectionProvider(elements));
-	}
-	
-	public IWorkbenchPage getPage() {
-		return null;
-	}
-
-	public ISelectionProvider getSelectionProvider() {
-		return fProvider;
-	}
-
-	public Shell getShell() {
-		return JavaPlugin.getActiveWorkbenchShell();
-	}
-
-	public IWorkbenchWindow getWorkbenchWindow() {
-		return null;
-	}
-	
-	public void setSelectionProvider(ISelectionProvider provider) {
-		Assert.isNotNull(provider);
-		fProvider= provider;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringPerformanceTestCase.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringPerformanceTestCase.java
deleted file mode 100644
index 5877b17..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringPerformanceTestCase.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.ui.tests.performance.JdtPerformanceTestCase;
-
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.PerformRefactoringOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class RefactoringPerformanceTestCase extends JdtPerformanceTestCase {
-	
-	public RefactoringPerformanceTestCase() {
-		super();
-	}
-		
-	public RefactoringPerformanceTestCase(String name) {
-		super(name);
-	}
-	
-	protected void executeRefactoring(Refactoring refactoring) throws Exception {
-		executeRefactoring(refactoring, RefactoringStatus.WARNING);
-	}
-	
-	protected void executeRefactoring(Refactoring refactoring, int maxSeverity) throws Exception {
-		executeRefactoring(refactoring, maxSeverity, true);
-	}
-	
-	protected void executeRefactoring(Refactoring refactoring, int maxSeverity, boolean checkUndo) throws Exception {
-		PerformRefactoringOperation operation= new PerformRefactoringOperation(refactoring, CheckConditionsOperation.ALL_CONDITIONS);
-		joinBackgroudActivities();
-		System.gc();
-		startMeasuring();
-		ResourcesPlugin.getWorkspace().run(operation, null);
-		finishMeasurements();
-		assertEquals(true, operation.getConditionStatus().getSeverity() <= maxSeverity);
-		assertEquals(true, operation.getValidationStatus().isOK());
-		if (checkUndo) {
-			assertNotNull(operation.getUndoChange());
-		}
-		RefactoringCore.getUndoManager().flush();
-		System.gc();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringPerformanceTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringPerformanceTestSetup.java
deleted file mode 100644
index 6f8ff8a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringPerformanceTestSetup.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import junit.framework.Test;
-
-public class RefactoringPerformanceTestSetup extends AbstractRefactoringTestSetup {
-
-	public RefactoringPerformanceTestSetup(Test test) {
-		super(test);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestPlugin.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestPlugin.java
deleted file mode 100644
index accc408..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestPlugin.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-
-public class RefactoringTestPlugin extends Plugin {
-	
-	private static RefactoringTestPlugin fgDefault;
-	
-	public RefactoringTestPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		fgDefault= this;
-	}
-	
-	public static RefactoringTestPlugin getDefault() {
-		return fgDefault;
-	}
-	
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	public static void enableAutobuild(boolean enable) throws CoreException {
-		// disable auto build
-		IWorkspace workspace= getWorkspace();
-		IWorkspaceDescription desc= workspace.getDescription();
-		desc.setAutoBuilding(enable);
-		workspace.setDescription(desc);
-	}
-	
-	public InputStream getTestResourceStream(String fileName) throws IOException {
-		IPath path= new Path("resources").append(fileName);
-		URL url= new URL(getDescriptor().getInstallURL(), path.toString());
-		return url.openStream();
-	}
-	
-	public File getFileInPlugin(IPath path) {
-		try {
-			URL installURL= new URL(getDescriptor().getInstallURL(), path.toString());
-			URL localURL= Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/SWTProjectTestSetup.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/SWTProjectTestSetup.java
deleted file mode 100644
index 61d36b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/SWTProjectTestSetup.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import junit.framework.Test;
-
-import org.eclipse.jdt.ui.tests.performance.SWTTestProject;
-
-public class SWTProjectTestSetup extends RefactoringPerformanceTestSetup {
-	
-	private SWTTestProject fTestProject;
-	
-	public SWTProjectTestSetup(Test test) {
-		super(test);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new SWTTestProject();
-	}
-	
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/SimpleSelectionProvider.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/SimpleSelectionProvider.java
deleted file mode 100644
index ce07773..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/SimpleSelectionProvider.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import java.util.Collection;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.jdt.internal.corext.Assert;
-
-public class SimpleSelectionProvider implements ISelectionProvider {
-	private ISelection fSelection;
-
-	public SimpleSelectionProvider(Collection collection) {
-		this(collection.toArray());
-	}
-	
-	public SimpleSelectionProvider(Object[] elements) {
-		Assert.isNotNull(elements);
-		fSelection= new StructuredSelection(elements);
-	}
-
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-	}
-
-	public ISelection getSelection() {
-		return fSelection;
-	}
-
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-	}
-
-	public void setSelection(ISelection selection) {
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/TextRangeUtil.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/TextRangeUtil.java
deleted file mode 100644
index 90922e5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/TextRangeUtil.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.infra;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.ISourceRange;
-
-import org.eclipse.jdt.internal.corext.SourceRange;
-
-public class TextRangeUtil {
-
-	//no instances
-	private TextRangeUtil(){}
-	
-	public static ISourceRange getSelection(ICompilationUnit cu, int startLine, int startColumn, int endLine, int endColumn) throws Exception{
-		int offset= getOffset(cu, startLine, startColumn);
-		int end= getOffset(cu, endLine, endColumn);
-		return new SourceRange(offset, end - offset);
-	}
-
-	public static int getOffset(ICompilationUnit cu, int line, int column) throws Exception{
-		IDocument document= new Document(cu.getSource());
-		int r= document.getLineInformation(line - 1).getOffset();
-		IRegion region= document.getLineInformation(line - 1);
-		int lineTabCount= calculateTabCountInLine(document.get(region.getOffset(), region.getLength()), column);		
-		r += (column - 1) - (lineTabCount * getTabWidth()) + lineTabCount;
-		return r ;
-	}
-	
-	private static final int getTabWidth(){
-		return 4;
-	}
-	
-	public static int calculateTabCountInLine(String lineSource, int lastCharOffset){
-		int acc= 0;
-		int charCount= 0;
-		for(int i= 0; charCount < lastCharOffset - 1; i++){
-			if ('\t' == lineSource.charAt(i)){
-				acc++;
-				charCount += getTabWidth();
-			}	else
-				charCount += 1;
-		}
-		return acc;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveCompilationUnitPrefTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveCompilationUnitPrefTest.java
deleted file mode 100644
index fb1fe92..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveCompilationUnitPrefTest.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-
-import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaMoveProcessor;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-import org.eclipse.jdt.ui.tests.reorg.MockReorgQueries;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
-
-
-public class AbstractMoveCompilationUnitPrefTest extends RefactoringPerformanceTestCase {
-
-	private TestProject fTestProject;
-
-	public AbstractMoveCompilationUnitPrefTest(String name) {
-		super(name);
-	}
-	
-	public TestProject getTestProject() {
-		return fTestProject;
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new TestProject();
-	}
-
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-
-	protected void executeRefactoring(ICompilationUnit cunit) throws Exception {
-		JavaMoveProcessor processor= JavaMoveProcessor.create(
-			new IResource[0], 
-			new IJavaElement[] {cunit},
-			JavaPreferencesSettings.getCodeGenerationSettings());
-		IPackageFragment destination= fTestProject.getSourceFolder().createPackageFragment("destination", false, null); 
-		processor.setDestination(destination);
-		processor.setReorgQueries(new MockReorgQueries());
-		processor.setUpdateReferences(true);
-		executeRefactoring(new MoveRefactoring(processor), RefactoringStatus.WARNING, false);
-	}
-
-	protected ICompilationUnit generateSources(int numberOfCus, int numberOfRefs) throws Exception {
-		IPackageFragment source= fTestProject.getSourceFolder().createPackageFragment("source", false, null); 
-		StringBuffer buf= new StringBuffer();
-		buf.append("package source;\n");
-		buf.append("public class A {\n");
-		buf.append("}\n");
-		ICompilationUnit result= source.createCompilationUnit("A.java", buf.toString(), false, null);
-	
-		IPackageFragment references= fTestProject.getSourceFolder().createPackageFragment("ref", false, null);
-		for(int i= 0; i < numberOfCus; i++) {
-			createReferenceCu(references, i, numberOfRefs);
-		}
-		return result;
-	}
-
-	private static void createReferenceCu(IPackageFragment pack, int index, int numberOfRefs) throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package " + pack.getElementName() + ";\n");
-		buf.append("public class Ref" + index + " {\n");
-		for (int i= 0; i < numberOfRefs - 1; i++) {
-			buf.append("    source.A field" + i +";\n");
-		}
-		buf.append("}\n");
-		pack.createCompilationUnit("Ref" + index + ".java", buf.toString(), false, null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveStaticMemberPrefTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveStaticMemberPrefTest.java
deleted file mode 100644
index 2e635b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveStaticMemberPrefTest.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.refactoring.structure.MoveStaticMembersProcessor;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-
-import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
-
-
-public class AbstractMoveStaticMemberPrefTest extends RefactoringPerformanceTestCase {
-
-	private TestProject fTestProject;
-
-	public AbstractMoveStaticMemberPrefTest(String name) {
-		super(name);
-	}
-	
-	public TestProject getTestProject() {
-		return fTestProject;
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new TestProject();
-	}
-
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-
-	protected void executeRefactoring(ICompilationUnit cunit) throws Exception {
-		IType type= cunit.findPrimaryType();
-		IMember member= type.getField("VALUE");
-		MoveStaticMembersProcessor processor= MoveStaticMembersProcessor.create(
-			new IMember[] {member},
-			JavaPreferencesSettings.getCodeGenerationSettings());
-		IPackageFragment destPack= fTestProject.getSourceFolder().createPackageFragment("destination", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package destination;\n");
-		buf.append("public class Dest {\n");
-		buf.append("}\n");
-		ICompilationUnit destination= destPack.createCompilationUnit("Dest.java", buf.toString(), false, null);
-		
-		processor.setDestinationTypeFullyQualifiedName(destination.findPrimaryType().getFullyQualifiedName());
-		executeRefactoring(new MoveRefactoring(processor));
-	}
-
-	protected ICompilationUnit generateSources(int numberOfCus, int numberOfRefs) throws Exception {
-		IPackageFragment source= fTestProject.getSourceFolder().createPackageFragment("source", false, null); 
-		StringBuffer buf= new StringBuffer();
-		buf.append("package source;\n");
-		buf.append("public class A {\n");
-		buf.append("    public static final int VALUE= 10;\n");
-		buf.append("}\n");
-		ICompilationUnit result= source.createCompilationUnit("A.java", buf.toString(), false, null);
-	
-		IPackageFragment references= fTestProject.getSourceFolder().createPackageFragment("ref", false, null);
-		for(int i= 0; i < numberOfCus; i++) {
-			createReferenceCu(references, i, numberOfRefs);
-		}
-		return result;
-	}
-
-	private static void createReferenceCu(IPackageFragment pack, int index, int numberOfRefs) throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package " + pack.getElementName() + ";\n");
-		buf.append("import source.A;\n");
-		buf.append("public class Ref" + index + " {\n");
-		for (int i= 0; i < numberOfRefs - 1; i++) {
-			buf.append("    int field" + i +"= A.VALUE;\n");
-		}
-		buf.append("}\n");
-		pack.createCompilationUnit("Ref" + index + ".java", buf.toString(), false, null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenameMethodPerfTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenameMethodPerfTest.java
deleted file mode 100644
index 3a0b4bd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenameMethodPerfTest.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameVirtualMethodProcessor;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-
-public class AbstractRenameMethodPerfTest extends RefactoringPerformanceTestCase {
-
-	protected TestProject fTestProject;
-
-	public AbstractRenameMethodPerfTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new TestProject();
-	}
-
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-
-	protected void executeRefactoring(ICompilationUnit cunit) throws Exception {
-		IMethod method= cunit.findPrimaryType().getMethod("foo", new String[0]);
-		RenameVirtualMethodProcessor processor= new RenameVirtualMethodProcessor(method);
-		processor.setNewElementName("foo2");
-		executeRefactoring(new RenameRefactoring(processor));
-	}
-
-	protected ICompilationUnit generateSources(int numberOfCus, int numberOfRefs) throws Exception {
-		IPackageFragment definition= fTestProject.getSourceFolder().createPackageFragment("def", false, null); 
-		StringBuffer buf= new StringBuffer();
-		buf.append("package def;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit result= definition.createCompilationUnit("A.java", buf.toString(), false, null);
-	
-		IPackageFragment references= fTestProject.getSourceFolder().createPackageFragment("ref", false, null);
-		for(int i= 0; i < numberOfCus; i++) {
-			createReferenceCu(references, i, numberOfRefs);
-		}
-		return result;
-	}
-
-	private void createReferenceCu(IPackageFragment pack, int index, int numberOfRefs) throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package " + pack.getElementName() + ";\n");
-		buf.append("import def.A;\n");
-		buf.append("public class Ref" + index + " {\n");
-		buf.append("    public void ref(A a) {\n");
-		for (int i= 0; i < numberOfRefs; i++) {
-			buf.append("        a.foo();\n");
-		}
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack.createCompilationUnit("Ref" + index + ".java", buf.toString(), false, null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenamePackagePerfTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenamePackagePerfTest.java
deleted file mode 100644
index b942d82..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenamePackagePerfTest.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import org.eclipse.jdt.core.IPackageFragment;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenamePackageProcessor;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class AbstractRenamePackagePerfTest extends RefactoringPerformanceTestCase {
-
-	protected TestProject fTestProject;
-
-	public AbstractRenamePackagePerfTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new TestProject();
-	}
-
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-
-	protected void executeRefactoring(IPackageFragment pack) throws Exception {
-		RenamePackageProcessor processor= new RenamePackageProcessor(pack);
-		processor.setNewElementName("pack2");
-		executeRefactoring(new RenameRefactoring(processor));
-	}
-
-	protected IPackageFragment generateSources(int numberOfCus, int numberOfRefs) throws Exception {
-		IPackageFragment pack= fTestProject.getSourceFolder().createPackageFragment("pack", false, null);
-		for (int i= 0; i < numberOfRefs; i++) {
-			StringBuffer buf= new StringBuffer();
-			buf.append("package pack;\n");
-			buf.append("public class A" + i + " {\n");
-			buf.append("}\n");
-			pack.createCompilationUnit("A" + i + ".java", buf.toString(), false, null);
-		}
-	
-		IPackageFragment references= fTestProject.getSourceFolder().createPackageFragment("ref", false, null);
-		for(int i= 0; i < numberOfCus; i++) {
-			createReferenceCu(references, i, numberOfRefs);
-		}
-		return pack;
-	}
-
-	private static void createReferenceCu(IPackageFragment pack, int index, int numberOfRefs) throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package " + pack.getElementName() + ";\n");
-		for (int i= 0; i < numberOfRefs; i++) {
-			buf.append("import pack.A" + i + ";\n");
-		}
-		buf.append("public class Ref" + index + " {\n");
-		buf.append("}\n");
-		pack.createCompilationUnit("Ref" + index + ".java", buf.toString(), false, null);
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenameTypePerfTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenameTypePerfTest.java
deleted file mode 100644
index 08a2171..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractRenameTypePerfTest.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameTypeProcessor;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-
-public class AbstractRenameTypePerfTest extends RefactoringPerformanceTestCase {
-
-	protected TestProject fTestProject;
-
-	public AbstractRenameTypePerfTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new TestProject();
-	}
-
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-
-	protected void executeRefactoring(ICompilationUnit cunit) throws Exception {
-		IType type= cunit.findPrimaryType();
-		RenameTypeProcessor processor= new RenameTypeProcessor(type);
-		processor.setNewElementName("B");
-		executeRefactoring(new RenameRefactoring(processor));
-	}
-
-	protected ICompilationUnit generateSources(int numberOfCus, int numberOfRefs) throws Exception {
-		IPackageFragment definition= fTestProject.getSourceFolder().createPackageFragment("def", false, null); 
-		StringBuffer buf= new StringBuffer();
-		buf.append("package def;\n");
-		buf.append("public class A {\n");
-		buf.append("}\n");
-		ICompilationUnit result= definition.createCompilationUnit("A.java", buf.toString(), false, null);
-	
-		IPackageFragment references= fTestProject.getSourceFolder().createPackageFragment("ref", false, null);
-		for(int i= 0; i < numberOfCus; i++) {
-			createReferenceCu(references, i, numberOfRefs);
-		}
-		return result;
-	}
-
-	private void createReferenceCu(IPackageFragment pack, int index, int numberOfRefs) throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package " + pack.getElementName() + ";\n");
-		buf.append("import def.A;\n");
-		buf.append("public class Ref" + index + " {\n");
-		for (int i= 0; i < numberOfRefs - 1; i++) {
-			buf.append("    A field" + i +";\n");
-		}
-		buf.append("}\n");
-		pack.createCompilationUnit("Ref" + index + ".java", buf.toString(), false, null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AllReorgPerformanceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AllReorgPerformanceTests.java
deleted file mode 100644
index ce25aa5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AllReorgPerformanceTests.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllReorgPerformanceTests {
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite("All Refactoring Performance Tests"); //$NON-NLS-1$
-		suite.addTest(RenamePackagePerfTests1.suite());
-		suite.addTest(RenamePackagePerfTests2.suite());
-		
-		suite.addTest(RenameTypePerfAcceptanceTests.suite());
-		suite.addTest(RenameTypePerfTests1.suite());
-		suite.addTest(RenameTypePerfTests2.suite());
-		
-		suite.addTest(RenameMethodPerfTests1.suite());
-		suite.addTest(RenameMethodPerfTests2.suite());
-		suite.addTest(RenameMethodWithHidingPerfTests.suite());
-		suite.addTest(RenameMethodWithOverloadPerfTests.suite());
-		
-		suite.addTest(MoveCompilationUnitPerfTests1.suite());
-		suite.addTest(MoveCompilationUnitPerfTests2.suite());
-		
-		suite.addTest(MoveStaticMembersPerfTests1.suite());
-		suite.addTest(MoveStaticMembersPerfTests2.suite());
-		
-		return suite;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests1.java
deleted file mode 100644
index fa0d3f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests1.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class MoveCompilationUnitPerfTests1 extends AbstractMoveCompilationUnitPrefTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("MoveCompilationUnitPerfTests1");
-		suite.addTest(new MoveCompilationUnitPerfTests1("testCold_10_10"));
-		suite.addTest(new MoveCompilationUnitPerfTests1("test_10_10"));
-		suite.addTest(new MoveCompilationUnitPerfTests1("test_100_10"));
-		suite.addTest(new MoveCompilationUnitPerfTests1("test_1000_10"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public MoveCompilationUnitPerfTests1(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_100_10() throws Exception {
-		executeRefactoring(generateSources(100, 10));
-	}
-	
-	public void test_1000_10() throws Exception {
-		executeRefactoring(generateSources(1000, 10));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests2.java
deleted file mode 100644
index 91a92b0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests2.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class MoveCompilationUnitPerfTests2 extends AbstractMoveCompilationUnitPrefTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("MoveCompilationUnitPerfTests2");
-		suite.addTest(new MoveCompilationUnitPerfTests2("testCold_10_10"));
-		suite.addTest(new MoveCompilationUnitPerfTests2("test_10_10"));
-		suite.addTest(new MoveCompilationUnitPerfTests2("test_10_100"));
-		suite.addTest(new MoveCompilationUnitPerfTests2("test_10_1000"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public MoveCompilationUnitPerfTests2(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_100() throws Exception {
-		executeRefactoring(generateSources(10, 100));
-	}
-	
-	public void test_10_1000() throws Exception {
-		executeRefactoring(generateSources(10, 1000));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests1.java
deleted file mode 100644
index db76576..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests1.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class MoveStaticMembersPerfTests1 extends AbstractMoveCompilationUnitPrefTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("MoveStaticMembersPerfTests1");
-		suite.addTest(new MoveStaticMembersPerfTests1("testCold_10_10"));
-		suite.addTest(new MoveStaticMembersPerfTests1("test_10_10"));
-		suite.addTest(new MoveStaticMembersPerfTests1("test_100_10"));
-		suite.addTest(new MoveStaticMembersPerfTests1("test_1000_10"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public MoveStaticMembersPerfTests1(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_100_10() throws Exception {
-		executeRefactoring(generateSources(100, 10));
-	}
-	
-	public void test_1000_10() throws Exception {
-		executeRefactoring(generateSources(1000, 10));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests2.java
deleted file mode 100644
index 92f5c56..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests2.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class MoveStaticMembersPerfTests2 extends AbstractMoveCompilationUnitPrefTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("MoveStaticMembersPerfTests2");
-		suite.addTest(new MoveStaticMembersPerfTests2("testCold_10_10"));
-		suite.addTest(new MoveStaticMembersPerfTests2("test_10_10"));
-		suite.addTest(new MoveStaticMembersPerfTests2("test_10_100"));
-		suite.addTest(new MoveStaticMembersPerfTests2("test_10_1000"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public MoveStaticMembersPerfTests2(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_100() throws Exception {
-		executeRefactoring(generateSources(10, 100));
-	}
-	
-	public void test_10_1000() throws Exception {
-		executeRefactoring(generateSources(10, 1000));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests1.java
deleted file mode 100644
index 372b823..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests1.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class RenameMethodPerfTests1 extends AbstractRenameMethodPerfTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenameTypePerfAcceptanceTests1");
-		suite.addTest(new RenameMethodPerfTests1("testCold_10_10"));
-		suite.addTest(new RenameMethodPerfTests1("test_10_10"));
-		suite.addTest(new RenameMethodPerfTests1("test_100_10"));
-		suite.addTest(new RenameMethodPerfTests1("test_1000_10"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public RenameMethodPerfTests1(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_100_10() throws Exception {
-		executeRefactoring(generateSources(100, 10));
-	}
-	
-	public void test_1000_10() throws Exception {
-		executeRefactoring(generateSources(1000, 10));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests2.java
deleted file mode 100644
index 570ebaf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests2.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class RenameMethodPerfTests2 extends AbstractRenameMethodPerfTest {
-
-	private TestProject fTestProject;
-	
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenameTypePerfAcceptanceTests2");
-		suite.addTest(new RenameMethodPerfTests2("testCold_10_10"));
-		suite.addTest(new RenameMethodPerfTests2("test_10_10"));
-		suite.addTest(new RenameMethodPerfTests2("test_10_100"));
-		suite.addTest(new RenameMethodPerfTests2("test_10_1000"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public RenameMethodPerfTests2(String name) {
-		super(name);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new TestProject();
-	}
-	
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-	
-	public void testCold_10_10() throws Exception {
-		// 100 referencing CUs each containing 10 references
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_100() throws Exception {
-		executeRefactoring(generateSources(10, 100));
-	}
-	
-	public void test_10_1000() throws Exception {
-		executeRefactoring(generateSources(10, 1000));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodWithHidingPerfTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodWithHidingPerfTests.java
deleted file mode 100644
index 0dbd51c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodWithHidingPerfTests.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameVirtualMethodProcessor;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameMethodWithHidingPerfTests extends RefactoringPerformanceTestCase {
-
-	private TestProject fTestProject;
-	
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenameMethodWithHidingPerfTests");
-		suite.addTest(new RenameMethodWithHidingPerfTests("testCold_10_10"));
-		suite.addTest(new RenameMethodWithHidingPerfTests("test_10_10"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public RenameMethodWithHidingPerfTests(String name) {
-		super(name);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new TestProject();
-	}
-	
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-	
-	public void testCold_10_10() throws Exception {
-		// 100 referencing CUs each containing 10 references
-		executeRefactoring(generateSources(fTestProject));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(fTestProject));
-	}
-	
-	private void executeRefactoring(ICompilationUnit cunit) throws Exception {
-		IMethod method= cunit.findPrimaryType().getMethod("setString", new String[] {"QString;"});
-		RenameVirtualMethodProcessor processor= new RenameVirtualMethodProcessor(method);
-		processor.setNewElementName("set");
-		executeRefactoring(new RenameRefactoring(processor), RefactoringStatus.ERROR);
-	}
-	
-	private static ICompilationUnit generateSources(TestProject testProject) throws Exception {
-		IPackageFragment definition= testProject.getSourceFolder().createPackageFragment("def", false, null); 
-		StringBuffer buf= new StringBuffer();
-		buf.append("package def;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void setString(String s) {\n");
-		buf.append("    }\n");
-		buf.append("    public class Defines {\n");
-		buf.append("        public void set(String s) {}\n");
-		buf.append("    }\n");
-		buf.append("    public class Ref extends Defines {\n");
-		buf.append("        public void ref() {\n");
-		buf.append("            setString(\"Eclipse\");\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		return definition.createCompilationUnit("A.java", buf.toString(), false, null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodWithOverloadPerfTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodWithOverloadPerfTests.java
deleted file mode 100644
index 1a6e109..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodWithOverloadPerfTests.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameVirtualMethodProcessor;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameMethodWithOverloadPerfTests extends RefactoringPerformanceTestCase {
-
-	private TestProject fTestProject;
-	
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenameMethodWithOverloadPerfTests");
-		suite.addTest(new RenameMethodWithOverloadPerfTests("testCold_10_10"));
-		suite.addTest(new RenameMethodWithOverloadPerfTests("test_10_10"));
-		suite.addTest(new RenameMethodWithOverloadPerfTests("test_100_10"));
-		suite.addTest(new RenameMethodWithOverloadPerfTests("test_1000_10"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public RenameMethodWithOverloadPerfTests(String name) {
-		super(name);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fTestProject= new TestProject();
-	}
-	
-	protected void tearDown() throws Exception {
-		fTestProject.delete();
-		super.tearDown();
-	}
-	
-	public void testCold_10_10() throws Exception {
-		// 100 referencing CUs each containing 10 references
-		executeRefactoring(generateSources(fTestProject, 10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(fTestProject, 10, 10));
-	}
-	
-	public void test_100_10() throws Exception {
-		executeRefactoring(generateSources(fTestProject, 100, 10));
-	}
-	
-	public void test_1000_10() throws Exception {
-		executeRefactoring(generateSources(fTestProject, 1000, 10));
-	}
-
-	private void executeRefactoring(ICompilationUnit cunit) throws Exception {
-		IMethod method= cunit.findPrimaryType().getMethod("setString", new String[] {"QString;"});
-		RenameVirtualMethodProcessor processor= new RenameVirtualMethodProcessor(method);
-		processor.setNewElementName("set");
-		executeRefactoring(new RenameRefactoring(processor));
-	}
-	
-	private static ICompilationUnit generateSources(TestProject testProject, int numberOfCus, int numberOfRefs) throws Exception {
-		IPackageFragment definition= testProject.getSourceFolder().createPackageFragment("def", false, null); 
-		StringBuffer buf= new StringBuffer();
-		buf.append("package def;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void set(Object s) {\n");
-		buf.append("    }\n");
-		buf.append("    public void setString(String s) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit result= definition.createCompilationUnit("A.java", buf.toString(), false, null);
-	
-		IPackageFragment references= testProject.getSourceFolder().createPackageFragment("ref", false, null);
-		for(int i= 0; i < numberOfCus; i++) {
-			createReferenceCu(references, i, numberOfRefs);
-		}
-		return result;
-	}
-
-	private static void createReferenceCu(IPackageFragment pack, int index, int numberOfRefs) throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package " + pack.getElementName() + ";\n");
-		buf.append("import def.A;\n");
-		buf.append("public class Ref" + index + " {\n");
-		buf.append("    public void ref(A a) {\n");
-		buf.append("        String s= \"Eclipse\");\n");
-		for (int i= 0; i < numberOfRefs; i++) {
-			buf.append("        a.set(s);\n");
-			buf.append("        a.setString(s);\n");
-		}
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack.createCompilationUnit("Ref" + index + ".java", buf.toString(), false, null);
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests1.java
deleted file mode 100644
index 5f8dabf..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests1.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class RenamePackagePerfTests1 extends AbstractRenamePackagePerfTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenamePackagePerfTests1");
-		suite.addTest(new RenamePackagePerfTests1("testCold_10_10"));
-		suite.addTest(new RenamePackagePerfTests1("test_10_10"));
-		suite.addTest(new RenamePackagePerfTests1("test_100_10"));
-		suite.addTest(new RenamePackagePerfTests1("test_1000_10"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public RenamePackagePerfTests1(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_100_10() throws Exception {
-		executeRefactoring(generateSources(100, 10));
-	}
-	
-	public void test_1000_10() throws Exception {
-		executeRefactoring(generateSources(1000, 10));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests2.java
deleted file mode 100644
index 64c8cca..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests2.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class RenamePackagePerfTests2 extends AbstractRenamePackagePerfTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenamePackagePerfTests2");
-		suite.addTest(new RenamePackagePerfTests2("testCold_10_10"));
-		suite.addTest(new RenamePackagePerfTests2("test_10_10"));
-		suite.addTest(new RenamePackagePerfTests2("test_10_100"));
-		suite.addTest(new RenamePackagePerfTests2("test_10_1000"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public RenamePackagePerfTests2(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_100() throws Exception {
-		executeRefactoring(generateSources(10, 100));
-	}
-	
-	public void test_10_1000() throws Exception {
-		executeRefactoring(generateSources(10, 1000));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfAcceptanceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfAcceptanceTests.java
deleted file mode 100644
index 1b6ca3e..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfAcceptanceTests.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.corext.refactoring.rename.RenameTypeProcessor;
-
-import org.eclipse.jdt.ui.tests.performance.SWTTestProject;
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-import org.eclipse.jdt.ui.tests.refactoring.infra.SWTProjectTestSetup;
-
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class RenameTypePerfAcceptanceTests extends RefactoringPerformanceTestCase {
-	
-	private IJavaProject fProject;
-	
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenameTypePerfAcceptanceTests");
-		suite.addTest(new RenameTypePerfAcceptanceTests("testCold"));
-		suite.addTest(new RenameTypePerfAcceptanceTests("testWarm"));
-        return new SWTProjectTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new SWTProjectTestSetup(someTest);
-	}
-
-	public RenameTypePerfAcceptanceTests(String test) {
-		super(test);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fProject= (IJavaProject)JavaCore.create(
-			ResourcesPlugin.getWorkspace().getRoot().findMember(SWTTestProject.PROJECT));
-	}
-	
-	public void testCold() throws Exception {
-		IType control= fProject.findType("org.eclipse.swt.widgets.Control");
-		RenameTypeProcessor processor= new RenameTypeProcessor(control);
-		processor.setNewElementName("Control2");
-		executeRefactoring(new RenameRefactoring(processor));
-	}
-	
-	public void testWarm() throws Exception {
-		IType control= fProject.findType("org.eclipse.swt.widgets.Control2");
-		RenameTypeProcessor processor= new RenameTypeProcessor(control);
-		processor.setNewElementName("Control");
-		executeRefactoring(new RenameRefactoring(processor));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests1.java
deleted file mode 100644
index ab26540..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests1.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class RenameTypePerfTests1 extends AbstractRenameTypePerfTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenameTypePerfTests1");
-		suite.addTest(new RenameTypePerfTests1("testCold_10_10"));
-		suite.addTest(new RenameTypePerfTests1("test_10_10"));
-		suite.addTest(new RenameTypePerfTests1("test_100_10"));
-		suite.addTest(new RenameTypePerfTests1("test_1000_10"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public RenameTypePerfTests1(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_100_10() throws Exception {
-		executeRefactoring(generateSources(100, 10));
-	}
-	
-	public void test_1000_10() throws Exception {
-		executeRefactoring(generateSources(1000, 10));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests2.java
deleted file mode 100644
index bd63fe0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests2.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.refactoring.infra.AbstractRefactoringTestSetup;
-
-public class RenameTypePerfTests2 extends AbstractRenameTypePerfTest {
-
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("RenameTypePerfTests2");
-		suite.addTest(new RenameTypePerfTests2("testCold_10_10"));
-		suite.addTest(new RenameTypePerfTests2("test_10_10"));
-		suite.addTest(new RenameTypePerfTests2("test_10_100"));
-		suite.addTest(new RenameTypePerfTests2("test_10_1000"));
-		return new AbstractRefactoringTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new AbstractRefactoringTestSetup(someTest);
-	}
-
-	public RenameTypePerfTests2(String name) {
-		super(name);
-	}
-	
-	public void testCold_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_10() throws Exception {
-		executeRefactoring(generateSources(10, 10));
-	}
-	
-	public void test_10_100() throws Exception {
-		executeRefactoring(generateSources(10, 100));
-	}
-	
-	public void test_10_1000() throws Exception {
-		executeRefactoring(generateSources(10, 1000));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/TestProject.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/TestProject.java
deleted file mode 100644
index e181282..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/TestProject.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.reorg;
-
-import junit.framework.Assert;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-
-public class TestProject {
-	
-	private IJavaProject fTestProject;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public TestProject() throws Exception {
-		this("TestProject");
-	}
-	
-	public TestProject(String name) throws Exception {
-		fTestProject= JavaProjectHelper.createJavaProject(name, "bin");
-		Assert.assertTrue("rt not found", JavaProjectHelper.addRTJar(fTestProject) != null);
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fTestProject, "src");
-	}
-	
-	public IJavaProject getProject() {
-		return fTestProject;
-	}
-	
-	public IPackageFragmentRoot getSourceFolder() {
-		return fSourceFolder;
-	}
-	
-	public void delete() throws Exception {
-		if (fTestProject != null && fTestProject.exists())
-			JavaProjectHelper.delete(fTestProject);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java
deleted file mode 100644
index 7411e02..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.refactoring.type;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceRefactoring;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.ui.tests.performance.SWTTestProject;
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestCase;
-import org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringPerformanceTestSetup;
-
-public class ExtractInterfacePerfAcceptanceTests extends RefactoringPerformanceTestCase {
-	
-	private SWTTestProject fProject;
-	private ExtractInterfaceRefactoring fRefactoring;
-	
-	public static Test suite() {
-		// we must make sure that cold is executed before warm
-		TestSuite suite= new TestSuite("ExtractInterfacePerfAcceptanceTests");
-		suite.addTest(new ExtractInterfacePerfAcceptanceTests("testExtractControl"));
-        return new RefactoringPerformanceTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringPerformanceTestSetup(someTest);
-	}
-
-	public ExtractInterfacePerfAcceptanceTests(String test) {
-		super(test);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fProject= new SWTTestProject();
-		IType control= fProject.getProject().findType("org.eclipse.swt.widgets.Control");
-		fRefactoring= ExtractInterfaceRefactoring.create(control, JavaPreferencesSettings.getCodeGenerationSettings());
-		IMethod[] methods= control.getMethods();
-		List extractedMembers= new ArrayList();
-		for (int i= 0; i < methods.length; i++) {
-			IMethod method= methods[i];
-			int flags= method.getFlags();
-			if (Flags.isPublic(flags) && !Flags.isStatic(flags) && !method.isConstructor()) {
-				extractedMembers.add(method);
-			}
-		}
-		fRefactoring.setNewInterfaceName("IControl");
-		fRefactoring.setExtractedMembers((IMember[])extractedMembers.toArray(new IMember[extractedMembers.size()]));
-		fRefactoring.setReplaceOccurrences(true);
-	}
-	
-	protected void tearDown() throws Exception {
-		fProject.delete();
-		super.tearDown();
-	}
-	
-	public void testExtractControl() throws Exception {
-		executeRefactoring(fRefactoring);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/AllTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/AllTests.java
deleted file mode 100644
index 37684e0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/AllTests.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-	
-	public static Test suite ( ) {
-		TestSuite suite= new TestSuite("All Reorg Tests");
-		suite.addTest(DeleteTest.suite());
-		suite.addTest(CopyToClipboardActionTest.suite());
-		suite.addTest(PasteActionTest.suite());
-		suite.addTest(CopyTest.suite());
-		suite.addTest(MoveTest.suite());
-		suite.addTest(MultiMoveTest.suite());
-		
-		//------old reorg tests
-		suite.addTest(CopyResourcesToClipboardActionTest.suite());
-		suite.addTest(PasteResourcesFromClipboardActionTest.suite());
-
-		return suite;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyResourcesToClipboardActionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyResourcesToClipboardActionTest.java
deleted file mode 100644
index 912693a..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyResourcesToClipboardActionTest.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceManipulation;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.ui.actions.SelectionDispatchAction;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-import org.eclipse.jdt.ui.tests.refactoring.infra.MockClipboard;
-import org.eclipse.jdt.ui.tests.refactoring.infra.MockWorkbenchSite;
-
-import org.eclipse.jdt.internal.ui.refactoring.reorg.CopyToClipboardAction;
-import org.eclipse.jdt.internal.ui.refactoring.reorg.PasteAction;
-
-public class CopyResourcesToClipboardActionTest extends RefactoringTest{
-
-	private static final Class clazz= CopyResourcesToClipboardActionTest.class;
-
-	private ICompilationUnit fCuA;
-	private ICompilationUnit fCuB;	
-	private IPackageFragment fPackageQ;
-	private IPackageFragment fPackageQ_R;
-	private IPackageFragment fDefaultPackage;
-	private static final String CU_A_NAME= "A";
-	private static final String CU_B_NAME= "B";
-	private IFile faTxt;
-
-	private Clipboard fClipboard;
-	
-	public CopyResourcesToClipboardActionTest(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	private IFile createFile(IFolder folder, String fileName) throws Exception {
-		IFile file= folder.getFile(fileName);
-		file.create(getStream("aa"), true, null);	
-		return file;
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fClipboard= new MockClipboard(Display.getDefault());
-		fDefaultPackage= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment("", true, null);
-		
-		fCuA= createCU(getPackageP(), CU_A_NAME + ".java", "package p; class A{}");
-		
-		fPackageQ= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment("q", true, null);
-		fCuB= createCU(fPackageQ, CU_B_NAME + ".java", "package q; class B{}");
-		
-		fPackageQ_R= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment("q.r", true, null);
-		
-		faTxt= createFile((IFolder)getPackageP().getUnderlyingResource(), "a.txt");
-		
-		assertTrue("A.java does not exist", fCuA.exists());
-		assertTrue("B.java does not exist", fCuB.exists());
-		assertTrue("q does not exist", fPackageQ.exists());
-		assertTrue("q.r does not exist", fPackageQ_R.exists());
-		assertTrue(faTxt.exists());
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		performDummySearch();
-		fClipboard.dispose();
-		delete(fCuA);
-		delete(fCuB);
-		delete(fPackageQ_R);
-		delete(fPackageQ);
-		delete(faTxt);
-	}
-
-	private static void delete(ISourceManipulation element) {
-		try {
-			if (element != null && ((IJavaElement)element).exists())
-				element.delete(false, null);
-		} catch(JavaModelException e) {
-			//ignore, we must keep going
-		}		
-	}
-	private static void delete(IFile element) {
-		try {
-			element.delete(true, false, null);
-		} catch(CoreException e) {
-			//ignore, we must keep going
-		}
-	}
-
-	private void checkEnabled(Object[] elements) {
-		SelectionDispatchAction pasteAction= new PasteAction(new MockWorkbenchSite(elements), fClipboard);
-		SelectionDispatchAction copyAction= new CopyToClipboardAction(new MockWorkbenchSite(elements), fClipboard, pasteAction);
-		copyAction.update(copyAction.getSelection());
-		assertTrue("action should be enabled", copyAction.isEnabled());
-	}
-	
-	private void checkDisabled(Object[] elements) {
-		SelectionDispatchAction pasteAction= new PasteAction(new MockWorkbenchSite(elements), fClipboard);
-		SelectionDispatchAction copyAction= new CopyToClipboardAction(new MockWorkbenchSite(elements), fClipboard, pasteAction);
-		copyAction.update(copyAction.getSelection());
-		assertTrue("action should not be enabled", ! copyAction.isEnabled());
-	}
-	
-	public void testEnabled0() throws Exception{
-		checkEnabled(new Object[]{fCuA});
-	}
-
-	public void testEnabled1() throws Exception{
-		checkEnabled(new Object[]{getRoot().getJavaProject()});
-	}
-		
-	public void testEnabled2() throws Exception{
-		checkEnabled(new Object[]{getPackageP()});
-	}
-	
-	public void testEnabled3() throws Exception{
-		checkEnabled(new Object[]{getPackageP(), fPackageQ, fPackageQ_R});
-	}
-
-	public void testEnabled4() throws Exception{
-		checkEnabled(new Object[]{faTxt});
-	}
-
-	public void testEnabled5() throws Exception{
-		checkEnabled(new Object[]{getRoot()});
-	}
-
-	public void testDisabled0() throws Exception{
-		checkDisabled(new Object[]{});
-	}
-
-	public void testDisabled1() throws Exception{
-		checkDisabled(new Object[]{getRoot().getJavaProject(), fCuA});
-	}
-
-	public void testDisabled2() throws Exception{
-		checkDisabled(new Object[]{getRoot().getJavaProject(), fPackageQ});
-	}
-
-	public void testDisabled3() throws Exception{
-		checkDisabled(new Object[]{getRoot().getJavaProject(), faTxt});
-	}
-
-	public void testDisabled4() throws Exception{
-		checkDisabled(new Object[]{getPackageP(), fCuA});
-	}
-
-	public void testDisabled5() throws Exception{
-		checkDisabled(new Object[]{getRoot(), fCuA});
-	}
-
-	public void testDisabled6() throws Exception{
-		checkDisabled(new Object[]{getRoot(), fPackageQ});
-	}
-
-	public void testDisabled7() throws Exception{
-		checkDisabled(new Object[]{getRoot(), faTxt});
-	}
-
-	public void testDisabled8() throws Exception{
-		checkDisabled(new Object[]{getRoot(), getRoot().getJavaProject()});
-	}
-
-	public void testDisabled9() throws Exception{
-		checkDisabled(new Object[]{RefactoringTestSetup.getProject().getPackageFragmentRoots()});
-	}
-
-	public void testDisabled10() throws Exception{
-		checkDisabled(new Object[]{fCuA, fCuB});
-	}
-	
-	public void testDisabled11() throws Exception{
-		checkDisabled(new Object[]{fDefaultPackage});
-	}
-	
-
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyTest.java
deleted file mode 100644
index 7df05d5..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyTest.java
+++ /dev/null

@@ -1,2807 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportContainer;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IInitializer;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.CopyRefactoring;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.INewNameQueries;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.INewNameQuery;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgQueries;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgUtils;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-
-public class CopyTest extends RefactoringTest {
-
-	private static final Class clazz= CopyTest.class;
-	private static final String REFACTORING_PATH= "Copy/";
-
-	public CopyTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	private void verifyDisabled(IResource[] resources, IJavaElement[] javaElements) throws JavaModelException {
-		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
-		assertTrue("copy should be disabled", ! CopyRefactoring.isAvailable(resources, javaElements, settings));
-		CopyRefactoring refactoring2= CopyRefactoring.create(resources, javaElements, settings);
-		assertTrue(refactoring2 == null);
-	}
-
-	private CopyRefactoring verifyEnabled(IResource[] resources, IJavaElement[] javaElements, INewNameQueries newNameQueries, IReorgQueries reorgQueries) throws JavaModelException {
-		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
-		assertTrue("copy should be enabled", CopyRefactoring.isAvailable(resources, javaElements, settings));
-		CopyRefactoring refactoring2= CopyRefactoring.create(resources, javaElements, settings);
-		assertNotNull(refactoring2);
-		if (newNameQueries != null)
-			refactoring2.setNewNameQueries(newNameQueries);
-		if (reorgQueries != null)
-			refactoring2.setReorgQueries(reorgQueries);
-		return refactoring2;
-	}
-	
-	private IReorgQueries createReorgQueries(){
-		return new MockReorgQueries();
-	}
-	
-	private void verifyInvalidDestination(CopyRefactoring ref, Object destination) throws Exception {
-		RefactoringStatus status= null;
-		if (destination instanceof IResource)
-			status= ref.setDestination((IResource)destination);
-		else if (destination instanceof IJavaElement)
-			status= ref.setDestination((IJavaElement)destination);
-		else assertTrue(false);
-		
-		assertEquals("destination was expected to be not valid",  RefactoringStatus.FATAL, status.getSeverity());
-	}
-	
-	private void verifyValidDestination(CopyRefactoring ref, Object destination) throws Exception {
-		RefactoringStatus status= null;
-		if (destination instanceof IResource)
-			status= ref.setDestination((IResource)destination);
-		else if (destination instanceof IJavaElement)
-			status= ref.setDestination((IJavaElement)destination);
-		else assertTrue(false);
-		
-		assertEquals("destination was expected to be valid: " + status.getMessageMatchingSeverity(status.getSeverity()), RefactoringStatus.OK, status.getSeverity());
-	}
-
-	private void verifyCopyingOfSubCuElements(ICompilationUnit[] cus, Object destination, IJavaElement[] javaElements) throws JavaModelException, Exception, IOException {
-		CopyRefactoring ref= verifyEnabled(new IResource[0], javaElements, new MockNewNameQueries(), createReorgQueries());
-		verifyValidDestination(ref, destination);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertNull("failed precondition", status);
-		for (int i= 0; i < cus.length; i++) {
-			assertEqualLines("different source in " + cus[i].getElementName(), getFileContents(getOutputTestFileName(removeExtension(cus[i].getElementName()))), cus[i].getSource());
-		}
-	}
-
-	private static class MockNewNameQueries implements INewNameQueries{
-
-		private static final String NEW_PACKAGE_NAME= "unused.name";
-		private static final String NEW_PACKAGE_FRAGMENT_ROOT_NAME= "UnusedName";
-		private static final String NEW_FILE_NAME= "UnusedName.gif";
-		private static final String NEW_FOLDER_NAME= "UnusedName";
-		private static final String NEW_CU_NAME= "UnusedName";
-		
-		public INewNameQuery createNewCompilationUnitNameQuery(ICompilationUnit cu, String s) {
-			return createStaticQuery(NEW_CU_NAME);
-		}
-
-		public INewNameQuery createNewResourceNameQuery(IResource res, String s) {
-			if (res instanceof IFile)
-				return createStaticQuery(NEW_FILE_NAME);
-			else
-				return createStaticQuery(NEW_FOLDER_NAME);
-		}
-
-		public INewNameQuery createNewPackageNameQuery(IPackageFragment pack, String s) {
-			return createStaticQuery(NEW_PACKAGE_NAME);
-		}
-
-		public INewNameQuery createNullQuery() {
-			return createStaticQuery(null);
-		}
-
-		public INewNameQuery createStaticQuery(final String newName) {
-			return new INewNameQuery(){
-				public String getNewName() {
-					return newName;
-				}
-			};
-		}
-
-		public INewNameQuery createNewPackageFragmentRootNameQuery(IPackageFragmentRoot root, String initialSuggestedName) {
-			return createStaticQuery(NEW_PACKAGE_FRAGMENT_ROOT_NAME);
-		}
-	}
-	//---------------
-	
-	public void test_field_declared_in_multi_yes_type() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IField field= cu.getType("A").getField("bar");
-			IType type= cu.getType("A");
-			IJavaElement[] javaElements= { field };
-			Object destination= type;
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_fields_declared_in_multi_yes_type() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IField field1= cu.getType("A").getField("bar");
-			IField field2= cu.getType("A").getField("baz");
-			IType type= cu.getType("A");
-			IJavaElement[] javaElements= { field1, field2 };
-			Object destination= type;
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_fields_declared_in_multi_yes_type_1() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IField field1= cu.getType("A").getField("var11");
-			IField field2= cu.getType("A").getField("var2");
-			IField field3= cu.getType("A").getField("var3");
-			IType type= cu.getType("A");
-			IJavaElement[] javaElements= { field1, field2, field3};
-			Object destination= type;
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDisabled_empty() throws Exception {
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);
-	}
-	
-	public void testDisabled_null_element() throws Exception {
-		IJavaElement[] javaElements= {null};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_null_resource() throws Exception {
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {null};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_javaProject() throws Exception {
-		IJavaElement[] javaElements= {RefactoringTestSetup.getProject()};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_defaultPackage() throws Exception {
-		IPackageFragment defaultPackage= getRoot().getPackageFragment("");
-		assertTrue(defaultPackage.exists());
-		IJavaElement[] javaElements= {defaultPackage};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_project() throws Exception {
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {RefactoringTestSetup.getProject().getProject()};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_notExistingElement() throws Exception {
-		ICompilationUnit notExistingCu= getPackageP().getCompilationUnit("NotMe.java");
-		assertTrue(! notExistingCu.exists());
-		IJavaElement[] javaElements= {notExistingCu};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);		
-	}
-
-	public void testDisabled_notExistingResource() throws Exception {
-		IFolder folder= (IFolder)getPackageP().getResource();
-		IFile notExistingFile= folder.getFile("a.txt");
-		
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {notExistingFile};
-		verifyDisabled(resources, javaElements);
-	}
-	
-	public void testDisabled_noCommonParent0() throws Exception {
-		IJavaElement[] javaElements= {getPackageP(), getRoot()};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);		
-	}
-	
-	public void testDisabled_noCommonParent1() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-		try {
-			IType classA= cu.getType("A");
-			IMethod	methodFoo= classA.getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { classA, methodFoo };
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}		
-	}
-
-//	public void testDisabled_noCommonParent2() throws Exception {
-//		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-//		try {
-//			IType classA= cu.getType("A");
-//			IJavaElement[] javaElements= { classA, cu};
-//			IResource[] resources= {};
-//			verifyDisabled(resources, javaElements);
-//		} finally {
-//			performDummySearch();
-//			cu.delete(true, new NullProgressMonitor());
-//		}		
-//	}
-
-	public void testDisabled_noCommonParent3() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= {cu, getPackageP()};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}		
-	}
-
-	public void testDisabled_noCommonParent5() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= {cu, getRoot()};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}		
-	}
-
-	public void testDisabled_noCommonParent6() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= {cu, getRoot()};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}		
-	}
-
-	public void testDisabled_noCommonParent7() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{class Inner{}}", false, new NullProgressMonitor());
-		try {
-			IType classA= cu.getType("A");
-			IType classInner= classA.getType("Inner");
-			IJavaElement[] javaElements= { classA, classInner};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-	
-	public void testDisabled_noCommonParent8() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try {
-			IType classA= cu.getType("A");
-			IMethod	methodFoo= classA.getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { methodFoo, classA};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testEnabled_cu() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= { cu};
-			IResource[] resources= {};
-			verifyEnabled(resources, javaElements, null, createReorgQueries());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}		
-	}
-	
-	public void testEnabled_package() throws Exception {
-		IJavaElement[] javaElements= { getPackageP()};
-		IResource[] resources= {};
-		verifyEnabled(resources, javaElements, null, createReorgQueries());
-	}	
-	
-	public void testEnabled_packageRoot() throws Exception {
-		IJavaElement[] javaElements= { getRoot()};
-		IResource[] resources= {};
-		verifyEnabled(resources, javaElements, null, createReorgQueries());
-	}	
-
-	public void testEnabled_file() throws Exception {
-		IFolder folder= (IFolder)getPackageP().getResource();
-		IFile file= folder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			verifyEnabled(resources, javaElements, null, createReorgQueries());			
-		} finally{
-			performDummySearch();
-			file.delete(true, false, null);
-		}
-	}	
-
-	public void testEnabled_folder() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getResource();
-		
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {folder};
-		verifyEnabled(resources, javaElements, null, createReorgQueries());			
-	}
-
-	public void testEnabled_fileFolder() throws Exception {
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file, folder};
-			verifyEnabled(resources, javaElements, null, createReorgQueries());			
-		} finally{
-			performDummySearch();
-			file.delete(true, false, null);
-			folder.delete(true, false, null);
-		}
-	}	
-
-	public void testEnabled_fileFolderCu() throws Exception {
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file, folder};
-			verifyEnabled(resources, javaElements, null, createReorgQueries());			
-		} finally{
-			performDummySearch();
-			file.delete(true, false, null);
-			folder.delete(true, false, null);
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-	
-	public void testDestination_package_no_1() throws Exception{
-		IJavaElement[] javaElements= { getPackageP()};
-		IResource[] resources= {};
-		CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-		verifyInvalidDestination(ref, RefactoringTestSetup.getProject());
-	}
-
-	public void testDestination_package_no_2() throws Exception{		
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		try {
-			IJavaElement[] javaElements= { getPackageP()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination=cu;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testDestination_package_no_3() throws Exception{		
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		try {
-			IJavaElement[] javaElements= { getPackageP()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= file;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testDestination_package_no_4() throws Exception{		
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		try {
-			IJavaElement[] javaElements= { getPackageP()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= folder;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testDestination_cu_no_1() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IProject closedProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		closedProject.create(null);
-		assertTrue(! closedProject.isOpen());
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= closedProject;
-			verifyInvalidDestination(ref, destination);
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-			closedProject.delete(true, true, null);
-		}
-	}
-
-	public void testDestination_folder_no_0() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= folder;//same folder
-			verifyInvalidDestination(ref, destination);	
-		}finally{
-			performDummySearch();
-			folder.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_folder_no_1() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IFolder childFolder= folder.getFolder("folder");
-		childFolder.create(true, true, null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= childFolder;
-			verifyInvalidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			folder.delete(true, false, null);
-			childFolder.delete(true, false, null);
-		}
-	}
-	
-	public void testDestination_folder_no_2() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IFile childFile= folder.getFile("a.txt");
-		childFile.create(getStream("123"), true, null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= childFile;
-			verifyInvalidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			folder.delete(true, false, null);
-			childFile.delete(true, false, null);
-		}
-	}
-	
-	public void testDestination_folder_no_3() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		assertTrue(! simpleProject.isOpen());
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyInvalidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-			simpleProject.delete(true, true, new NullProgressMonitor());
-		}
-	}
-
-	
-	public void testDestination_root_no_0() throws Exception{
-		IJavaElement[] javaElements= {getRoot()};
-		IResource[] resources= {};
-		CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-		Object destination= getPackageP();
-		verifyInvalidDestination(ref, destination);			
-	}
-
-	public void testDestination_root_no_1() throws Exception{
-		ICompilationUnit cu= getPackageP().createCompilationUnit("B.java", "package p;class B{}", false, new NullProgressMonitor());
-		
-		try {
-			IJavaElement[] javaElements= { getRoot()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= cu;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}			
-	}
-
-	public void testDestination_root_no_2() throws Exception{
-		ICompilationUnit cu= getPackageP().createCompilationUnit("B.java", "package p;class B{}", false, new NullProgressMonitor());
-		
-		try {
-			IJavaElement[] javaElements= { getRoot()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			IType classB= cu.getType("B");
-			Object destination= classB;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}			
-	}
-	
-	public void testDestination_root_no_3() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		try {
-			IJavaElement[] javaElements= { getRoot()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= file;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-		}			
-	}
-
-	public void testDestination_root_no_4() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		try {
-			IJavaElement[] javaElements= { getRoot()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= folder;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_root_yes_2() throws Exception{
-		IJavaElement[] javaElements= { getRoot()};
-		IResource[] resources= {};
-		CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-		Object destination= getRoot();
-		verifyValidDestination(ref, destination);
-	}
-	
-	public void testDestination_cu_yes_0() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-			Object destination= cu1;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_cu_yes_1() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_cu_yes_2() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IPackageFragment otherPackage= getRoot().createPackageFragment("otherPackage", true, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= otherPackage;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-			otherPackage.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_cu_yes_3() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_cu_yes_4() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_cu_yes_5() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyValidDestination(ref, destination);
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-			simpleProject.delete(true, true, null);
-		}
-	}
-
-	public void testDestination_cu_yes_6() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= file;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-			file.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_cu_yes_7() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= folder;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-			folder.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_cu_yes_8() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		ICompilationUnit cu2= getPackageP().createCompilationUnit("B.java", "package p;class B{}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			IType classB= cu2.getType("B");
-			Object destination= classB;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			cu1.delete(true, new NullProgressMonitor());
-			cu2.delete(true, new NullProgressMonitor());
-		}
-	}
-	
-
-	public void testDestination_file_yes_0() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= file;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-		}
-	}		
-
-	public void testDestination_file_yes_1() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		IFile otherFile= superFolder.getFile("b.txt");
-		otherFile.create(getStream("123"), true, null);
-		
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= otherFile;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-			otherFile.delete(true, new NullProgressMonitor());
-		}
-	}		
-
-	public void testDestination_file_yes_3() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= folder;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-			folder.delete(true, new NullProgressMonitor());
-		}
-	}		
-
-	public void testDestination_file_yes_4() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());			
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= cu1;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-			cu1.delete(true, new NullProgressMonitor());
-		}
-	}		
-	
-	public void testDestination_file_yes_5() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_file_yes_6() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-		}
-	}		
-
-	public void testDestination_file_yes_7() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-		}
-	}		
-
-	public void testDestination_file_yes_8() throws Exception{
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		IFile file= parentFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= parentFolder;
-			verifyValidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());
-		}
-	}
-	
-	public void testDestination_file_yes_9() throws Exception{
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		ICompilationUnit cu2= getPackageP().createCompilationUnit("B.java", "package p;class B{}", false, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			IType classB= cu2.getType("B");			
-			Object destination= classB;
-			verifyValidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			file.delete(true, new NullProgressMonitor());			
-			cu2.delete(true, new NullProgressMonitor());
-		}
-	}
-			
-	public void testDestination_folder_yes_0() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IFolder otherFolder= superFolder.getFolder("otherfolder");
-		otherFolder.create(true, true, null);
-		
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= otherFolder;
-			verifyValidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-			otherFolder.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testDestination_folder_yes_1() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyValidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testDestination_folder_yes_2() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testDestination_folder_yes_3() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyValidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-		}
-	}
-	
-	public void testDestination_folder_yes_4() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IFolder otherFolder= superFolder.getFolder("otherfolder");
-		otherFolder.create(true, true, null);
-		IFile fileInAnotherFolder= otherFolder.getFile("f.tex");
-		fileInAnotherFolder.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= fileInAnotherFolder;
-			verifyValidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());	
-			otherFolder.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_folder_yes_5() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= cu;
-			verifyValidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_folder_yes_6() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyValidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-			simpleProject.delete(true, true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_package_yes_0() throws Exception{
-		IJavaElement[] javaElements= {getPackageP()};
-		IResource[] resources= {};
-		CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-		Object destination= getRoot();
-		verifyValidDestination(ref, destination);						
-	}
-
-	public void testDestination_package_yes_1() throws Exception{
-		IJavaElement[] javaElements= { getPackageP()};
-		IResource[] resources= {};
-		CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-		verifyValidDestination(ref, getPackageP());
-	}
-
-	public void testDestination_package_yes_2() throws Exception{		
-		IPackageFragment otherPackage= getRoot().createPackageFragment("other.pack", true, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= { getPackageP()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= otherPackage;
-			verifyValidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			otherPackage.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_root_yes_0() throws Exception{
-		IJavaElement[] javaElements= {getRoot()};
-		IResource[] resources= {};
-		CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-		Object destination= getRoot().getJavaProject();
-		verifyValidDestination(ref, destination);
-	}
-	
-	public void testDestination_root_yes_1() throws Exception{
-		IJavaProject otherJavaProject= JavaProjectHelper.createJavaProject("other", "bin");
-		
-		try {
-			IJavaElement[] javaElements= { getRoot()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= otherJavaProject;
-			verifyValidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			JavaProjectHelper.delete(otherJavaProject);
-		}						
-	}
-	
-	public void testDestination_method_no_cu() throws Exception{
-		ICompilationUnit cu= null;
-		ICompilationUnit otherCu= getPackageP().createCompilationUnit("C.java", "package p;class C{}", false, new NullProgressMonitor());
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= otherCu;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			otherCu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_method_no_package() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_method_no_file() throws Exception{
-		ICompilationUnit cu= null;
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= file;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			file.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_method_no_folder() throws Exception{
-		ICompilationUnit cu= null;
-		IProject parentFolder= RefactoringTestSetup.getProject().getProject();
-		String folderName= "folder";
-		IFolder folder= parentFolder.getFolder(folderName);
-		folder.create(true, true, null);	
-
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= folder;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			folder.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_method_no_root() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_method_no_java_project() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_method_no_simple_project() throws Exception{
-		ICompilationUnit cu= null;
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			simpleProject.delete(true, true, null);	
-		}
-	}
-
-	public void testDestination_method_no_import_container() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "import java.util.*;package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			IImportContainer importContainer= cu.getImportContainer();
-			Object destination= importContainer;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_method_no_import_declaration() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "import java.util.*;package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			IImportDeclaration importDeclaration= cu.getImport("java.util.*");
-			Object destination= importDeclaration;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_method_no_package_declaration() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "import java.util.*;package p;class A{void foo(){}}", false, new NullProgressMonitor());
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= cu.getPackageDeclaration("p");
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_method_yes_itself() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			Object destination= method;
-
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-//	public void test_method_yes_cu_with_main_type() throws Exception{
-//		ICompilationUnit cu= null;
-//		ICompilationUnit otherCu= createCUfromTestFile(getPackageP(), "C");
-//		try {
-//			cu= createCUfromTestFile(getPackageP(), "A");
-//			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-//			IJavaElement[] javaElements= { method };
-//			Object destination= otherCu;
-//
-//			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu, otherCu}, destination, javaElements);
-//		} finally {
-//			performDummySearch();
-//			cu.delete(true, new NullProgressMonitor());
-//			otherCu.delete(true, new NullProgressMonitor());
-//		}
-//	}
-	public void test_method_yes_other_method() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IMethod otherMethod= cu.getType("A").getMethod("bar", new String[0]);
-			IJavaElement[] javaElements= { method };
-			Object destination= otherMethod;
-
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_method_yes_field() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IField field= cu.getType("A").getField("bar");
-			IJavaElement[] javaElements= { method };
-			Object destination= field;
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_method_yes_type() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			Object destination= cu.getType("A");
-
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-	
-	public void test_method_yes_initializer() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			Object destination= cu.getType("A").getInitializer(1);
-
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_field_yes_field() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IField field= cu.getType("A").getField("bar");
-			IField otherField= cu.getType("A").getField("baz");
-			IJavaElement[] javaElements= { field };
-			Object destination= otherField;
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_inner_type_yes_cu() throws Exception{
-		ICompilationUnit cu= null;
-		ICompilationUnit otherCu= createCUfromTestFile(getPackageP(), "C");
-
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IType type= cu.getType("A").getType("Inner");
-			IJavaElement[] javaElements= { type };
-			Object destination= otherCu;
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{otherCu, cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			otherCu.delete(true, new NullProgressMonitor());
-		}
-	}
-	
-	public void test_type_yes_package() throws Exception{
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{}", true, new NullProgressMonitor());
-		ICompilationUnit newCu= null;
-		try {
-			IType type= cu.getType("A");
-			IJavaElement[] javaElements= { type };
-			IResource[] resources=  {};
-			Object destination= getPackageP();
-			INewNameQueries queries= new MockNewNameQueries();
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-			verifyValidDestination(ref, destination);
-			assertTrue("source cu does not exist before copying", cu.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("source cu does not exist after copying", cu.exists());
-			newCu= getPackageP().getCompilationUnit(MockNewNameQueries.NEW_CU_NAME + ".java");
-			assertTrue("new cu does not exist after copying", newCu.exists());
-		} finally {
-			performDummySearch();
-			if (newCu != null && newCu.exists())
-				newCu.delete(true, new NullProgressMonitor());
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_type_yes_other_package() throws Exception{
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{}", true, new NullProgressMonitor());
-		IPackageFragment otherPackage= getRoot().createPackageFragment("other", true, new NullProgressMonitor());
-		ICompilationUnit newCu= null;
-		try {
-			IType type= cu.getType("A");
-			IJavaElement[] javaElements= { type };
-			IResource[] resources=  {};
-			Object destination= otherPackage;
-			
-			INewNameQueries queries= new MockNewNameQueries();
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-			verifyValidDestination(ref, destination);
-			assertTrue("source cu does not exist before copying", cu.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("source cu does not exist after copying", cu.exists());
-			newCu= otherPackage.getCompilationUnit(cu.getElementName());
-			assertTrue("new cu does not exist after copying", newCu.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			if (newCu != null && newCu.exists())
-				newCu.delete(true, new NullProgressMonitor());
-			otherPackage.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_initializer_no_package() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "import java.util.*;package p;class A{void foo(){}{}}", false, new NullProgressMonitor());
-			IInitializer initializer= cu.getType("A").getInitializer(1);
-			IJavaElement[] javaElements= { initializer };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_initializer_yes_type() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IInitializer initializer= cu.getType("A").getInitializer(1);
-			IJavaElement[] javaElements= { initializer };
-			Object destination= cu.getType("A");
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_initializer_yes_method() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IInitializer initializer= cu.getType("A").getInitializer(1);
-			IJavaElement[] javaElements= { initializer };
-			Object destination= cu.getType("A").getMethod("foo", new String[0]);
-
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_import_container_no_package() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= getPackageP().createCompilationUnit("A.java", "import java.util.*;package p;class A{void foo(){}{}}", false, new NullProgressMonitor());
-			IImportContainer container= cu.getImportContainer();
-			IJavaElement[] javaElements= { container };
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, null, createReorgQueries());
-	
-			Object destination= getPackageP();
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_import_container_yes_type_in_different_cu() throws Exception{
-		ICompilationUnit cu= null;
-		ICompilationUnit otherCu= createCUfromTestFile(getPackageP(), "C");
-
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IImportContainer container= cu.getImportContainer();
-			IJavaElement[] javaElements= { container };
-			Object destination= otherCu.getType("C");
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu, otherCu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			otherCu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_import_container_yes_method_in_different_cu() throws Exception{
-		ICompilationUnit cu= null;
-		ICompilationUnit otherCu= createCUfromTestFile(getPackageP(), "C");
-
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IImportContainer container= cu.getImportContainer();
-			IJavaElement[] javaElements= { container };
-			Object destination= otherCu.getType("C").getMethod("foo", new String[0]);
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu, otherCu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			otherCu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void test_import_container_yes_cu() throws Exception{
-		ICompilationUnit cu= null;
-		ICompilationUnit otherCu= createCUfromTestFile(getPackageP(), "C");
-
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IImportContainer container= cu.getImportContainer();
-			IJavaElement[] javaElements= { container };
-			Object destination= otherCu;
-			verifyCopyingOfSubCuElements(new ICompilationUnit[]{cu, otherCu}, destination, javaElements);
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			otherCu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-
-	public void testCopy_File_to_Folder() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-		
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder destinationFolder= superFolder.getFolder("folder");
-		destinationFolder.create(true, true, null);
-		
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= destinationFolder;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= destinationFolder.getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			destinationFolder.delete(true, false, null);
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_File_to_Same_Folder() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-		
-		IFolder destinationFolder= parentFolder;
-		
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= destinationFolder;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= destinationFolder.getFile(MockNewNameQueries.NEW_FILE_NAME);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-	
-	public void testCopy_File_to_Itself() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-				
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= file;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= parentFolder.getFile(MockNewNameQueries.NEW_FILE_NAME);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_File_to_AnotherFile() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-
-		IFile otherFile= RefactoringTestSetup.getProject().getProject().getFile("b.txt");
-		otherFile.create(getStream("123"), true, null);
-				
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= otherFile;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= RefactoringTestSetup.getProject().getProject().getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			otherFile.delete(true, false, null);
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_File_to_Package() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-		
-		IPackageFragment otherPackage= getRoot().createPackageFragment("other.pack", true, new NullProgressMonitor());
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= otherPackage;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= ((IFolder)otherPackage.getResource()).getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			otherPackage.delete(true, new NullProgressMonitor());
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_File_to_DefaultPackage() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-		
-		IPackageFragment defaultPackage= getRoot().getPackageFragment("");
-		assertTrue(defaultPackage.exists());
-		assertTrue(defaultPackage.isDefaultPackage());
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= defaultPackage;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= ((IFolder)defaultPackage.getResource()).getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_File_to_SourceFolder() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-				
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= ((IFolder)getRoot().getResource()).getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_File_to_JavaProject() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-				
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= RefactoringTestSetup.getProject().getProject().getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_File_to_Cu() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-				
-		IFile newFile= null;
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= cu;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= parentFolder.getFile(MockNewNameQueries.NEW_FILE_NAME);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			cu.delete(true, new NullProgressMonitor());
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-	
-	public void testCopy_File_to_SimpleProject() throws Exception {
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		String fileName= "a.txt";
-		IFile file= parentFolder.getFile(fileName);
-		file.create(getStream("123"), true, null);
-				
-		IFile newFile= null;
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {};
-			IResource[] resources= { file };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", file.exists());
-			
-			newFile= simpleProject.getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			file.delete(true, false, null);
-			simpleProject.delete(true, new NullProgressMonitor());
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_Cu_to_Folder() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder destinationFolder= superFolder.getFolder("folder");
-		destinationFolder.create(true, true, null);
-		
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= { };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= destinationFolder;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source cu does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source cu does not exist after copying", cu.exists());
-			
-			newFile= destinationFolder.getFile(fileName);
-			assertTrue("new cu does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			destinationFolder.delete(true, false, null);
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_Cu_to_Same_Package() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		ICompilationUnit newCu= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= { };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-			
-			Object destination= getPackageP();
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source cu does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source cu does not exist after copying", cu.exists());
-			
-			newCu= getPackageP().getCompilationUnit(MockNewNameQueries.NEW_CU_NAME + ".java");
-			assertTrue("new cu does not exist after copying", newCu.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			if (newCu != null && newCu.exists()){
-				newCu.delete(true, new NullProgressMonitor());
-			}
-		}
-	}
-
-	public void test_type_yes_type() throws Exception{
-		ICompilationUnit cu= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit otherCu= createCUfromTestFile(getPackageP(), "C");
-
-		ICompilationUnit newCu= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= { };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-			
-			Object destination= otherCu;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source cu does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source cu does not exist after copying", cu.exists());
-			
-			newCu= getPackageP().getCompilationUnit(MockNewNameQueries.NEW_CU_NAME + ".java");
-			assertTrue("new cu does not exist after copying", newCu.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			if (newCu != null && newCu.exists()){
-				newCu.delete(true, new NullProgressMonitor());
-			}
-			if (otherCu != null && otherCu.exists()){
-				otherCu.delete(true, new NullProgressMonitor());
-			}
-		}
-	}
-	
-	public void testCopy_Cu_to_Itself() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-				
-		ICompilationUnit newCu= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= { };
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= cu;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", cu.exists());
-			
-			newCu= getPackageP().getCompilationUnit(MockNewNameQueries.NEW_CU_NAME + ".java");
-			assertTrue("new file does not exist after copying", newCu.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			if (newCu != null && newCu.exists()){
-				newCu.delete(true, new NullProgressMonitor());
-			}
-		}
-	}
-
-	public void testCopy_Cu_to_OtherPackage() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		IPackageFragment otherPackage= getRoot().createPackageFragment("other.pack", true, new NullProgressMonitor());
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= otherPackage;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", cu.exists());
-			
-			ICompilationUnit newCu= otherPackage.getCompilationUnit(fileName);
-			assertTrue("new file does not exist after copying", newCu.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			otherPackage.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_Cu_to_DefaultPackage() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		IPackageFragment defaultPackage= getRoot().getPackageFragment("");
-		assertTrue(defaultPackage.exists());
-		assertTrue(defaultPackage.isDefaultPackage());
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= defaultPackage;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", cu.exists());
-			
-			ICompilationUnit newCu= defaultPackage.getCompilationUnit(fileName);
-			assertTrue("new file does not exist after copying", newCu.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_Cu_to_SourceFolder() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		ICompilationUnit newCu= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", cu.exists());
-			
-			newCu= getRoot().getPackageFragment("").getCompilationUnit(fileName);
-			assertTrue("new file does not exist after copying", newCu.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_Cu_to_JavaProject() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", cu.exists());
-			
-			newFile= RefactoringTestSetup.getProject().getProject().getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			if (newFile != null)
-				newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_Cu_to_File_In_Package() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		IFolder parentFolder= (IFolder) getPackageP().getResource();
-		IFile file= parentFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		assertTrue(file.exists());
-
-		ICompilationUnit newCu= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= file;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", cu.exists());
-			
-			newCu= getPackageP().getCompilationUnit(MockNewNameQueries.NEW_CU_NAME + ".java");
-			assertTrue("new file does not exist after copying", newCu.exists());
-			
-			String expectedSource= "package p;class "+ MockNewNameQueries.NEW_CU_NAME +"{void foo(){}class Inner{}}";
-			assertEqualLines("source compare failed", expectedSource, newCu.getSource());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			file.delete(true, false, null);
-			if (newCu != null && newCu.exists()){
-				newCu.delete(true, new NullProgressMonitor());
-			}
-		}
-	}
-
-	public void testCopy_Cu_to_File_In_Resource_Folder() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		IProject parentFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= parentFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= file;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", cu.exists());
-			
-			newFile= RefactoringTestSetup.getProject().getProject().getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			file.delete(true, false, null);
-			newFile.delete(true, false, null);
-		}
-	}
-	
-	public void testCopy_Cu_to_SimpleProject() throws Exception {
-		String fileName= "A.java";
-		ICompilationUnit cu= getPackageP().createCompilationUnit(fileName, "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-
-		IFile newFile= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before copying", cu.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file does not exist after copying", cu.exists());
-			
-			newFile= simpleProject.getFile(fileName);
-			assertTrue("new file does not exist after copying", newFile.exists());
-		} finally {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-			simpleProject.delete(true, false, null);
-			newFile.delete(true, false, null);
-		}
-	}
-
-	public void testCopy_Package_to_Its_Root() throws Exception {
-		IPackageFragment newPackage= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {getPackageP()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source package does not exist before copying", getPackageP().exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source package does not exist after copying", getPackageP().exists());
-			
-			newPackage= getRoot().getPackageFragment(MockNewNameQueries.NEW_PACKAGE_NAME);
-			assertTrue("new package does not exist after copying", newPackage.exists());
-		} finally {
-			performDummySearch();
-			newPackage.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_Package_to_Itself() throws Exception {
-		IPackageFragment newPackage= null;
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {getPackageP()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source package does not exist before copying", getPackageP().exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source package does not exist after copying", getPackageP().exists());
-			
-			newPackage= getRoot().getPackageFragment(MockNewNameQueries.NEW_PACKAGE_NAME);
-			assertTrue("new package does not exist after copying", newPackage.exists());
-		} finally {
-			performDummySearch();
-			if (newPackage != null && newPackage.exists())
-				newPackage.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_Package_to_Another_Root() throws Exception {
-		IPackageFragmentRoot otherRoot= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "otherRoot");
-		IPackageFragment newPackage= null;
-		String packageName= getPackageP().getElementName();
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {getPackageP()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= otherRoot;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source package does not exist before copying", getPackageP().exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source package does not exist after copying", getPackageP().exists());
-			
-			newPackage= otherRoot.getPackageFragment(packageName);
-			assertTrue("new package does not exist after copying", newPackage.exists());
-		} finally {
-			performDummySearch();
-			newPackage.delete(true, new NullProgressMonitor());
-			otherRoot.delete(0, 0, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_Package_to_JavaProject_That_Is_Root() throws Exception {
-		IJavaProject otherProject= JavaProjectHelper.createJavaProject("otherProject", null);
-		JavaProjectHelper.addSourceContainer(otherProject, null);
-		try {
-			INewNameQueries queries= new MockNewNameQueries();
-
-			IJavaElement[] javaElements= {getPackageP()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, queries, createReorgQueries());
-
-			Object destination= otherProject;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source package does not exist before copying", getPackageP().exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source package does not exist after copying", getPackageP().exists());
-			
-			IPackageFragment newPackage= null;
-			IPackageFragmentRoot[] roots= otherProject.getAllPackageFragmentRoots();
-			for (int i= 0; i < roots.length; i++) {
-				if (ReorgUtils.isSourceFolder(roots[i])){
-					newPackage= roots[i].getPackageFragment(getPackageP().getElementName());
-					assertTrue("new package does not exist after copying", newPackage.exists());					
-				}
-			}
-			assertNotNull(newPackage);
-		} finally {
-			performDummySearch();
-			JavaProjectHelper.delete(otherProject);
-		}
-	}
-	
-	public void testCopy_folder_to_other_folder() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		String folderName= "folder";
-		IFolder folder= superFolder.getFolder(folderName);
-		folder.create(true, true, null);
-
-		IFolder otherFolder= superFolder.getFolder("otherfolder");
-		otherFolder.create(true, true, null);
-		
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			Object destination= otherFolder;
-			verifyValidDestination(ref, destination);	
-
-			assertTrue("source does not exist before copying", folder.exists());
-								
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source does not exist after copying", folder.exists());
-			assertTrue("copied folder does not exist after copying", otherFolder.getFolder(folderName).exists());
-			
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-			otherFolder.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testCopy_folder_Java_project() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		String folderName= "folder";
-		IFolder folder= superFolder.getFolder(folderName);
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyValidDestination(ref, destination);						
-
-			assertTrue("source does not exist before copying", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source does not exist after copying", folder.exists());
-			
-			assertTrue("copied folder does not exist after copying", RefactoringTestSetup.getProject().getProject().getFolder(folderName).exists());
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testCopy_folder_to_source_folder() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		String folderName= "folder";
-		IFolder folder= superFolder.getFolder(folderName);
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);						
-
-			assertTrue("source does not exist before copying", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source does not exist after copying", folder.exists());
-			
-			assertTrue("copied folder does not exist after copying", ((IFolder)getRoot().getResource()).getFolder(folderName).exists());
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-		}
-	}
-
-	public void testCopy_folder_to_package() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		String folderName= "folder";
-		IFolder folder= superFolder.getFolder(folderName);
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			IPackageFragment destination= getPackageP();
-			verifyValidDestination(ref, destination);						
-			assertTrue("source does not exist before copying", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source does not exist after copying", folder.exists());			
-			assertTrue("copied folder does not exist after copying", ((IFolder)destination.getResource()).getFolder(folderName).exists());
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-		}
-
-	}
-	public void testCopy_folder_to_file_in_another_folder() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		String folderName= "folder";
-		IFolder folder= superFolder.getFolder(folderName);
-		folder.create(true, true, null);
-
-		IFolder otherFolder= superFolder.getFolder("otherfolder");
-		otherFolder.create(true, true, null);
-		IFile fileInAnotherFolder= otherFolder.getFile("f.tex");
-		fileInAnotherFolder.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			Object destination= fileInAnotherFolder;
-			verifyValidDestination(ref, destination);						
-			assertTrue("source does not exist before copying", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source does not exist after copying", folder.exists());			
-			assertTrue("copied folder does not exist after copying", otherFolder.getFolder(folderName).exists());
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());	
-			otherFolder.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_folder_to_cu() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		String folderName= "folder";
-		IFolder folder= superFolder.getFolder(folderName);
-		folder.create(true, true, null);
-
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			Object destination= cu;
-			verifyValidDestination(ref, destination);						
-			assertTrue("source does not exist before copying", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source does not exist after copying", folder.exists());			
-			assertTrue("copied folder does not exist after copying", ((IFolder)getPackageP().getResource()).getFolder(folderName).exists());
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_folder_to_simple_project() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		String folderName= "folder";
-		IFolder folder= superFolder.getFolder(folderName);
-		folder.create(true, true, null);
-
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyValidDestination(ref, destination);						
-			assertTrue("source does not exist before copying", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source does not exist after copying", folder.exists());			
-			assertTrue("copied folder does not exist after copying", simpleProject.getFolder(folderName).exists());
-		} finally{
-			performDummySearch();
-			folder.delete(true, new NullProgressMonitor());			
-			simpleProject.delete(true, true, new NullProgressMonitor());
-		}
-	}
-
-	public void testCopy_root_to_same_Java_project() throws Exception {
-		IPackageFragmentRoot newRoot= null;
-		try {
-			IJavaElement[] javaElements= { getRoot()};
-			IResource[] resources= {			};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			Object destination= getRoot().getJavaProject();
-			verifyValidDestination(ref, destination);
-			assertTrue("source does not exist before copying", getRoot().exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-
-			assertTrue("source does not exist after copying", getRoot().exists());
-			String newName= MockNewNameQueries.NEW_PACKAGE_FRAGMENT_ROOT_NAME;
-			newRoot= getSourceFolder(RefactoringTestSetup.getProject(), newName);
-			assertNotNull("copied folder does not exist after copying", newRoot);
-			assertTrue("copied folder does not exist after copying", newRoot.exists());
-		} finally {
-			performDummySearch();
-			if (newRoot != null && newRoot.exists())
-				newRoot.delete(0, 0, new NullProgressMonitor());
-		}
-	}
-	
-	public void testCopy_root_to_other_Java_project() throws Exception {
-		IJavaProject otherJavaProject= JavaProjectHelper.createJavaProject("other", "bin");
-		try {
-			IJavaElement[] javaElements= { getRoot()};
-			IResource[] resources= {};
-			CopyRefactoring ref= verifyEnabled(resources, javaElements, new MockNewNameQueries(), createReorgQueries());
-
-			Object destination= otherJavaProject;
-			verifyValidDestination(ref, destination);
-			assertTrue("source does not exist before copying", getRoot().exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-
-			assertTrue("source does not exist after copying", getRoot().exists());
-			String newName= getRoot().getElementName();
-			IPackageFragmentRoot newRoot= getSourceFolder(otherJavaProject, newName);
-			assertNotNull("copied folder does not exist after copying", newRoot);
-			assertTrue("copied folder does not exist after copying", newRoot.exists());
-		} finally {
-			performDummySearch();
-			JavaProjectHelper.delete(otherJavaProject);
-		}						
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyToClipboardActionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyToClipboardActionTest.java
deleted file mode 100644
index 237b2b9..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/CopyToClipboardActionTest.java
+++ /dev/null

@@ -1,602 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-import org.eclipse.ui.part.ResourceTransfer;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceManipulation;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-import org.eclipse.jdt.ui.tests.refactoring.infra.MockClipboard;
-import org.eclipse.jdt.ui.tests.refactoring.infra.MockWorkbenchSite;
-
-import org.eclipse.jdt.internal.ui.refactoring.reorg.CopyToClipboardAction;
-import org.eclipse.jdt.internal.ui.refactoring.reorg.TypedSourceTransfer;
-
-import org.eclipse.jdt.internal.corext.refactoring.TypedSource;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaElementTransfer;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgUtils;
-import org.eclipse.jdt.internal.corext.util.Strings;
-
-
-public class CopyToClipboardActionTest extends RefactoringTest{
-
-	private ILabelProvider fLabelProvider;
-
-	private static final Class clazz= CopyToClipboardActionTest.class;
-
-	private Clipboard fClipboard;
-	
-	private ICompilationUnit fCuA;
-	private ICompilationUnit fCuB;	
-	private IPackageFragment fPackageQ;
-	private IPackageFragment fPackageQ_R;
-	private IPackageFragment fDefaultPackage;
-	private static final String CU_A_NAME= "A";
-	private static final String CU_B_NAME= "B";
-	private IFile faTxt;
-	private IFolder fOlder;
-	
-	public CopyToClipboardActionTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		fClipboard= new MockClipboard(Display.getDefault());
-		fDefaultPackage= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment("", true, null);
-		
-		fCuA= createCU(getPackageP(), CU_A_NAME + ".java", 
-			"package p;" +
-			"import java.util.List;" +
-			"class A{" +
-			"int f;" +
-			"{}" +
-			"void foo(){}" +
-			"class Inner{}" +
-			"}");
-		
-		fPackageQ= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment("q", true, null);
-		fCuB= createCU(fPackageQ, CU_B_NAME + ".java", 
-				"package q;" +
-				"import java.util.Set;" +
-				"class B{" +
-				"int x;" +
-				"void bar(){}" +
-				"class InnerB{}" +
-				"}");
-		
-		fPackageQ_R= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment("q.r", true, null);
-		
-		faTxt= createFile((IFolder)getPackageP().getUnderlyingResource(), "a.txt");
-		fOlder= createFolder(RefactoringTestSetup.getProject().getProject(), "fOlder");
-		
-		fLabelProvider= new JavaElementLabelProvider(	JavaElementLabelProvider.SHOW_VARIABLE + 
-														JavaElementLabelProvider.SHOW_PARAMETERS + 
-														JavaElementLabelProvider.SHOW_TYPE);
-		assertTrue("A.java does not exist", fCuA.exists());
-		assertTrue("B.java does not exist", fCuB.exists());
-		assertTrue("q does not exist", fPackageQ.exists());
-		assertTrue("q.r does not exist", fPackageQ_R.exists());
-		assertTrue("a.txt does not exist", faTxt.exists());
-		assertTrue("fOlder does not exist", fOlder.exists());
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		performDummySearch();
-		fClipboard.dispose();
-		fLabelProvider.dispose();
-		delete(fCuA);
-		delete(fCuB);
-		delete(fPackageQ_R);
-		delete(fPackageQ);
-		delete(faTxt);
-		delete(fOlder);
-	}
-
-	private IFile createFile(IFolder folder, String fileName) throws Exception {
-		IFile file= folder.getFile(fileName);
-		file.create(getStream("aa"), true, null);	
-		return file;
-	}
-	
-	private IFolder createFolder(IProject project, String name) throws CoreException{
-		IFolder folder= project.getFolder(name);
-		folder.create(true, true, null);
-		return folder;
-	}
-	
-	private static void delete(ISourceManipulation element) {
-		try {
-			if (element != null && ((IJavaElement)element).exists())
-				element.delete(true, null);
-		} catch(JavaModelException e) {
-			//ignore, we must keep going
-		}		
-	}
-	private static void delete(IFile element) {
-		try {
-			element.delete(true, false, null);
-		} catch(CoreException e) {
-			//ignore, we must keep going
-		}
-	}
-
-	private static void delete(IFolder element) {
-		try {
-			element.delete(true, false, null);
-		} catch(CoreException e) {
-			//ignore, we must keep going
-		}
-	}
-	
-	private void checkDisabled(Object[] elements){
-		CopyToClipboardAction copyAction= new CopyToClipboardAction(new MockWorkbenchSite(elements), fClipboard, null);
-		copyAction.setAutoRepeatOnFailure(true);
-		copyAction.update(copyAction.getSelection());
-		assertTrue("action should be disabled", ! copyAction.isEnabled());
-	}
-
-	private void checkEnabled(Object[] elements) throws Exception{
-		CopyToClipboardAction copyAction= new CopyToClipboardAction(new MockWorkbenchSite(elements), fClipboard, null);
-		copyAction.setAutoRepeatOnFailure(true);
-		copyAction.update(copyAction.getSelection());
-		assertTrue("action should be enabled", copyAction.isEnabled());
-		copyAction.run();
-		checkClipboard(elements);
-	}
-
-	private void checkClipboard(Object[] elementsCopied) throws Exception {
-		IResource[] resourcesCopied= getResources(elementsCopied);
-		IJavaElement[] javaElementsCopied= getJavaElements(elementsCopied);
-		IType[] mainTypesCopied= ReorgUtils.getMainTypes(javaElementsCopied);
-		
-		IResource[] resourcesExpected= computeResourcesExpectedInClipboard(resourcesCopied, mainTypesCopied, javaElementsCopied);
-		IJavaElement[] javaElementsExpected= computeJavaElementsExpectedInClipboard(javaElementsCopied, mainTypesCopied);
-		
-		String[] clipboardFiles= getClipboardFiles();
-		IResource[] clipboardResources= getClipboardResources();
-		String clipboardText= getClipboardText();
-		IJavaElement[] clipboardJavaElements= getClipboardJavaElements();
-		TypedSource[] clipboardTypedSources= getClipboardTypedSources();
-
-		checkNames(resourcesCopied, javaElementsCopied, clipboardText);
-		checkFiles(resourcesCopied, javaElementsCopied, mainTypesCopied, clipboardFiles);
-		checkTypedSources(javaElementsCopied, clipboardTypedSources);
-		checkElements(resourcesExpected, clipboardResources);
-		checkElements(javaElementsExpected, clipboardJavaElements);
-	}
-	
-	private void checkTypedSources(IJavaElement[] javaElementsCopied, TypedSource[] clipboardTypedSources) throws Exception {
-		TypedSource[] typedSources= TypedSource.createTypedSources(javaElementsCopied);
-		assertEquals("different number", typedSources.length, clipboardTypedSources.length);		
-		TypedSource.sortByType(typedSources);
-		TypedSource.sortByType(clipboardTypedSources);
-		for (int i= 0; i < typedSources.length; i++) {
-			assertEquals("different typed sources", typedSources[i], clipboardTypedSources[i]);
-		}
-	}
-
-	private IResource[] computeResourcesExpectedInClipboard(IResource[] resourcesCopied, IType[] mainTypesCopied, IJavaElement[] javaElementsCopied) throws JavaModelException {
-		IResource[] cuResources= ReorgUtils.getResources(getCompilationUnits(javaElementsCopied));
-		return ReorgUtils.union(cuResources, ReorgUtils.union(resourcesCopied, ReorgUtils.getResources(ReorgUtils.getCompilationUnits(mainTypesCopied))));
-	}
-
-	private static IJavaElement[] computeJavaElementsExpectedInClipboard(IJavaElement[] javaElementsExpected, IType[] mainTypesCopied) throws JavaModelException {
-		return ReorgUtils.union(javaElementsExpected, ReorgUtils.getCompilationUnits(mainTypesCopied));
-	}
-
-	private String getName(IResource resource){
-		return fLabelProvider.getText(resource);
-	}
-	private String getName(IJavaElement javaElement){
-		return fLabelProvider.getText(javaElement);
-	}
-
-	private static void checkElements(Object[] copied, Object[] retreivedFromClipboard) {
-		assertEquals("different number of elements", copied.length, retreivedFromClipboard.length);
-		sortByName(copied);
-		sortByName(retreivedFromClipboard);
-		for (int i= 0; i < retreivedFromClipboard.length; i++) {
-			Object retreived= retreivedFromClipboard[i];
-			assertTrue("element does not exist", exists(retreived));
-			assertTrue("different copied " + getName(copied[i]) + " retreived: " + getName(retreived) , copied[i].equals(retreivedFromClipboard[i]));
-		}
-	}
-
-	private static boolean exists(Object element) {
-		if (element instanceof IJavaElement)
-			return ((IJavaElement)element).exists();
-		if (element instanceof IResource)
-			return ((IResource)element).exists();
-		assertTrue(false);
-		return false;
-	}
-
-	private static String getName(Object object) {
-		if (object instanceof IJavaElement)
-			return ((IJavaElement)object).getElementName();
-		if (object instanceof IResource)
-			return ((IResource)object).getName();
-		return object == null ? null : object.toString();
-	}
-
-	private static void sortByName(Object[] copied) {
-		Arrays.sort(copied, new Comparator(){
-			public int compare(Object arg0, Object arg1) {
-				return getName(arg0).compareTo(getName(arg1));
-			}
-		});
-	}
-
-	private void checkNames(IResource[] resourcesCopied, IJavaElement[] javaElementsCopied, String clipboardText){
-		List stringLines= Arrays.asList(Strings.convertIntoLines(clipboardText));
-		assertEquals("different number of names", resourcesCopied.length + javaElementsCopied.length, stringLines.size());
-		for (int i= 0; i < resourcesCopied.length; i++) {
-			String name= getName(resourcesCopied[i]);
-			assertTrue("name not in set:" + name, stringLines.contains(name));
-		}
-		for (int i= 0; i < javaElementsCopied.length; i++) {
-			IJavaElement element= javaElementsCopied[i];
-			if (! ReorgUtils.isInsideCompilationUnit(element)){
-				String name= getName(element);
-				assertTrue("name not in set:" + name, stringLines.contains(name));				
-			}
-		}
-	}	
-	
-	private static void checkFiles(IResource[] resourcesCopied, IJavaElement[] javaElementsCopied, IType[] mainTypes, String[] clipboardFiles) {
-		int expected= 0;
-		expected += resourcesCopied.length;
-		expected += countResources(javaElementsCopied);
-		expected += mainTypes.length;
-		
-		//we cannot compare file names here because they're absolute and depend on the worspace location
-		assertEquals("different number of files in clipboard", expected, clipboardFiles.length);
-	}
-
-	private static int countResources(IJavaElement[] javaElementsCopied) {
-		int count= 0;
-		for (int i= 0; i < javaElementsCopied.length; i++) {
-			IJavaElement element= javaElementsCopied[i];
-			switch (element.getElementType()) {
-				case IJavaElement.JAVA_PROJECT :
-				case IJavaElement.PACKAGE_FRAGMENT_ROOT :
-				case IJavaElement.PACKAGE_FRAGMENT :
-				case IJavaElement.COMPILATION_UNIT :
-				case IJavaElement.CLASS_FILE :
-					count++;
-			}
-		}
-		return count;
-	}
-
-	private static IJavaElement[] getCompilationUnits(IJavaElement[] javaElements) {
-		List cus= ReorgUtils.getElementsOfType(javaElements, IJavaElement.COMPILATION_UNIT);
-		return (ICompilationUnit[]) cus.toArray(new ICompilationUnit[cus.size()]);
-	}
-
-	private static IResource[] getResources(Object[] elements) {
-		return ReorgUtils.getResources(Arrays.asList(elements));
-	}
-
-	private static IJavaElement[] getJavaElements(Object[] elements) {
-		return ReorgUtils.getJavaElements(Arrays.asList(elements));
-	}
-
-	private IJavaElement[] getClipboardJavaElements() {
-		IJavaElement[] elements= (IJavaElement[])fClipboard.getContents(JavaElementTransfer.getInstance());
-		return elements == null ? new IJavaElement[0]: elements; 
-	}
-
-	private String[] getClipboardFiles() {
-		String[] files= (String[])fClipboard.getContents(FileTransfer.getInstance());
-		return files == null ? new String[0]: files;
-	}
-	
-	private IResource[] getClipboardResources() {
-		IResource[] resources= (IResource[])fClipboard.getContents(ResourceTransfer.getInstance());
-		return resources == null ? new IResource[0]: resources; 
-	}
-
-	private TypedSource[] getClipboardTypedSources() {
-		TypedSource[] typedSources= (TypedSource[])fClipboard.getContents(TypedSourceTransfer.getInstance());
-		return typedSources == null ? new TypedSource[0]: typedSources; 
-	}
-
-	private String getClipboardText() {
-		return (String)fClipboard.getContents(TextTransfer.getInstance());
-	}
-	
-	///---------tests
-
-	public void testDisabled0() {
-		Object[] elements= {};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled1() throws Exception {
-		Object[] elements= {null};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled2() throws Exception {
-		Object[] elements= {this};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled3() throws Exception {
-		Object[] elements= {RefactoringTestSetup.getProject(), getPackageP()};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled4() throws Exception{
-		checkDisabled(new Object[]{getPackageP(), fCuA});
-	}
-
-	public void testDisabled5() throws Exception{
-		checkDisabled(new Object[]{getRoot(), fCuA});
-	}
-
-	public void testDisabled6() throws Exception{
-		checkDisabled(new Object[]{getRoot(), fPackageQ});
-	}
-
-	public void testDisabled7() throws Exception{
-		checkDisabled(new Object[]{getRoot(), faTxt});
-	}
-
-	public void testDisabled8() throws Exception{
-		checkDisabled(new Object[]{getRoot(), getRoot().getJavaProject()});
-	}
-
-	public void testDisabled9() throws Exception{
-		checkDisabled(new Object[]{RefactoringTestSetup.getProject().getPackageFragmentRoots()});
-	}
-
-	public void testDisabled10() throws Exception{
-		checkDisabled(new Object[]{fCuA, fCuB});
-	}
-	
-	public void testDisabled11() throws Exception{
-		checkDisabled(new Object[]{fDefaultPackage});
-	}
-
-	public void testDisabled12() throws Exception{
-		checkDisabled(new Object[]{getRoot().getJavaProject(), fCuA});
-	}
-
-	public void testDisabled13() throws Exception{
-		checkDisabled(new Object[]{getRoot().getJavaProject(), fPackageQ});
-	}
-
-	public void testDisabled14() throws Exception{
-		checkDisabled(new Object[]{getRoot().getJavaProject(), faTxt});
-	}
-
-	public void testDisabled15() throws Exception {
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object classA= fCuA.getType("A");
-		Object[] elements= {fieldF, classA};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled16() throws Exception {
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object[] elements= {fieldF, fCuA};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled17() throws Exception {
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object[] elements= {fieldF, fDefaultPackage};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled18() throws Exception {
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object[] elements= {fieldF, fPackageQ};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled19() throws Exception {
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object[] elements= {fieldF, faTxt};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled20() throws Exception {
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object[] elements= {fieldF, getRoot()};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled21() throws Exception {
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object[] elements= {fieldF, RefactoringTestSetup.getProject()};
-		checkDisabled(elements);
-	}	
-
-	public void testDisabled22() throws Exception {
-		Object typeA= fCuA.getType("A");
-		Object typeB= fCuB.getType("B");
-		Object[] elements= {typeA, typeB};
-		checkDisabled(elements);
-	}
-	
-	public void testDisabled23() throws Exception{
-		checkDisabled(new Object[]{faTxt, fCuB});
-	}
-
-	public void testEnabled0() throws Exception {
-		Object[] elements= {RefactoringTestSetup.getProject()};
-		checkEnabled(elements);
-	}	
-
-	public void testEnabled1() throws Exception {
-		Object[] elements= {getPackageP()};
-		checkEnabled(elements);
-	}	
-
-	public void testEnabled2() throws Exception {
-		Object[] elements= {getRoot()};
-		checkEnabled(elements);
-	}	
-
-	public void testEnabled3() throws Exception {
-		Object[] elements= {RefactoringTestSetup.getDefaultSourceFolder()};
-		checkEnabled(elements);
-	}
-	
-	public void testEnabled4() throws Exception{
-		checkEnabled(new Object[]{faTxt});
-	}
-
-	public void testEnabled5() throws Exception{
-		checkEnabled(new Object[]{getRoot()});
-	}
-
-	public void testEnabled6() throws Exception{
-		checkEnabled(new Object[]{fCuA});
-	}
-
-	public void testEnabled7() throws Exception{
-		checkEnabled(new Object[]{getRoot().getJavaProject()});
-	}
-		
-	public void testEnabled8() throws Exception{
-		checkEnabled(new Object[]{getPackageP()});
-	}
-	
-	public void testEnabled9() throws Exception{
-		checkEnabled(new Object[]{getPackageP(), fPackageQ, fPackageQ_R});
-	}
-	
-	public void testEnabled10() throws Exception{
-		Object packDecl= fCuA.getPackageDeclarations()[0];
-		Object[] elements= {packDecl};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled11() throws Exception{
-		Object importD= fCuA.getImports()[0];
-		Object[] elements= {importD};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled12() throws Exception{
-//		printTestDisabledMessage("disabled due to bug 37750");
-//		if (true)
-//			return;
-		IJavaElement importContainer= fCuA.getImportContainer();
-		Object[] elements= {importContainer};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled13() throws Exception{
-		Object classA= fCuA.getType("A");
-		Object[] elements= {classA};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled14() throws Exception{
-		Object methodFoo= fCuA.getType("A").getMethod("foo", new String[0]);
-		Object[] elements= {methodFoo};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled15() throws Exception{
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object[] elements= {fieldF};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled16() throws Exception{
-		Object initializer= fCuA.getType("A").getInitializer(1);
-		Object[] elements= {initializer};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled17() throws Exception{
-		Object innerClass= fCuA.getType("A").getType("Inner");
-		Object[] elements= {innerClass};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled18() throws Exception{
-		Object fieldF= fCuA.getType("A").getField("f");
-		Object methodFoo= fCuA.getType("A").getMethod("foo", new String[0]);
-		Object innerClass= fCuA.getType("A").getType("Inner");
-		Object initializer= fCuA.getType("A").getInitializer(1);
-		Object[] elements= {fieldF, methodFoo, initializer, innerClass};
-		checkEnabled(elements);
-	}
-	
-	public void testEnabled19() throws Exception{
-//		printTestDisabledMessage("disabled due to bug 37750");
-//		if (true)
-//			return;
-
-		Object classA= fCuA.getType("A");
-		Object importContainer= fCuA.getImportContainer();
-		Object packDecl= fCuA.getPackageDeclarations()[0];
-		Object[] elements= {classA, importContainer, packDecl};
-		checkEnabled(elements);
-	}
-
-	public void testEnabled20() throws Exception{
-		checkEnabled(new Object[]{faTxt, fCuA});
-	}
-
-	public void testEnabled21() throws Exception{
-		checkEnabled(new Object[]{fOlder});
-	}
-
-	public void testEnabled22() throws Exception{
-//		printTestDisabledMessage("bug 39410");
-		Object classA= fCuA.getType("A");
-		Object packDecl= fCuA.getPackageDeclarations()[0];
-		Object[] elements= {classA, packDecl};
-		checkEnabled(elements);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/DeleteTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/DeleteTest.java
deleted file mode 100644
index bbdb75c..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/DeleteTest.java
+++ /dev/null

@@ -1,790 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgQueries;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaDeleteProcessor;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.ParticipantTesting;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.DeleteRefactoring;
-
-
-public class DeleteTest extends RefactoringTest{
-
-	private static final Class clazz= DeleteTest.class;
-	private static final String REFACTORING_PATH= "Delete/";
-
-	public DeleteTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	private void verifyDisabled(Object[] elements) throws CoreException {
-		JavaDeleteProcessor processor= new JavaDeleteProcessor(elements);
-		DeleteRefactoring ref= new DeleteRefactoring(processor);
-		assertTrue("delete should be disabled", !ref.isApplicable());
-	}
-
-	private void verifyEnabled(Object[] elements) throws CoreException {
-		JavaDeleteProcessor processor= new JavaDeleteProcessor(elements);
-		DeleteRefactoring ref= new DeleteRefactoring(processor);
-		assertTrue("delete should be enabled", ref.isApplicable());
-	}
-
-	private IPackageFragmentRoot getArchiveRoot() throws JavaModelException, Exception {
-		IPackageFragmentRoot[] roots= RefactoringTestSetup.getProject().getPackageFragmentRoots();
-		IPackageFragmentRoot archive= null;
-		for (int i= 0; i < roots.length; i++) {
-			IPackageFragmentRoot root= roots[i];
-			if (root.isArchive() && root.isExternal())
-				archive= root;
-		}
-		return archive;
-	}
-
-	private ICompilationUnit fCuA;
-	private static final String CU_NAME= "A";
-
-	private void loadFileSetup() throws Exception{
-		fCuA= createCUfromTestFile(getPackageP(), CU_NAME);
-		assertTrue("A.java does not exist", fCuA.exists());
-	}
-	
-	private void checkDelete(IJavaElement[] elems, boolean deleteCu) throws JavaModelException, Exception {
-		ICompilationUnit newCuA= null;
-		try {
-			DeleteRefactoring refactoring= createRefactoring(elems);
-			assertNotNull(refactoring);
-			RefactoringStatus status= performRefactoring(refactoring, false);
-			assertEquals("precondition was supposed to pass", null, status);
-
-			newCuA= getPackageP().getCompilationUnit(CU_NAME + ".java");
-			assertTrue("A.java does not exist", newCuA.exists() == !deleteCu);
-			if (! deleteCu)
-				assertEqualLines("incorrect content of A.java", getFileContents(getOutputTestFileName(CU_NAME)), newCuA.getSource());
-		} finally {
-			performDummySearch();
-			if (newCuA != null && newCuA.exists())
-				newCuA.delete(true, null);	
-			if (fCuA != null && fCuA.exists()){
-				fCuA.delete(true, null);		
-				fCuA= null;
-			}
-		}	
-	}
-
-	//---- tests
-	
-	private IReorgQueries createReorgQueries() {
-		return new MockReorgQueries();
-	}
-
-	public void testDisabled_emptySelection() throws Exception{
-		verifyDisabled(new Object[] {});
-	}
-
-	public void testDisabled_projectAndNonProject() throws Exception{
-		IJavaElement[] javaElements= {RefactoringTestSetup.getProject(), getPackageP()};
-		verifyDisabled(javaElements);
-	}
-
-	public void testDisabled_nonExistingResource() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getResource();
-		IFile file= folder.getFile("a.txt");
-		
-		IResource[] resources= {file};
-		verifyDisabled(resources);			
-	}
-	
-	public void testDisabled_nonExistingJavaElement() throws Exception{
-		IJavaElement notExistingCu= getPackageP().getCompilationUnit("V.java");
-		
-		IJavaElement[] javaElements= {notExistingCu};
-		verifyDisabled(javaElements);			
-	}
-
-	public void testDisabled_nullResource() throws Exception{
-		Object[] elements= {RefactoringTestSetup.getProject(), null};
-		verifyDisabled(elements);
-	}
-	
-	public void testDisabled_nullJavaElement() throws Exception{
-		Object[] elements= {getPackageP(), null};
-		verifyDisabled(elements);
-	}
-
-	public void testDisabled_archiveElement() throws Exception{		
-		IPackageFragmentRoot archive= getArchiveRoot();
-		assertNotNull(archive);
-		
-		Object[] elements= archive.getChildren();
-		verifyDisabled(elements);
-	}
-
-	public void testDisabled_externalArchive() throws Exception{
-		IPackageFragmentRoot archive= getArchiveRoot();
-		assertNotNull(archive);
-		
-		Object[] elements= {archive};
-		verifyDisabled(elements);
-	}
-
-	public void testDisabled_archiveFromAnotherProject() throws Exception{
-		//TODO implement me
-	}
-
-	public void testDisabled_emptySuperPackage() throws Exception{
-		IPackageFragment superPackage= getRoot().createPackageFragment("superPackage", false, new NullProgressMonitor());
-		IPackageFragment subPackage= getRoot().createPackageFragment("superPackage.subPackage", false, new NullProgressMonitor());
-		try{
-			assertTrue(superPackage.exists());
-			assertTrue(subPackage.exists());
-			assertTrue(superPackage.hasSubpackages());
-		
-			Object[] elements= {superPackage};
-			verifyDisabled(elements);
-		} finally {
-			performDummySearch();
-			subPackage.delete(true, new NullProgressMonitor());
-			superPackage.delete(true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDisabled_binaryMember() throws Exception{
-		//TODO implement me
-	}
-
-	public void testDisabled_javaProject() throws Exception{
-		Object[] elements= {RefactoringTestSetup.getProject()};
-		verifyDisabled(elements);
-	}
-
-	public void testEnabled_defaultPackage() throws Exception{
-//		printTestDisabledMessage("enable this case once 38450 is fixed");
-		
-		IPackageFragment defaultPackage= getRoot().getPackageFragment("");
-		ICompilationUnit cu= defaultPackage.createCompilationUnit("A.java", "", false, new NullProgressMonitor());
-		
-		try{
-			Object[] elements= {defaultPackage};
-			verifyEnabled(elements);		
-		} finally{
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-	
-	public void testDisabled_simpleProject() throws Exception{
-		Object[] elements= {RefactoringTestSetup.getProject().getProject()};
-		verifyDisabled(elements);
-	}
-
-	public void testEnabled_cu() throws Exception{
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "", false, new NullProgressMonitor());
-		
-		try{		
-			Object[] elements= {cu};
-			verifyEnabled(elements);
-		} finally{
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}	
-
-	public void testEnabled_sourceReferences1() throws Exception{
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "", false, new NullProgressMonitor());
-		try{
-			IJavaElement importD= cu.createImport("java.lang.*", null, new NullProgressMonitor());
-			IJavaElement packageD= cu.createPackageDeclaration("p", new NullProgressMonitor());
-			IJavaElement type= cu.createType("class A{}", null, false, new NullProgressMonitor());
-			
-			Object[] elements= {packageD, importD, type};
-			verifyEnabled(elements);			
-		} finally{
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}
-	
-	public void testEnabled_sourceReferences2() throws Exception{
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "", false, new NullProgressMonitor());
-		try{
-			IType type= cu.createType("class A{}", null, false, new NullProgressMonitor());
-			IJavaElement field= type.createField("int i;", null, false, new NullProgressMonitor());
-			IJavaElement method= type.createMethod("void f(){}", null, false, new NullProgressMonitor());
-			IJavaElement initializer= type.createInitializer("{ int k= 0;}", null, new NullProgressMonitor());
-			IJavaElement innerType= type.createType("class Inner{}", null, false,  new NullProgressMonitor());
-			
-			Object[] elements= {field, method, initializer, innerType};
-			verifyEnabled(elements);			
-		} finally{
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		}
-	}	
-
-	
-	public void testEnabled_file() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getResource();
-		IFile file= folder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		try{
-			Object[] elements= {file};
-			verifyEnabled(elements);			
-		} finally{
-			performDummySearch();
-			file.delete(true, false, null);
-		}
-	}	
-
-	public void testEnabled_folder() throws Exception{
-		IFolder folder= (IFolder)getPackageP().getResource();
-		
-		Object[] elements= {folder};
-		verifyEnabled(elements);			
-	}	
-
-	public void testEnabled_readOnlyCu() throws Exception{
-		//TODO implement me
-	}	
-
-	public void testEnabled_readOnlyFile() throws Exception{
-		//TODO implement me
-	}	
-	
-	public void testEnabled_package() throws Exception{
-		Object[] elements= {getPackageP()};
-		verifyEnabled(elements);
-	}
-
-	public void testEnabled_sourceFolder() throws Exception{
-		Object[] elements= {getRoot()};
-		verifyEnabled(elements);
-	}	
-
-	public void testEnabled_linkedFile() throws Exception{
-		//TODO implement me
-	}	
-	
-	public void testEnabled_linkedFolder() throws Exception{
-		//TODO implement me
-	}	
-
-	public void testEnabled_linkedPackage() throws Exception{
-		//TODO implement me
-	}	
-
-	public void testEnabled_linkedSourceFolder() throws Exception{
-		//TODO implement me
-	}
-
-	public void testDeleteWithinCu0() throws Exception{
-//		printTestDisabledMessage("bug#15305 incorrect deletion of fields (multi-declaration case)");
-//		printTestDisabledMessage("test for bug#8405 Delete field action broken for multiple declarations");
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getField("i");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu1() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(fCuA, elem0, fCuA.getResource());
-
-		checkDelete(elems, true);
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteWithinCu2() throws Exception{
-		loadFileSetup();
-		ParticipantTesting.reset();
-		IJavaElement elem0= fCuA.getType("A").getField("i");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu3() throws Exception{
-//		printTestDisabledMessage("bug#15305 incorrect deletion of fields (multi-declaration case)");
-//		printTestDisabledMessage("test for bug#8405 Delete field action broken for multiple declarations");		
-//		if (true)
-//			return;
-		loadFileSetup();
-		ParticipantTesting.reset();
-		IJavaElement elem0= fCuA.getType("A").getField("i");
-		IJavaElement elem1= fCuA.getType("A").getField("j");
-		IJavaElement[] elems= new IJavaElement[]{elem0, elem1};
-		String[] handles= ParticipantTesting.createHandles(elem0, elem1);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu4() throws Exception{
-//		printTestDisabledMessage("bug#15305 incorrect deletion of fields (multi-declaration case)");
-//		printTestDisabledMessage("test for bug#8405 Delete field action broken for multiple declarations");		
-//		if (true)
-//			return;
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getField("i");
-		IJavaElement elem1= fCuA.getType("A").getField("k");
-		IJavaElement[] elems= new IJavaElement[]{elem0, elem1};
-		String[] handles= ParticipantTesting.createHandles(elem0, elem1);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu5() throws Exception{
-//		printTestDisabledMessage("bug#15305 incorrect deletion of fields (multi-declaration case)");
-//		printTestDisabledMessage("test for bug#8405 Delete field action broken for multiple declarations");		
-//		if (true)
-//			return;
-		loadFileSetup();
-		ParticipantTesting.reset();
-		IJavaElement elem0= fCuA.getType("A").getField("j");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);		
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu6() throws Exception{
-//		printTestDisabledMessage("test for bug#8405 Delete field action broken for multiple declarations");		
-//		printTestDisabledMessage("test for bug#9382 IField::delete incorrect on multiple field declarations with initializers");		
-//		if (true)
-//			return;
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getField("j");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-		
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu7() throws Exception{
-		//exposes bug#9381 IPackageDeclaration is not ISourceManipulation
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getPackageDeclaration("p");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteWithinCu8() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getMethod("m", new String[0]);
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu9() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getInitializer(1);
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu10() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getInitializer(1);
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu11() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getImport("java.util.List");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu12() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getType("B");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteWithinCu13() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getType("B");
-		IJavaElement elem1= fCuA.getType("A");
-		IJavaElement[] elems= new IJavaElement[]{elem0, elem1};
-		String[] handles= ParticipantTesting.createHandles(fCuA, fCuA.getTypes()[0], fCuA.getResource());
-		
-		checkDelete(elems, true);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu14() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getType("B");
-		IJavaElement elem1= fCuA.getType("A");
-		IJavaElement elem2= fCuA.getPackageDeclaration("p");
-		IJavaElement[] elems= new IJavaElement[]{elem0, elem1, elem2};
-		String[] handles= ParticipantTesting.createHandles(fCuA, fCuA.getTypes()[0], fCuA.getResource());
-		
-		checkDelete(elems, true);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu15() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getField("field");
-		IJavaElement getter= fCuA.getType("A").getMethod("getField", new String[] {});
-		IJavaElement setter= fCuA.getType("A").getMethod("setField", new String[] {"I"});
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0, getter, setter);
-		
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu16() throws Exception{
-		if (true) {
-			printTestDisabledMessage("testDeleteWithinCu16 disabled for bug#55221");		
-			return;
-		}
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("Test");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu17() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getMethod("f", new String[0]);
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu18() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getMethod("fs", new String[0]);
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-		
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteWithinCu19() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getImportContainer();
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu20() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getField("fEmpty");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-		
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteWithinCu21() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("A").getField("var11");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-		
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteWithinCu22() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IJavaElement elem0= fCuA.getType("B");
-		IJavaElement[] elems= new IJavaElement[]{elem0};
-		String[] handles= ParticipantTesting.createHandles(elem0);
-		
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteWithinCu23() throws Exception{
-		ParticipantTesting.reset();
-		loadFileSetup();
-		IType typeA= fCuA.getType("A");
-		IJavaElement[] elems= new IJavaElement[]{
-				typeA.getField("nestingDepth"), typeA.getField("openOnRun"),
-				typeA.getMethod("getNestingDepth", new String[0]), typeA.getMethod("getOpenOnRun", new String[0])
-		};
-		String[] handles= ParticipantTesting.createHandles(elems);
-		
-		checkDelete(elems, false);
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteFile() throws Exception{
-		ParticipantTesting.reset();
-		IFolder folder= (IFolder)getPackageP().getResource();
-		IFile file= folder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		assertTrue("file does not exist", file.exists());
-		Object[] elem= {file};
-		verifyEnabled(elem);			
-		performDummySearch();			
-		
-		String[] handles= ParticipantTesting.createHandles(file);
-		
-		DeleteRefactoring ref= createRefactoring(elem);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertEquals("expected to pass", null, status);
-		assertTrue("file not deleted", ! file.exists());
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteFolder() throws Exception{
-		ParticipantTesting.reset();
-		IFolder folder= (IFolder)getPackageP().getResource();
-		IFolder subFolder= folder.getFolder("subFolder");
-		subFolder.create(true, true, null);
-
-		assertTrue("folder does not exist", subFolder.exists());
-		Object[] elements= {subFolder};
-		verifyEnabled(elements);			
-		performDummySearch();			
-
-		String[] handles= ParticipantTesting.createHandles(subFolder);
-		DeleteRefactoring ref= createRefactoring(elements);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertEquals("expected to pass", null, status);
-		assertTrue("folder not deleted", ! subFolder.exists());
-		ParticipantTesting.testDelete(handles);
-	}
-
-	public void testDeleteNestedFolders() throws Exception{
-		ParticipantTesting.reset();
-		IFolder folder= (IFolder)getPackageP().getResource();
-		IFolder subFolder= folder.getFolder("subFolder");
-		subFolder.create(true, true, null);
-		IFolder subsubFolder= subFolder.getFolder("subSubFolder");
-		subsubFolder.create(true, true, null);
-
-		assertTrue("folder does not exist", subFolder.exists());
-		assertTrue("folder does not exist", subsubFolder.exists());
-		Object[] elements= {subFolder, subsubFolder};
-		verifyEnabled(elements);			
-		performDummySearch();			
-
-		String[] handles= ParticipantTesting.createHandles(subFolder);
-		DeleteRefactoring ref= createRefactoring(elements);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertEquals("expected to pass", null, status);
-		assertTrue("folder not deleted", ! subFolder.exists());
-		assertTrue("folder not deleted", ! subsubFolder.exists());
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeletePackage() throws Exception{
-		ParticipantTesting.reset();
-		IPackageFragment newPackage= getRoot().createPackageFragment("newPackage", true, new NullProgressMonitor());
-		assertTrue("package not created", newPackage.exists());
-		ICompilationUnit cu= newPackage.createCompilationUnit("A.java", "public class A {}", false, null);
-		IFile file= ((IContainer)newPackage.getResource()).getFile(new Path("Z.txt"));
-		file.create(getStream("123"), true, null);
-		
-		Object[] elements= {newPackage};
-		verifyEnabled(elements);			
-		performDummySearch();			
-		String[] deleteHandles= ParticipantTesting.createHandles(newPackage, newPackage.getResource(), cu.getResource(), file);
-		
-		DeleteRefactoring ref= createRefactoring(elements);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertEquals("expected to pass", null, status);
-		assertTrue("package not deleted", ! newPackage.exists());
-		
-		ParticipantTesting.testDelete(deleteHandles);
-	}
-
-	public void testDeletePackage2() throws Exception{
-		ParticipantTesting.reset();
-		IPackageFragment newPackage= getRoot().createPackageFragment("p1", true, new NullProgressMonitor());
-		getRoot().createPackageFragment("p1.p2", true, new NullProgressMonitor());
-		assertTrue("package not created", newPackage.exists());
-		ICompilationUnit cu= newPackage.createCompilationUnit("A.java", "public class A {}", false, null);
-		IFile file= ((IContainer)newPackage.getResource()).getFile(new Path("Z.txt"));
-		file.create(getStream("123"), true, null);
-		
-		Object[] elements= {newPackage};
-		verifyEnabled(elements);			
-		performDummySearch();			
-		String[] deleteHandles= ParticipantTesting.createHandles(newPackage, cu.getResource(), file);
-		
-		DeleteRefactoring ref= createRefactoring(elements);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertEquals("expected to pass", null, status);
-		//Package is not delete since it had sub packages
-		assertTrue("package deleted", newPackage.exists());
-		
-		ParticipantTesting.testDelete(deleteHandles);
-	}
-
-	public void testDeleteCu() throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit newCU= getPackageP().createCompilationUnit("X.java", "package p; class X{}", true, new NullProgressMonitor());
-		assertTrue("cu not created", newCU.exists());
-
-		Object[] elements= {newCU};
-		String[] handles= ParticipantTesting.createHandles(newCU, newCU.getTypes()[0], newCU.getResource());
-		
-		verifyEnabled(elements);			
-		performDummySearch();			
-		
-		DeleteRefactoring ref= createRefactoring(elements);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertEquals("expected to pass", null, status);
-		assertTrue("cu not deleted", ! newCU.exists());
-		ParticipantTesting.testDelete(handles);		
-	}
-	
-	public void testDeleteSourceFolder() throws Exception{
-		ParticipantTesting.reset();
-		IPackageFragmentRoot fredRoot= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "fred");
-		assertTrue("not created", fredRoot.exists());
-
-		Object[] elements= {fredRoot};
-		verifyEnabled(elements);			
-		performDummySearch();			
-		String[] handles= ParticipantTesting.createHandles(fredRoot, fredRoot.getResource());
-		DeleteRefactoring ref= createRefactoring(elements);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertEquals("expected to pass", null, status);
-		assertTrue("not deleted", ! fredRoot.exists());
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteInternalJAR() throws Exception{
-		ParticipantTesting.reset();
-		File lib= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-		assertTrue("lib does not exist",  lib != null && lib.exists());
-		IPackageFragmentRoot internalJAR= JavaProjectHelper.addLibraryWithImport(RefactoringTestSetup.getProject(), new Path(lib.getPath()), null, null);
-
-		Object[] elements= {internalJAR};
-		verifyEnabled(elements);			
-		performDummySearch();
-		String[] handles= ParticipantTesting.createHandles(internalJAR);
-
-		DeleteRefactoring ref= createRefactoring(elements);
-		RefactoringStatus status= performRefactoring(ref, false);
-		assertEquals("expected to pass", null, status);
-		assertTrue("not deleted", ! internalJAR.exists());		
-		ParticipantTesting.testDelete(handles);
-	}
-	
-	public void testDeleteClassFile() throws Exception{
-		//TODO implement me - how do i get a handle to a class file?
-	}
-	
-	private DeleteRefactoring createRefactoring(Object[] elements) throws CoreException {
-		JavaDeleteProcessor processor= new JavaDeleteProcessor(elements);
-		DeleteRefactoring result= new DeleteRefactoring(processor);
-		processor.setQueries(createReorgQueries());
-		return result;		
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MockReorgQueries.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MockReorgQueries.java
deleted file mode 100644
index e7a8897..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MockReorgQueries.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.OperationCanceledException;
-
-import org.eclipse.jdt.internal.corext.refactoring.reorg.IConfirmQuery;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgQueries;
-
-public class MockReorgQueries implements IReorgQueries {
-	private final List fQueriesRun= new ArrayList();
-
-	public IConfirmQuery createYesNoQuery(String queryTitle, boolean allowCancel, int queryID) {
-		run(queryID);
-		return yesQuery;
-	}
-
-	public IConfirmQuery createYesYesToAllNoNoToAllQuery(String queryTitle, boolean allowCancel, int queryID) {
-		run(queryID);
-		return yesQuery;
-	}
-
-	private void run(int queryID) {
-		fQueriesRun.add(new Integer(queryID));
-	}
-
-	//List<Integer>
-	public List getRunQueryIDs() {
-		return fQueriesRun;
-	}
-
-	private final IConfirmQuery yesQuery= new IConfirmQuery() {
-		public boolean confirm(String question) throws OperationCanceledException {
-			return true;
-		}
-
-		public boolean confirm(String question, Object[] elements) throws OperationCanceledException {
-			return true;
-		}
-	};
-
-	public IConfirmQuery createSkipQuery(String queryTitle, int queryID) {
-		run(queryID);
-		return yesQuery;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MoveTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MoveTest.java
deleted file mode 100644
index 8ef2a82..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MoveTest.java
+++ /dev/null

@@ -1,1881 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IInitializer;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgQueries;
-import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaMoveProcessor;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.ParticipantTesting;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.MoveArguments;
-import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
-
-
-public class MoveTest extends RefactoringTest {
-
-	public MoveTest(String name) {
-		super(name);
-	}
-
-	private static final Class clazz= MoveTest.class;
-	private static final String REFACTORING_PATH= "Move/";
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	private IReorgQueries createReorgQueries(){
-		return new MockReorgQueries();
-	}
-	
-	private RefactoringStatus performRefactoring(JavaMoveProcessor processor, boolean providesUndo) throws Exception {
-		return performRefactoring(new MoveRefactoring(processor), providesUndo);
-	}
-
-	private void verifyDisabled(IResource[] resources, IJavaElement[] javaElements) throws JavaModelException {
-		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
-		assertTrue("move should be disabled", ! JavaMoveProcessor.isAvailable(resources, javaElements, settings));
-		JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, settings);
-		assertTrue(processor == null);
-	}
-	
-	private JavaMoveProcessor verifyEnabled(IResource[] resources, IJavaElement[] javaElements, IReorgQueries reorgQueries) throws JavaModelException {
-		CodeGenerationSettings settings= JavaPreferencesSettings.getCodeGenerationSettings();
-		assertTrue("move should be enabled", JavaMoveProcessor.isAvailable(resources, javaElements, settings));
-		JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, settings);
-		if (reorgQueries != null)
-			processor.setReorgQueries(reorgQueries);
-		assertNotNull(processor);
-		return processor;
-	}
-	
-	private void verifyValidDestination(JavaMoveProcessor ref, Object destination) throws Exception {
-		RefactoringStatus status= null;
-		if (destination instanceof IResource)
-			status= ref.setDestination((IResource)destination);
-		else if (destination instanceof IJavaElement)
-			status= ref.setDestination((IJavaElement)destination);
-		else assertTrue(false);
-		
-		assertEquals("destination was expected to be valid: " + status.getMessageMatchingSeverity(status.getSeverity()), RefactoringStatus.OK, status.getSeverity());
-	}
-
-	private void verifyInvalidDestination(JavaMoveProcessor ref, Object destination) throws Exception {
-		RefactoringStatus status= null;
-		if (destination instanceof IResource)
-			status= ref.setDestination((IResource)destination);
-		else if (destination instanceof IJavaElement)
-			status= ref.setDestination((IJavaElement)destination);
-		else assertTrue(false);
-		
-		assertEquals("destination was expected to be not valid",  RefactoringStatus.FATAL, status.getSeverity());
-	}
-
-	private void safeDelete(ICompilationUnit cu) throws JavaModelException {
-		if (cu != null && cu.exists())
-			cu.delete(true, new NullProgressMonitor());
-	}
-	private void safeDelete(IPackageFragment pack) throws JavaModelException {
-		if (pack != null && pack.exists())
-			pack.delete(true, new NullProgressMonitor());
-	}
-	private void safeDelete(IResource res) throws CoreException {
-		if (res != null && res.exists())
-			res.delete(true, null);
-	}
-	
-	
-	public void testDisabled_empty() throws Exception {
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);
-	}
-	
-	public void testDisabled_null_element() throws Exception {
-		IJavaElement[] javaElements= {null};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_null_resource() throws Exception {
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {null};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_javaProject() throws Exception {
-		IJavaElement[] javaElements= {RefactoringTestSetup.getProject()};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_defaultPackage() throws Exception {
-		IPackageFragment defaultPackage= getRoot().getPackageFragment("");
-		assertTrue(defaultPackage.exists());
-		IJavaElement[] javaElements= {defaultPackage};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_project() throws Exception {
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {RefactoringTestSetup.getProject().getProject()};
-		verifyDisabled(resources, javaElements);
-	}
-
-	public void testDisabled_notExistingElement() throws Exception {
-		ICompilationUnit notExistingCu= getPackageP().getCompilationUnit("NotMe.java");
-		assertTrue(! notExistingCu.exists());
-		IJavaElement[] javaElements= {notExistingCu};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);		
-	}
-
-	public void testDisabled_notExistingResource() throws Exception {
-		IFolder folder= (IFolder)getPackageP().getResource();
-		IFile notExistingFile= folder.getFile("a.txt");
-		
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {notExistingFile};
-		verifyDisabled(resources, javaElements);
-	}
-	
-	public void testDisabled_noCommonParent0() throws Exception {
-		IJavaElement[] javaElements= {getPackageP(), getRoot()};
-		IResource[] resources= {};
-		verifyDisabled(resources, javaElements);		
-	}
-	
-	public void testDisabled_noCommonParent1() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-		try {
-			IType classA= cu.getType("A");
-			IMethod	methodFoo= classA.getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { classA, methodFoo };
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}		
-	}
-
-//	public void testDisabled_noCommonParent2() throws Exception {
-//		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-//		try {
-//			IType classA= cu.getType("A");
-//			IJavaElement[] javaElements= { classA, cu};
-//			IResource[] resources= {};
-//			verifyDisabled(resources, javaElements);
-//		} finally {
-//			performDummySearch();
-//			cu.delete(true, new NullProgressMonitor());
-//		}		
-//	}
-
-	public void testDisabled_noCommonParent3() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= {cu, getPackageP()};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}		
-	}
-
-	public void testDisabled_noCommonParent5() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= {cu, getRoot()};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}		
-	}
-
-	public void testDisabled_noCommonParent6() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}}", false, new NullProgressMonitor());
-		try {
-			IJavaElement[] javaElements= {cu, getRoot()};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}		
-	}
-
-	public void testDisabled_noCommonParent7() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{class Inner{}}", false, new NullProgressMonitor());
-		try {
-			IType classA= cu.getType("A");
-			IType classInner= classA.getType("Inner");
-			IJavaElement[] javaElements= { classA, classInner};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-	
-	public void testDisabled_noCommonParent8() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try {
-			IType classA= cu.getType("A");
-			IMethod	methodFoo= classA.getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { methodFoo, classA};
-			IResource[] resources= {};
-			verifyDisabled(resources, javaElements);
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_no_fileToItself() throws Exception {
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= file;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			file.delete(true, false, null);
-		}
-	}
-	
-	public void testDestination_no_fileToSiblingFile() throws Exception {
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFile file1= superFolder.getFile("a.txt");
-		file1.create(getStream("123"), true, null);
-		IFile file2= superFolder.getFile("b.txt");
-		file2.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file1};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= file2;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			file1.delete(true, false, null);
-			file2.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_no_folderToItsef() throws Exception {
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= folder;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			folder.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_no_cuToItsef() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= cu;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_no_cuToSiblingCu() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("B.java", "package p;class A{}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= cu1;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-			safeDelete(cu1);
-		}
-	}
-
-	public void testDestination_no_cuToSiblingFile() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFile file1= superFolder.getFile("a.txt");
-		file1.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= file1;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-			safeDelete(file1);
-		}
-	}
-	
-	public void testDestination_no_packageToItsef() throws Exception {
-		IJavaElement[] javaElements= {getPackageP()};
-		IResource[] resources= {};
-		JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-		Object destination= getPackageP();
-		verifyInvalidDestination(ref, destination);
-	}
-	
-	public void testDestination_no_sourceFolderToItsef() throws Exception {
-		IJavaElement[] javaElements= {getRoot()};
-		IResource[] resources= {};
-		JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-		Object destination= getRoot();
-		verifyInvalidDestination(ref, destination);
-	}
-	
-	public void testDestination_no_methodToItsef() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= method;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_no_fileToParentFolder() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		IFile file= folder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= folder;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			folder.delete(true, false, null);
-			file.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_no_fileToParentPackage() throws Exception {
-		IFolder superFolder= (IFolder)getPackageP().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			file.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_no_fileToParentSourceFolder() throws Exception {
-		IFolder superFolder= (IFolder)getRoot().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			file.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_no_folderToParentFolder() throws Exception {
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-
-		IFolder parentFolder= superFolder.getFolder("folder");
-		parentFolder.create(true, true, null);
-		IFolder folder= parentFolder.getFolder("subfolder");
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {parentFolder};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= parentFolder;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			parentFolder.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_no_cuToParentPackage() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {cu};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= cu.getParent();
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-	
-	public void testDestination_no_packageToParentSourceFolder() throws Exception {
-		IJavaElement[] javaElements= {getPackageP()};
-		IResource[] resources= {};
-		JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-		Object destination= getRoot();
-		verifyInvalidDestination(ref, destination);
-	}
-	
-	public void testDestination_no_sourceFolderToParentProject() throws Exception {
-		IJavaElement[] javaElements= {getRoot()};
-		IResource[] resources= {};
-		JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-		Object destination= getRoot().getParent();
-		verifyInvalidDestination(ref, destination);
-	}
-	
-	public void testDestination_no_methodToParentType() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= cu.getType("A");
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_yes_cuToMethod() throws Exception {
-		IPackageFragment pack1= getRoot().createPackageFragment("q", true, new NullProgressMonitor());
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("B.java", "package p;class B{}", false, new NullProgressMonitor());
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {cu1};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= method;
-			verifyValidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(pack1);
-			safeDelete(cu1);
-		}
-	}
-	
-	public void testDestination_no_packageToCu() throws Exception {
-		IPackageFragment pack1= getRoot().createPackageFragment("q", true, new NullProgressMonitor());
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {pack1};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= cu;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(pack1);
-		}
-	}
-
-	public void testDestination_no_packageToFile() throws Exception {
-		IPackageFragment pack1= getRoot().createPackageFragment("q", true, new NullProgressMonitor());
-		IFolder superFolder= (IFolder)getRoot().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		try{
-			IJavaElement[] javaElements= {pack1};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= file;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(pack1);
-			file.delete(true, false, null);	
-		}
-	}
-
-	public void testDestination_no_packageToFolder() throws Exception {
-		IPackageFragment pack1= getRoot().createPackageFragment("q", true, new NullProgressMonitor());
-		IFolder superFolder= (IFolder)getRoot().getResource();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {pack1};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= folder;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(pack1);
-			folder.delete(true, false, null);	
-		}
-	}
-
-	public void testDestination_no_packageToSimpleProject() throws Exception {
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		
-		IPackageFragment pack1= getRoot().createPackageFragment("q", true, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {pack1};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(pack1);
-			simpleProject.delete(true, true, null);	
-		}
-	}
-
-//	public void testDestination_no_packageToJavaProjectWithNoSourceFolders() throws Exception {
-//		IJavaProject otherProject= JavaProjectHelper.createJavaProject("otherProject", null);
-//		JavaProjectHelper.addSourceContainer(otherProject, null);
-//		IPackageFragment pack1= getRoot().createPackageFragment("q", true, new NullProgressMonitor());
-//		try{
-//			IJavaElement[] javaElements= {pack1};
-//			IResource[] resources= {};
-//			JavaMoveProcessor2 ref= verifyEnabled(resources, javaElements, createReorgQueries());
-//
-//			Object destination= otherProject;
-//			verifyInvalidDestination(ref, destination);
-//		} finally{
-//			performDummySearch();
-//			pack1.delete(true, new NullProgressMonitor());
-//			JavaProjectHelper.delete(otherProject);
-//		}
-//	}
-	
-	public void testDestination_no_packageToSiblingPackage() throws Exception {
-		IPackageFragment pack1= getRoot().createPackageFragment("q", true, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {getPackageP()};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= pack1;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(pack1);
-		}
-	}
-	
-	public void testDestination_no_sourceFolderToCu() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-		try{
-			IJavaElement[] javaElements= {sourceFolder};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= cu;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-			sourceFolder.delete(0, 0, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_no_sourceFolderToPackage() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-		try{
-			IJavaElement[] javaElements= {sourceFolder};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= getPackageP();
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			sourceFolder.delete(0, 0, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_no_sourceFolderToFile() throws Exception {
-		IFolder superFolder= (IFolder)getRoot().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-		try{
-			IJavaElement[] javaElements= {sourceFolder};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= file;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			sourceFolder.delete(0, 0, new NullProgressMonitor());
-			file.delete(true, false, null);	
-		}
-	}
-
-	public void testDestination_no_sourceFolderToFolder() throws Exception {
-		IFolder superFolder= (IFolder)getRoot().getResource();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-		try{
-			IJavaElement[] javaElements= {sourceFolder};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= folder;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			sourceFolder.delete(0, 0, new NullProgressMonitor());
-			folder.delete(true, false, null);	
-		}
-	}
-
-	public void testDestination_no_sourceFolderToSourceFolder() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-		try{
-			IJavaElement[] javaElements= {sourceFolder};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= getRoot();
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			sourceFolder.delete(0, 0, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_no_sourceFolderToSimpleProject() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-
-		try{
-			IJavaElement[] javaElements= {sourceFolder};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= simpleProject;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			sourceFolder.delete(0, 0, new NullProgressMonitor());
-			simpleProject.delete(true, true, null);
-		}
-	}
-
-	public void testDestination_no_sourceFolderToJavaProjecteWithNoSourceFolder() throws Exception {
-		IJavaProject otherProject= JavaProjectHelper.createJavaProject("otherProject", null);
-		JavaProjectHelper.addSourceContainer(otherProject, null);
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-		
-		try{
-			IJavaElement[] javaElements= {sourceFolder};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= otherProject;
-			verifyInvalidDestination(ref, destination);
-		}finally{
-			performDummySearch();
-			sourceFolder.delete(0, 0, new NullProgressMonitor());
-			JavaProjectHelper.delete(otherProject);
-		} 
-	}
-	
-	public void testDestination_no_methodToCu() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("B.java", "package p;class B{}", false, new NullProgressMonitor());
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= cu1;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-			safeDelete(cu1);
-		}
-	}
-
-	public void testDestination_no_methodToFile() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IFolder superFolder= (IFolder)getRoot().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= file;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-			file.delete(true, false, null);
-		}
-	}
-
-	public void testDestination_no_methodToFolder() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IFolder superFolder= (IFolder)getRoot().getResource();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= folder;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-			folder.delete(true, false, null);
-		}
-	}
-	
-	public void testDestination_no_methodToPackage() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= getPackageP();
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_no_methodToSourceFolder() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= getRoot();
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_no_methodToJavaProject() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= RefactoringTestSetup.getProject();
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_no_methodToSimpleProject() throws Exception {
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {method};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-	
-			Object destination= simpleProject;
-			verifyInvalidDestination(ref, destination);
-		} finally{
-			performDummySearch();
-			safeDelete(cu);
-			simpleProject.delete(true, true, null);
-		}
-	}
-	
-	public void testDestination_no_cuToItself() throws Exception{
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-			Object destination= cu1;
-			verifyInvalidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			safeDelete(cu1);
-		}
-	}
-
-	public void testDestination_yes_cuToOtherPackage() throws Exception{
-		IPackageFragment otherPackage= getRoot().createPackageFragment("otherPackage", true, new NullProgressMonitor());
-		String oldSource= "package p;class A{void foo(){}class Inner{}}";
-		String newSource= "package otherPackage;class A{void foo(){}class Inner{}}";
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", oldSource, false, new NullProgressMonitor());
-		try{
-			ParticipantTesting.reset();
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {cu1, cu1.getTypes()[0], cu1.getResource()});
-			JavaMoveProcessor processor= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= otherPackage;
-			verifyValidDestination(processor, destination);
-			
-			assertTrue("source file does not exist before moving", cu1.exists());
-			RefactoringStatus status= performRefactoring(processor, false);
-			assertEquals(null, status);
-			assertTrue("source file exists after moving", ! cu1.exists());
-			ICompilationUnit newCu= otherPackage.getCompilationUnit(cu1.getElementName());
-			assertTrue("new file does not exist after moving", newCu.exists());
-			assertEqualLines("source differs", newSource, newCu.getSource());
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(otherPackage, processor.getUpdateReferences()),
-					new MoveArguments(otherPackage, processor.getUpdateReferences()),
-					new MoveArguments(otherPackage.getResource(), processor.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(otherPackage);
-		}
-	}
-
-	public void testDestination_yes_cuToOtherPackageWithMultiRoot() throws Exception {
-		ParticipantTesting.reset();
-		//regression test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=47788
-		IPackageFragment otherPackage= getRoot().createPackageFragment("otherPackage", true, new NullProgressMonitor());
-		String oldA= "package p;public class A{}";
-		String newA= "package otherPackage;public class A{}";
-		ICompilationUnit cuA= getPackageP().createCompilationUnit("A.java", oldA, false, new NullProgressMonitor());
-		
-		IPackageFragmentRoot testSrc= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "testSrc");
-		IPackageFragment testP= testSrc.createPackageFragment("p", true, new NullProgressMonitor());
-		String oldRef= "package p;\npublic class Ref { A t = new A(); }";
-		String newRef= "package p;\n\nimport otherPackage.A;\n\npublic class Ref { A t = new A(); }";
-		ICompilationUnit cuRef= testP.createCompilationUnit("Ref.java", oldRef, false, new NullProgressMonitor());
-		try{
-			IJavaElement[] javaElements= {cuA};
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {cuA, cuA.getTypes()[0], cuA.getResource()});
-			JavaMoveProcessor processor= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= otherPackage;
-			verifyValidDestination(processor, destination);
-			
-			assertTrue("source file does not exist before moving", cuA.exists());
-			RefactoringStatus status= performRefactoring(processor, false);
-			assertEquals(null, status);
-			assertTrue("source file exists after moving", ! cuA.exists());
-			ICompilationUnit newCu= otherPackage.getCompilationUnit(cuA.getElementName());
-			assertTrue("new file does not exist after moving", newCu.exists());
-			assertEqualLines("source differs", newA, newCu.getSource());
-			assertEqualLines("Ref differs", newRef, cuRef.getSource());
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(otherPackage, processor.getUpdateReferences()),
-					new MoveArguments(otherPackage, processor.getUpdateReferences()),
-					new MoveArguments(otherPackage.getResource(), processor.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(otherPackage);
-			JavaProjectHelper.removeSourceContainer(RefactoringTestSetup.getProject(), testSrc.getElementName());
-		}
-	}
-	
-	public void testDestination_yes_cuToRoot() throws Exception{
-		ParticipantTesting.reset();
-		String newSource= "class A{void foo(){}class Inner{}}";
-		String oldSource= "package p;class A{void foo(){}class Inner{}}";
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", oldSource, false, new NullProgressMonitor());
-		ICompilationUnit newCu= null;
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {cu1, cu1.getTypes()[0], cu1.getResource()});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);			
-			
-			assertTrue("source file does not exist before moving", cu1.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("source file exists after moving", ! cu1.exists());
-			newCu= getRoot().getPackageFragment("").getCompilationUnit(cu1.getElementName());
-			assertTrue("new file does not exist after moving", newCu.exists());
-			assertEqualLines("source differs", newSource, newCu.getSource());
-
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(getRoot().getPackageFragment(""), ref.getUpdateReferences()),
-					new MoveArguments(getRoot().getPackageFragment(""), ref.getUpdateReferences()),
-					new MoveArguments(getRoot().getResource(), ref.getUpdateReferences())});
-			
-		}finally{
-			performDummySearch();
-			safeDelete(newCu);
-		}
-	}
-
-	public void testDestination_yes_cuFromRoot() throws Exception{
-		ParticipantTesting.reset();
-		
-		//import statement with type from default package - only <= java 1.3
-		IJavaProject javaProject= getRoot().getJavaProject();
-		Map originalOptions= javaProject.getOptions(false);
-		Map newOptions= javaProject.getOptions(false);
-		newOptions.put(JavaCore.COMPILER_COMPLIANCE, "1.3");
-		newOptions.put(JavaCore.COMPILER_SOURCE, "1.3");
-		javaProject.setOptions(newOptions);
-		
-		String oldD= "import org.test.Reference;public class Default {Reference ref;}";
-		String oldRef= "package org.test;import Default;public class Reference{Default d;}";
-		String newD= "package org;\nimport org.test.Reference;public class Default {Reference ref;}";
-		String newRef= "package org.test;import org.Default;\npublic class Reference{Default d;}";
-		ICompilationUnit cuD= getRoot().getPackageFragment("").createCompilationUnit("Default.java", oldD, false, new NullProgressMonitor());
-		IPackageFragment orgTest= getRoot().createPackageFragment("org.test", false, new NullProgressMonitor());
-		ICompilationUnit cuRef= orgTest.createCompilationUnit("Reference.java", oldRef, false, new NullProgressMonitor());
-		IPackageFragment org= getRoot().getPackageFragment("org");
-		ICompilationUnit newCuD= org.getCompilationUnit(cuD.getElementName());
-		try{
-			IJavaElement[] javaElements= { cuD };
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {cuD, cuD.getTypes()[0], cuD.getResource()});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			verifyValidDestination(ref, org);			
-			
-			assertTrue("source file Default.java does not exist before moving", cuD.exists());
-			assertTrue("source file Reference.java does not exist before moving", cuRef.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("source file Default.java exists after moving", ! cuD.exists());
-			assertTrue("new file Default.java does not exist after moving", newCuD.exists());
-			assertTrue("source file Reference.java does not exist after moving", cuRef.exists());
-			assertEqualLines("Default.java differs", newD, newCuD.getSource());
-			assertEqualLines("Reference.java differs", newRef, cuRef.getSource());
-
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(org, ref.getUpdateReferences()),
-					new MoveArguments(org, ref.getUpdateReferences()),
-					new MoveArguments(org.getResource(), ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(newCuD);
-			safeDelete(orgTest);
-			safeDelete(org);
-			if (newOptions != null)
-				javaProject.setOptions(originalOptions);
-		}
-	}
-
-	public void testDestination_no_cuFromRoot() throws Exception{
-		//import statement with type from default package - only <= java 1.3
-		IJavaProject javaProject= getRoot().getJavaProject();
-		Map originalOptions= javaProject.getOptions(false);
-		Map newOptions= javaProject.getOptions(false);
-		newOptions.put(JavaCore.COMPILER_COMPLIANCE, "1.4"); //will cause error (potential match)
-		newOptions.put(JavaCore.COMPILER_SOURCE, "1.4"); //will cause error (potential match)
-		javaProject.setOptions(newOptions);
-		
-		String oldD= "import org.test.Reference;public class Default {Reference ref;}";
-		String oldRef= "package org.test;import Default;public class Reference{Default d;}";
-		String newD= "package org;\nimport org.test.Reference;public class Default {Reference ref;}";
-		String newRef= "package org.test;import org.Default;\npublic class Reference{Default d;}";
-		ICompilationUnit cuD= getRoot().getPackageFragment("").createCompilationUnit("Default.java", oldD, false, new NullProgressMonitor());
-		IPackageFragment orgTest= getRoot().createPackageFragment("org.test", false, new NullProgressMonitor());
-		ICompilationUnit cuRef= orgTest.createCompilationUnit("Reference.java", oldRef, false, new NullProgressMonitor());
-		IPackageFragment org= getRoot().getPackageFragment("org");
-		ICompilationUnit newCuD= org.getCompilationUnit(cuD.getElementName());
-		try{
-			IJavaElement[] javaElements= { cuD };
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			verifyValidDestination(ref, org);			
-			
-			assertTrue("source file Default.java does not exist before moving", cuD.exists());
-			assertTrue("source file Reference.java does not exist before moving", cuRef.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(RefactoringStatus.ERROR, status.getSeverity());
-			assertTrue("source file Default.java exists after moving", ! cuD.exists());
-			assertTrue("new file Default.java does not exist after moving", newCuD.exists());
-			assertTrue("source file Reference.java does not exist after moving", cuRef.exists());
-			assertEqualLines("Default.java differs", newD, newCuD.getSource());
-			assertEqualLines("Reference.java differs", newRef, cuRef.getSource());
-
-		}finally{
-			performDummySearch();
-			safeDelete(newCuD);
-			safeDelete(orgTest);
-			safeDelete(org);
-			if (newOptions != null)
-				javaProject.setOptions(originalOptions);
-		}
-	}
-
-	public void testDestination_yes_cuToProject() throws Exception{
-		ParticipantTesting.reset();
-		String oldSource= "package p;class A{void foo(){}class Inner{}}";
-		String newSource= oldSource;
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", oldSource, false, new NullProgressMonitor());
-		IFile newFile= null;
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {cu1, cu1.getTypes()[0], cu1.getResource()});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			IJavaProject project= RefactoringTestSetup.getProject();
-			Object destination= project;
-			verifyValidDestination(ref, destination);			
-
-			assertTrue("source file does not exist before moving", cu1.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("source file exists after moving", ! cu1.exists());
-			newFile= project.getProject().getFile(cu1.getElementName());
-			assertEqualLines("source differs", newSource, getContents(newFile));
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(project.getProject(), ref.getUpdateReferences()),
-					new MoveArguments(project.getProject(), ref.getUpdateReferences()),
-					new MoveArguments(project.getResource(), ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(newFile);
-		}
-	}
-
-	public void testDestination_yes_cuToSimpleProject() throws Exception{
-		ParticipantTesting.reset();
-		String oldSource= "package p;class A{void foo(){}class Inner{}}";
-		String newSource= oldSource;
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", oldSource, false, new NullProgressMonitor());
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		IFile newFile= null;
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {cu1, cu1.getTypes()[0], cu1.getResource()});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyValidDestination(ref, destination);
-
-			assertTrue("source file does not exist before moving", cu1.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("source file exists after moving", ! cu1.exists());
-			newFile= simpleProject.getFile(cu1.getElementName());
-			assertEqualLines("source differs", newSource, getContents(newFile));
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(simpleProject, ref.getUpdateReferences()),
-					new MoveArguments(simpleProject, ref.getUpdateReferences()),
-					new MoveArguments(simpleProject, ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(simpleProject);
-		}
-	}
-
-	public void testDestination_yes_cuToFileInDifferentPackage() throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IPackageFragment otherPackage= getRoot().createPackageFragment("other", true, new NullProgressMonitor());
-		IFolder superFolder= (IFolder) otherPackage.getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		ICompilationUnit newCu= null;
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {cu1, cu1.getTypes()[0], cu1.getResource()});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= file;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before", cu1.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file not moved", ! cu1.exists());
-			
-			newCu= otherPackage.getCompilationUnit(cu1.getElementName());
-			assertTrue("new file does not exist after", newCu.exists());
-
-			String expectedSource= "package other;class A{void foo(){}class Inner{}}";
-			assertEqualLines("source compare failed", expectedSource, newCu.getSource());
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(otherPackage, ref.getUpdateReferences()),
-					new MoveArguments(otherPackage, ref.getUpdateReferences()),
-					new MoveArguments(otherPackage.getResource(), ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(otherPackage);
-			safeDelete(newCu);
-			safeDelete(file);
-		}
-	}
-
-	public void testDestination_yes_cuToFolder() throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		
-		IFile newFile= null;
-		try{
-			IJavaElement[] javaElements= { cu1};
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {cu1, cu1.getTypes()[0], cu1.getResource()});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= folder;
-			verifyValidDestination(ref, destination);			
-
-			assertTrue("source file does not exist before", cu1.exists());
-			String expectedSource= cu1.getSource();
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file not moved", ! cu1.exists());
-			
-			newFile= folder.getFile(cu1.getElementName());
-			assertTrue("new file does not exist after", newFile.exists());
-
-			assertEqualLines("source compare failed", expectedSource, getContents(newFile));
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(destination, ref.getUpdateReferences()),
-					new MoveArguments(destination, ref.getUpdateReferences()),
-					new MoveArguments(folder, ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(newFile);
-			safeDelete(folder);
-		}
-	}
-
-	public void testDestination_yes_fileToSiblingFolder() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IFile newFile= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {file});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= folder;
-			verifyValidDestination(ref, destination);			
-
-			assertTrue("source file does not exist before", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file not moved", ! file.exists());
-			
-			newFile= folder.getFile(file.getName());
-			assertTrue("new file does not exist after", newFile.exists());
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(folder, ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(newFile);
-			safeDelete(folder);
-		}
-	}		
-
-	public void testDestination_yes_fileToCu() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		ICompilationUnit cu1= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());			
-		IFile newFile= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {file});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= cu1;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("source file does not exist before", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file not moved", ! file.exists());
-			
-			newFile= ((IFolder)cu1.getParent().getResource()).getFile(file.getName());
-			assertTrue("new file does not exist after", newFile.exists());
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(getPackageP().getResource(), ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(newFile);
-			safeDelete(cu1);
-		}
-	}		
-	
-	public void testDestination_yes_fileToPackage() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		IFile newFile= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {file});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyValidDestination(ref, destination);			
-
-			assertTrue("source file does not exist before", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file not moved", ! file.exists());
-			
-			newFile= ((IFolder)getPackageP().getResource()).getFile(file.getName());
-			assertTrue("new file does not exist after", newFile.exists());
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(getPackageP().getResource(), ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(newFile);
-		}
-	}
-
-	public void testDestination_yes_fileToMethod() throws Exception {
-		ParticipantTesting.reset();
-		IFolder superFolder= (IFolder)getRoot().getResource();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		IFile newFile= null;
-		try{
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {file});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= method;
-			verifyValidDestination(ref, destination);
-
-			assertTrue("source file does not exist before", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file not moved", ! file.exists());
-			
-			newFile= ((IFolder)getPackageP().getResource()).getFile(file.getName());
-			assertTrue("new file does not exist after", newFile.exists());
-			
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(getPackageP().getResource(), ref.getUpdateReferences())});
-		} finally{
-			performDummySearch();
-			safeDelete(file);
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_yes_fileToRoot() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-
-		IFile newFile= null;	
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {file});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);			
-
-			assertTrue("source file does not exist before", file.exists());
-			
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			assertTrue("source file not moved", ! file.exists());
-			
-			newFile= ((IFolder)getRoot().getResource()).getFile(file.getName());
-			assertTrue("new file does not exist after", newFile.exists());
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(getRoot().getResource(), ref.getUpdateReferences())});
-		}finally{
-			performDummySearch();
-			safeDelete(newFile);
-		}
-	}		
-
-	public void testDestination_no_fileToParentProject() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFile file= superFolder.getFile("a.txt");
-		file.create(getStream("123"), true, null);
-		
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {file};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyInvalidDestination(ref, destination);			
-		}finally{
-			performDummySearch();
-			safeDelete(file);
-		}
-	}		
-
-	public void testDestination_yes_folderToSiblingFolder() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IFolder otherFolder= superFolder.getFolder("otherfolder");
-		otherFolder.create(true, true, null);
-		
-		IFolder newFolder= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {folder});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= otherFolder;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("folder does not exist before", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("folder not moved", ! folder.exists());
-			newFolder= otherFolder.getFolder(folder.getName());
-			assertTrue("new folder does not exist after", newFolder.exists());		
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(destination, ref.getUpdateReferences())});
-		} finally{
-			performDummySearch();
-			safeDelete(newFolder);			
-			safeDelete(otherFolder);			
-		}
-	}
-
-	public void testDestination_no_folderToParentProject() throws Exception{
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= RefactoringTestSetup.getProject();
-			verifyInvalidDestination(ref, destination);						
-		} finally{
-			performDummySearch();
-			safeDelete(folder);			
-		}
-	}
-
-	public void testDestination_yes_folderToSiblingRoot() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-		
-		IPackageFragment newPackage= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {folder});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= getRoot();
-			verifyValidDestination(ref, destination);						
-			
-			assertTrue("folder does not exist before", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("folder not moved", ! folder.exists());
-			newPackage= getRoot().getPackageFragment(folder.getName());
-			assertTrue("new folder does not exist after", newPackage.exists());		
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(getRoot().getResource(), ref.getUpdateReferences())});
-		} finally{
-			performDummySearch();
-			safeDelete(newPackage);
-		}
-	}
-
-	public void testDestination_yes_folderToPackage() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IPackageFragment newPackage= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {folder});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= getPackageP();
-			verifyValidDestination(ref, destination);						
-
-			assertTrue("folder does not exist before", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("folder not moved", ! folder.exists());
-			newPackage= getRoot().getPackageFragment(getPackageP().getElementName() + "." + folder.getName());
-			assertTrue("new package does not exist after", newPackage.exists());		
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(getPackageP().getResource(), ref.getUpdateReferences())});
-		} finally{
-			performDummySearch();
-			safeDelete(newPackage);
-		}
-	}
-	
-	public void testDestination_yes_folderToFileInAnotherFolder() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IFolder otherFolder= superFolder.getFolder("otherfolder");
-		otherFolder.create(true, true, null);
-		IFile fileInAnotherFolder= otherFolder.getFile("f.tex");
-		fileInAnotherFolder.create(getStream("123"), true, null);
-
-		IFolder newFolder= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {folder});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= fileInAnotherFolder;
-			verifyValidDestination(ref, destination);						
-			
-			assertTrue("folder does not exist before", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("folder not moved", ! folder.exists());
-			newFolder= otherFolder.getFolder(folder.getName());
-			assertTrue("new folder does not exist after", newFolder.exists());
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(otherFolder, ref.getUpdateReferences())});
-		} finally{
-			performDummySearch();
-//			folder.delete(true, new NullProgressMonitor());	
-			safeDelete(otherFolder);
-		}
-	}
-
-	public void testDestination_yes_folderToCu() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		ICompilationUnit cu= getPackageP().createCompilationUnit("A.java", "package p;class A{void foo(){}class Inner{}}", false, new NullProgressMonitor());
-		
-		IPackageFragment newPackage= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {folder});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= cu;
-			verifyValidDestination(ref, destination);						
-
-			assertTrue("folder does not exist before", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("folder not moved", ! folder.exists());
-			newPackage= getRoot().getPackageFragment(getPackageP().getElementName() + "." + folder.getName());
-			assertTrue("new package does not exist after", newPackage.exists());		
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(cu.getParent().getResource(), ref.getUpdateReferences())});
-		} finally{
-			performDummySearch();
-			safeDelete(newPackage);
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_yes_folderToSimpleProject() throws Exception{
-		ParticipantTesting.reset();
-		IProject superFolder= RefactoringTestSetup.getProject().getProject();
-		IFolder folder= superFolder.getFolder("folder");
-		folder.create(true, true, null);
-
-		IProject simpleProject= ResourcesPlugin.getWorkspace().getRoot().getProject("mySImpleProject");
-		simpleProject.create(null);
-		simpleProject.open(null);
-		
-		IFolder newFolder= null;
-		try{
-			IJavaElement[] javaElements= {};
-			IResource[] resources= {folder};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {folder});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= simpleProject;
-			verifyValidDestination(ref, destination);
-			
-			assertTrue("folder does not exist before", folder.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("folder not moved", ! folder.exists());
-			newFolder= simpleProject.getFolder(folder.getName());
-			assertTrue("new folder does not exist after", newFolder.exists());		
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(simpleProject, ref.getUpdateReferences())});
-		} finally{
-			performDummySearch();
-			safeDelete(folder);
-			simpleProject.delete(true, true, new NullProgressMonitor());
-		}
-	}
-
-	public void testDestination_yes_sourceFolderToOtherProject() throws Exception{
-		ParticipantTesting.reset();
-		IJavaProject otherJavaProject= JavaProjectHelper.createJavaProject("other", "bin");
-		
-		IPackageFragmentRoot oldRoot= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "newSrc");
-		IPackageFragmentRoot newRoot= null;
-		try {
-			IJavaElement[] javaElements= { oldRoot };
-			IResource[] resources= {};
-			String[] handles= ParticipantTesting.createHandles(new Object[] {oldRoot, oldRoot.getResource()});
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-
-			Object destination= otherJavaProject;
-			verifyValidDestination(ref, destination);
-
-			assertTrue("folder does not exist before", oldRoot.exists());
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			assertTrue("folder not moved", ! oldRoot.exists());
-			newRoot= getSourceFolder(otherJavaProject, oldRoot.getElementName());
-			assertTrue("new folder does not exist after", newRoot.exists());		
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(otherJavaProject, ref.getUpdateReferences()),
-					new MoveArguments(otherJavaProject.getResource(), ref.getUpdateReferences())});
-		} finally {
-			performDummySearch();
-			JavaProjectHelper.delete(otherJavaProject);
-		}
-	}
-
-	public void testDestination_no_methodToItself() throws Exception{
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-			Object destination= method;
-			verifyInvalidDestination(ref, destination);
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_yes_methodToOtherType() throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IMethod method= cu.getType("A").getMethod("foo", new String[0]);
-			IJavaElement[] javaElements= { method };
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-			IType otherType= cu.getType("B");
-			Object destination= otherType;
-			verifyValidDestination(ref, destination);
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-
-			String expected= getFileContents(getOutputTestFileName(removeExtension(cu.getElementName())));
-			assertEqualLines("source differs", expected, cu.getSource());
-			ParticipantTesting.testMove(new String[] {},new MoveArguments[] {} );
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_yes_fieldToOtherType() throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IField field= cu.getType("A").getField("f");
-			IJavaElement[] javaElements= { field };
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-			IType otherType= cu.getType("B");
-			Object destination= otherType;
-			verifyValidDestination(ref, destination);
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			String expected= getFileContents(getOutputTestFileName(removeExtension(cu.getElementName())));
-			assertEqualLines("source differs", expected, cu.getSource());
-			ParticipantTesting.testMove(new String[] {},new MoveArguments[] {} );
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-
-	public void testDestination_yes_initializerToOtherType() throws Exception{
-		ParticipantTesting.reset();
-		ICompilationUnit cu= null;
-		try {
-			cu= createCUfromTestFile(getPackageP(), "A");
-			IInitializer initializer= cu.getType("A").getInitializer(1);
-			IJavaElement[] javaElements= { initializer };
-			IResource[] resources= {};
-			JavaMoveProcessor ref= verifyEnabled(resources, javaElements, createReorgQueries());
-			IType otherType= cu.getType("B");
-			Object destination= otherType;
-			verifyValidDestination(ref, destination);
-			RefactoringStatus status= performRefactoring(ref, false);
-			assertEquals(null, status);
-			
-			String expected= getFileContents(getOutputTestFileName(removeExtension(cu.getElementName())));
-			assertEqualLines("source differs", expected, cu.getSource());
-			ParticipantTesting.testMove(new String[] {},new MoveArguments[] {} );
-		} finally {
-			performDummySearch();
-			safeDelete(cu);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MultiMoveTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MultiMoveTest.java
deleted file mode 100644
index 5579944..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MultiMoveTest.java
+++ /dev/null

@@ -1,483 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaMoveProcessor;
-
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.ParticipantTesting;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.MoveArguments;
-import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
-
-
-public class MultiMoveTest extends RefactoringTest {
-
-	private static final Class clazz= MultiMoveTest.class;
-	private static final String REFACTORING_PATH= "MultiMove/";
-
-	public MultiMoveTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=47316
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	//---
-	private IPackageFragment createPackage(String name) throws Exception{
-		return getRoot().createPackageFragment(name, true, null);
-	}
-	
-	private ICompilationUnit createCu(IPackageFragment pack, String cuPath, String cuName) throws Exception{
-		return createCU(pack, cuName, getFileContents(getRefactoringPath() + cuPath));
-	}
-	
-	private void delete(IPackageFragment pack) throws Exception {
-		performDummySearch();
-		try {
-			if (pack != null && pack.exists())
-				pack.delete(true, null);
-		} catch(JavaModelException e) {
-			//ignore, we should keep going
-			e.printStackTrace();
-		}
-	}
-	
-	private void delete(IPackageFragmentRoot root) throws Exception {
-		performDummySearch();
-		try {
-			if (root != null && root.exists())
-				root.delete(IResource.FORCE, IPackageFragmentRoot.ORIGINATING_PROJECT_CLASSPATH, null);
-		} catch(JavaModelException e) {
-			//ignore, we should keep going
-			e.printStackTrace();
-		}
-	}	
-	
-	//--------
-	public void test0() throws Exception{
-		ParticipantTesting.reset();
-		IPackageFragment packP1= null;
-		IPackageFragment packP2= null;
-		try {
-			final String p1Name= "p1";
-			final String inDir= "/in/";
-			final String outDir= "/out/";
-
-			packP1= createPackage(p1Name);
-			ICompilationUnit p1A= createCu(packP1, getName() + inDir + p1Name + "/A.java", "A.java");
-			ICompilationUnit p1B= createCu(packP1, getName() + inDir + p1Name + "/B.java", "B.java");
-
-			String p2Name= "p2";
-			packP2= createPackage(p2Name);
-			ICompilationUnit p2C= createCu(packP2, getName() + inDir + p2Name + "/C.java", "C.java");
-			
-			String[] handles= ParticipantTesting.createHandles(new Object[] {
-				p1A, p1A.getTypes()[0], 
-				p1B, p1B.getTypes()[0], 
-				p1A.getResource(), p1B.getResource()});
-
-			IResource[] resources= {};
-			IJavaElement[] javaElements= {p1A, p1B};
-			JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, JavaPreferencesSettings.getCodeGenerationSettings());
-			processor.setReorgQueries(new MockReorgQueries());
-			processor.setDestination(packP2);
-			processor.setUpdateReferences(true);
-		    performDummySearch();
-			RefactoringStatus status= performRefactoring(processor, false);
-
-			//-- checks
-			assertEquals("status should be ok here", null, status);
-
-			assertEquals("p1 files", 0, packP1.getChildren().length);
-			assertEquals("p2 files", 3, packP2.getChildren().length);
-
-			String expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/A.java");
-			assertEqualLines("incorrect update of A", expectedSource, packP2.getCompilationUnit("A.java").getSource());
-
-			expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/B.java");
-			assertEqualLines("incorrect update of B", expectedSource, packP2.getCompilationUnit("B.java").getSource());
-
-			expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/C.java");
-			assertEqualLines("incorrect update of C", expectedSource, p2C.getSource());
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2.getResource(), processor.getUpdateReferences()),
-					new MoveArguments(packP2.getResource(), processor.getUpdateReferences())
-				});
-			
-		} finally {
-			delete(packP1);
-			delete(packP2);		
-		}
-	}
-
-	
-	public void test1() throws Exception{
-		ParticipantTesting.reset();
-		IPackageFragment packP1= null;
-		IPackageFragment packP2= null;
-		try {
-			final String p1Name= "p1";
-			final String inDir= "/in/";
-			final String outDir= "/out/";
-
-			packP1= createPackage(p1Name);
-			ICompilationUnit p1A= createCu(packP1, getName() + inDir + p1Name + "/A.java", "A.java");
-			ICompilationUnit p1B= createCu(packP1, getName() + inDir + p1Name + "/B.java", "B.java");
-
-			String p2Name= "p2";
-			packP2= createPackage(p2Name);
-			ICompilationUnit p2C= createCu(packP2, getName() + inDir + p2Name + "/C.java", "C.java");
-
-			String[] handles= ParticipantTesting.createHandles(new Object[] {
-				p1A, p1A.getTypes()[0], 
-				p1B, p1B.getTypes()[0], 
-				p1A.getResource(), p1B.getResource()});
-
-			IResource[] resources= {};
-			IJavaElement[] javaElements= {p1A, p1B};
-			JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, JavaPreferencesSettings.getCodeGenerationSettings());
-			processor.setReorgQueries(new MockReorgQueries());
-			processor.setDestination(packP2);
-			processor.setUpdateReferences(true);
-		    performDummySearch();
-			RefactoringStatus status= performRefactoring(processor, false);
-
-			//-- checks
-			assertEquals("status should be ok here", null, status);
-
-			assertEquals("p1 files", 0, packP1.getChildren().length);
-			assertEquals("p2 files", 3, packP2.getChildren().length);
-
-			String expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/A.java");
-			assertEqualLines("incorrect update of A", expectedSource, packP2.getCompilationUnit("A.java").getSource());
-
-			expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/B.java");
-			assertEqualLines("incorrect update of B", expectedSource, packP2.getCompilationUnit("B.java").getSource());
-
-			expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/C.java");
-			assertEqualLines("incorrect update of C", expectedSource, p2C.getSource());
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2.getResource(), processor.getUpdateReferences()),
-					new MoveArguments(packP2.getResource(), processor.getUpdateReferences())
-				});
-		} finally {
-			delete(packP1);
-			delete(packP2);
-		}		
-	}
-	
-	public void test2() throws Exception{
-		ParticipantTesting.reset();
-		IPackageFragment packP1= null;
-		IPackageFragment packP2= null;
-		try {
-			final String p1Name= "p1";
-			final String inDir= "/in/";
-			final String outDir= "/out/";
-
-			packP1= createPackage(p1Name);
-			ICompilationUnit p1A= createCu(packP1, getName() + inDir + p1Name + "/A.java", "A.java");
-			createCu(packP1, getName() + inDir + p1Name + "/B.java", "B.java");
-
-			String p2Name= "p2";
-			packP2= createPackage(p2Name);
-			ICompilationUnit p2C= createCu(packP2, getName() + inDir + p2Name + "/C.java", "C.java");
-
-			String[] handles= ParticipantTesting.createHandles(new Object[] {
-				p1A, p1A.getTypes()[0], 
-				p1A.getResource()});
-
-			IResource[] resources= {};
-			IJavaElement[] javaElements= {p1A};
-			JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, JavaPreferencesSettings.getCodeGenerationSettings());
-			processor.setReorgQueries(new MockReorgQueries());
-			processor.setDestination(packP2);
-			processor.setUpdateReferences(true);
-		    performDummySearch();
-			RefactoringStatus status= performRefactoring(processor, false);
-
-			//-- checks
-			assertEquals("status should be ok here", null, status);
-
-			assertEquals("p1 files", 1, packP1.getChildren().length);
-			assertEquals("p2 files", 2, packP2.getChildren().length);
-
-			String expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/A.java");
-			assertEqualLines("incorrect update of A", expectedSource, packP2.getCompilationUnit("A.java").getSource());
-
-			expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p1Name + "/B.java");
-			assertEqualLines("incorrect update of B", expectedSource, packP1.getCompilationUnit("B.java").getSource());
-
-			expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/C.java");
-			assertEqualLines("incorrect update of C", expectedSource, p2C.getSource());
-
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2.getResource(), processor.getUpdateReferences()),
-				});
-		} finally {
-			delete(packP1);
-			delete(packP2);	
-		}		
-	}
-
-	public void test3() throws Exception{
-		ParticipantTesting.reset();
-		IPackageFragment packP1= null;
-		IPackageFragment packP3= null;
-		IPackageFragment packP2= null;
-		try {
-			final String p1Name= "p1";
-			final String p3Name= "p3";
-			final String inDir= "/in/";
-			final String outDir= "/out/";
-
-			packP1= createPackage(p1Name);
-			packP3= createPackage(p3Name);
-			ICompilationUnit p1A= createCu(packP1, getName() + inDir + p1Name + "/Outer.java", "Outer.java");
-			createCu(packP3, getName() + inDir + p3Name + "/Test.java", "Test.java");
-
-			String p2Name= "p2";
-			packP2= createPackage(p2Name);
-
-			String[] handles= ParticipantTesting.createHandles(new Object[] {
-				p1A, p1A.getTypes()[0], 
-				p1A.getResource()});
-
-			IResource[] resources= {};
-			IJavaElement[] javaElements= {p1A};
-			JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, JavaPreferencesSettings.getCodeGenerationSettings());
-			processor.setReorgQueries(new MockReorgQueries());
-			processor.setDestination(packP2);
-			processor.setUpdateReferences(true);
-		    performDummySearch();
-			RefactoringStatus status= performRefactoring(processor, false);
-
-			//-- checks
-			assertEquals("status should be ok here", null, status);
-
-			assertEquals("p1 files", 0, packP1.getChildren().length);
-			assertEquals("p2 files", 1, packP2.getChildren().length);
-			assertEquals("p1 files", 1, packP3.getChildren().length);
-
-			String expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p2Name + "/Outer.java");
-			assertEqualLines("incorrect update of Outer", expectedSource, packP2.getCompilationUnit("Outer.java").getSource());
-
-			expectedSource= getFileContents(getRefactoringPath() + getName() + outDir + p3Name + "/Test.java");
-			assertEqualLines("incorrect update of Test", expectedSource, packP3.getCompilationUnit("Test.java").getSource());
-			ParticipantTesting.testMove(
-				handles,
-				new MoveArguments[] {
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2, processor.getUpdateReferences()),
-					new MoveArguments(packP2.getResource(), processor.getUpdateReferences()),
-				});
-
-		} finally {
-			delete(packP1);
-			delete(packP2);
-			delete(packP3);		
-		}
-	}
-	
-	public void testPackageMoveParticipants() throws Exception {
-		ParticipantTesting.reset();
-		IPackageFragmentRoot r1= null;
-		IPackageFragmentRoot r2= null;
-		try {
-			r1= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src1");
-			r2= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-			IPackageFragment p1= r1.createPackageFragment("p1", true, null);
-			ICompilationUnit c1= p1.createCompilationUnit("A.java", "public class A {}", true, null);
-			ICompilationUnit c2= p1.createCompilationUnit("B.java", "public class B {}", true, null);
-			
-			String[] moveHandes= ParticipantTesting.createHandles(new Object[] {
-				p1, c1.getResource(), c2.getResource() });
-			String[] deleteHandles= ParticipantTesting.createHandles(new Object[] {p1.getResource()});
-
-			IResource[] resources= {};
-			IJavaElement[] javaElements= {p1};
-			JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, JavaPreferencesSettings.getCodeGenerationSettings());
-			processor.setReorgQueries(new MockReorgQueries());
-			processor.setDestination(r2);
-		    performDummySearch();
-			RefactoringStatus status= performRefactoring(processor, false);
-			
-			//-- checks
-			assertEquals("status should be ok here", null, status);
-
-			IPath path= r2.getResource().getFullPath();
-			path= path.append(p1.getElementName().replace('.', '/'));
-			IFolder target= ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
-			String[] createHandles= ParticipantTesting.createHandles(new Object[] { target });
-			
-			ParticipantTesting.testDelete(deleteHandles);
-			ParticipantTesting.testCreate(createHandles);
-			
-			ParticipantTesting.testMove(
-				moveHandes,
-				new MoveArguments[] {
-					new MoveArguments(r2, processor.getUpdateReferences()),
-					new MoveArguments(target, processor.getUpdateReferences()),
-					new MoveArguments(target, processor.getUpdateReferences()),
-				});
-		} finally {
-			delete(r1);
-			delete(r2);
-		}
-	}
-	
-	public void testPackageMoveParticipants2() throws Exception {
-		ParticipantTesting.reset();
-		IPackageFragmentRoot r1= null;
-		IPackageFragmentRoot r2= null;
-		try {
-			r1= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src1");
-			r2= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-			IPackageFragment p1= r1.createPackageFragment("p1", true, null);
-			r1.createPackageFragment("p1.p2", true, null);
-			ICompilationUnit c1= p1.createCompilationUnit("A.java", "public class A {}", true, null);
-			IFile file= ((IContainer)p1.getResource()).getFile(new Path("Z.txt"));
-			file.create(getStream("123"), true, null);
-			
-			String[] moveHandles= ParticipantTesting.createHandles(new Object[] {
-				p1, c1.getResource(), file });
-
-			IResource[] resources= {};
-			IJavaElement[] javaElements= {p1};
-			JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, JavaPreferencesSettings.getCodeGenerationSettings());
-			processor.setReorgQueries(new MockReorgQueries());
-			processor.setDestination(r2);
-		    performDummySearch();
-			RefactoringStatus status= performRefactoring(processor, false);
-			
-			//-- checks
-			assertEquals("status should be ok here", null, status);
-
-			IPath path= r2.getResource().getFullPath();
-			path= path.append(p1.getElementName().replace('.', '/'));
-			IFolder target= ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
-			String[] createHandles= ParticipantTesting.createHandles(new Object[] {target});
-			
-			ParticipantTesting.testCreate(createHandles);
-			
-			ParticipantTesting.testMove(
-				moveHandles,
-				new MoveArguments[] {
-					new MoveArguments(r2, processor.getUpdateReferences()),
-					new MoveArguments(target, processor.getUpdateReferences()),
-					new MoveArguments(target, processor.getUpdateReferences()),
-				});
-		} finally {
-			delete(r1);
-			delete(r2);
-		}
-	}
-	
-	public void testPackageMoveParticipants3() throws Exception {
-		ParticipantTesting.reset();
-		IPackageFragmentRoot r1= null;
-		IPackageFragmentRoot r2= null;
-		try {
-			r1= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src1");
-			r2= JavaProjectHelper.addSourceContainer(RefactoringTestSetup.getProject(), "src2");
-			IPackageFragment p1= r1.createPackageFragment("p1", true, null);
-			r2.createPackageFragment("p1", true, null);
-			ICompilationUnit c1= p1.createCompilationUnit("A.java", "public class A {}", true, null);
-			
-			String[] moveHandles= ParticipantTesting.createHandles(new Object[] {
-				p1, c1.getResource()}); 
-			String[] deleteHandles= ParticipantTesting.createHandles(new Object[] {p1.getResource()});
-
-			IResource[] resources= {};
-			IJavaElement[] javaElements= {p1};
-			JavaMoveProcessor processor= JavaMoveProcessor.create(resources, javaElements, JavaPreferencesSettings.getCodeGenerationSettings());
-			processor.setReorgQueries(new MockReorgQueries());
-			processor.setDestination(r2);
-		    performDummySearch();
-			RefactoringStatus status= performRefactoring(processor, false);
-			
-			//-- checks
-			assertEquals("status should be ok here", null, status);
-
-			IPath path= r2.getResource().getFullPath();
-			path= path.append(p1.getElementName().replace('.', '/'));
-			IFolder target= ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
-			
-			ParticipantTesting.testDelete(deleteHandles);
-			
-			ParticipantTesting.testMove(
-				moveHandles,
-				new MoveArguments[] {
-					new MoveArguments(r2, processor.getUpdateReferences()),
-					new MoveArguments(target, processor.getUpdateReferences()),
-				});
-		} finally {
-			delete(r1);
-			delete(r2);
-		}
-	}
-	
-	private RefactoringStatus performRefactoring(JavaMoveProcessor processor, boolean providesUndo) throws Exception {
-		return performRefactoring(new MoveRefactoring(processor), providesUndo);
-	}	
-}
-

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/PasteActionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/PasteActionTest.java
deleted file mode 100644
index 432fa74..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/PasteActionTest.java
+++ /dev/null

@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportContainer;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-import org.eclipse.jdt.ui.tests.refactoring.infra.MockClipboard;
-import org.eclipse.jdt.ui.tests.refactoring.infra.MockWorkbenchSite;
-
-import org.eclipse.jdt.internal.corext.refactoring.TypedSource;
-import org.eclipse.jdt.internal.ui.refactoring.reorg.CopyToClipboardAction;
-import org.eclipse.jdt.internal.ui.refactoring.reorg.PasteAction;
-import org.eclipse.jdt.internal.ui.refactoring.reorg.TypedSourceTransfer;
-
-
-public class PasteActionTest extends RefactoringTest{
-
-	private Clipboard fClipboard;
-	private static final Class clazz= PasteActionTest.class;
-	private static final String REFACTORING_PATH= "Paste/";
-
-	public PasteActionTest(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-
-	protected String getRefactoringPath() {
-		return REFACTORING_PATH;
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		fClipboard= new MockClipboard(Display.getDefault());
-	}
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		fClipboard.dispose();
-	}
-
-	private static Object[] merge(Object[] array1, Object[] array2) {
-		Set elements= new HashSet(array1.length + array2.length);
-		elements.addAll(Arrays.asList(array1));
-		elements.addAll(Arrays.asList(array2));
-		return elements.toArray();
-	}
-	
-	private PasteAction verifyEnabled(IResource[] copySelectedResources, IJavaElement[] copySelectedJavaElements, IResource[] pasteSelectedResources, IJavaElement[] pasteSelectedJavaElements) throws JavaModelException {
-		PasteAction pasteAction= new PasteAction(new MockWorkbenchSite(merge(pasteSelectedResources, pasteSelectedJavaElements)), fClipboard);
-		CopyToClipboardAction copyToClipboardAction= new CopyToClipboardAction(new MockWorkbenchSite(merge(copySelectedResources, copySelectedJavaElements)), fClipboard, pasteAction);
-		copyToClipboardAction.setAutoRepeatOnFailure(true);
-		copyToClipboardAction.update(copyToClipboardAction.getSelection());
-		assertTrue("copy not enabled", copyToClipboardAction.isEnabled());
-		copyToClipboardAction.run();
-		
-		pasteAction.update(pasteAction.getSelection());
-		assertTrue("paste should be enabled", pasteAction.isEnabled());
-		return pasteAction;
-	}
-
-	public void testEnabled_javaProject() throws Exception {
-		IJavaElement[] javaElements= {RefactoringTestSetup.getProject()};
-		IResource[] resources= {};
-		verifyEnabled(resources, javaElements, new IResource[0], new IJavaElement[0]);
-	}
-
-	public void testEnabled_project() throws Exception {
-		IJavaElement[] javaElements= {};
-		IResource[] resources= {RefactoringTestSetup.getProject().getProject()};
-		verifyEnabled(resources, javaElements, new IResource[0], new IJavaElement[0]);
-	}
-
-	private void compareContents(String cuName) throws JavaModelException, IOException {
-		assertEqualLines(cuName, getFileContents(getOutputTestFileName(cuName)), getPackageP().getCompilationUnit(cuName + ".java").getSource());
-	}
-	
-	private void delete(ICompilationUnit cu) throws Exception {
-		try {
-			performDummySearch();
-			cu.delete(true, new NullProgressMonitor());
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			//ingore and keep going
-		}
-	}
-
-	public void test0() throws Exception{
-		if (true) {
-			printTestDisabledMessage("not implemented yet");
-			return;
-		}
-
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-		
-		try {
-			IType typeA= cuA.getType("A");
-			IType typeB= cuB.getType("B");
-	
-			assertTrue("A does not exist", typeA.exists());
-			assertTrue("B does not exist", typeB.exists());
-	
-			IJavaElement[] copyJavaElements= {typeA};
-			IResource[] copyResources= {};
-			IJavaElement[] pasteJavaElements= {typeB};
-			IResource[] pasteResources= {};
-			PasteAction paste= verifyEnabled(copyResources, copyJavaElements, pasteResources, pasteJavaElements);
-			paste.run((IStructuredSelection)paste.getSelection());
-			compareContents("A");
-			compareContents("B");
-		} finally{
-			delete(cuA);
-			delete(cuB);
-		}
-	}
-
-	public void test2() throws Exception{
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-		
-		try {
-			IField fieldY= cuA.getType("A").getField("y");
-			IType typeB= cuB.getType("B");
-	
-			assertTrue("y does not exist", fieldY.exists());
-			assertTrue("B does not exist", typeB.exists());
-	
-			IJavaElement[] copyJavaElements= {fieldY};
-			IResource[] copyResources= {};
-			IJavaElement[] pasteJavaElements= {typeB};
-			IResource[] pasteResources= {};
-			PasteAction paste= verifyEnabled(copyResources, copyJavaElements, pasteResources, pasteJavaElements);
-			paste.run((IStructuredSelection)paste.getSelection());
-			compareContents("A");
-			compareContents("B");
-		} finally{
-			delete(cuA);
-			delete(cuB);
-		}
-	}
-
-	public void test3() throws Exception{
-//		printTestDisabledMessage("test for bug#19007");
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
-		
-		try {
-			IJavaElement elem0= cuA.getImport("java.lang.*");
-			IImportContainer importContainer= cuB.getImportContainer();
-	
-			assertTrue("y does not exist", elem0.exists());
-			assertTrue("B does not exist", importContainer.exists());
-	
-			IJavaElement[] copyJavaElements= {elem0};
-			IResource[] copyResources= {};
-			IJavaElement[] pasteJavaElements= {importContainer};
-			IResource[] pasteResources= {};
-			PasteAction paste= verifyEnabled(copyResources, copyJavaElements, pasteResources, pasteJavaElements);
-			paste.run((IStructuredSelection)paste.getSelection());
-			compareContents("A");
-			compareContents("B");
-		} finally{
-			delete(cuA);
-			delete(cuB);
-		}
-	}
-
-	public void test4() throws Exception{
-//		printTestDisabledMessage("test for bug 20151");
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		try {
-			IJavaElement elem0= cuA.getType("A").getMethod("f", new String[0]);
-			IMethod method= cuA.getType("A").getMethod("f1", new String[0]);
-	
-			assertTrue("y does not exist", elem0.exists());
-			assertTrue("B does not exist", method.exists());
-	
-			IJavaElement[] copyJavaElements= {elem0};
-			IResource[] copyResources= {};
-			IJavaElement[] pasteJavaElements= {method};
-			IResource[] pasteResources= {};
-			PasteAction paste= verifyEnabled(copyResources, copyJavaElements, pasteResources, pasteJavaElements);
-			paste.run((IStructuredSelection)paste.getSelection());
-			compareContents("A");
-		} finally{
-			delete(cuA);
-		}
-	}
-
-	private void setClipboardContents(TypedSource[] typedSources, int repeat) {
-		final int maxRepeat= 10;
-		try {
-			fClipboard.setContents(new Object[] {typedSources}, new Transfer[] {TypedSourceTransfer.getInstance()});
-		} catch (SWTError e) {
-			if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD || repeat >= maxRepeat)
-				throw e;
-			setClipboardContents(typedSources, repeat+1);
-		}
-	}
-	
-	private void copyAndPasteTypedSources(IJavaElement[] elemsForClipboard, IJavaElement[] pasteSelectedJavaElements, boolean pasteEnabled) throws CoreException {
-		setClipboardContents(TypedSource.createTypedSources(elemsForClipboard), 0);
-		PasteAction pasteAction= new PasteAction(new MockWorkbenchSite(pasteSelectedJavaElements), fClipboard);
-		pasteAction.update(pasteAction.getSelection());
-		assertEquals("action enablement", pasteEnabled, pasteAction.isEnabled());
-		if (pasteEnabled)
-			pasteAction.run((IStructuredSelection)pasteAction.getSelection());
-	}
-
-	public void testPastingTypedResources0() throws Exception {
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		try {
-			IJavaElement methodM= cuA.getType("A").getMethod("m", new String[0]);
-			IJavaElement[] elemsForClipboard= {methodM};
-			IJavaElement[] pasteSelectedJavaElements= {methodM};
-			boolean enabled= true;
-			copyAndPasteTypedSources(elemsForClipboard, pasteSelectedJavaElements, enabled);
-			compareContents("A");
-		} finally{
-			delete(cuA);
-		}
-	}
-
-	public void testPastingTypedResources1() throws Exception {
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		try {
-			IType typeA= cuA.getType("A");
-			IJavaElement fieldF= typeA.getField("f");
-			IJavaElement[] elemsForClipboard= {fieldF};
-			IJavaElement[] pasteSelectedJavaElements= {typeA};
-			boolean enabled= true;
-			copyAndPasteTypedSources(elemsForClipboard, pasteSelectedJavaElements, enabled);
-			compareContents("A");
-		} finally{
-			delete(cuA);
-		}
-	}
-
-	public void testPastingTypedResources2() throws Exception {
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		try {
-			IType typeA= cuA.getType("A");
-			IJavaElement fieldF= typeA.getField("f");
-			IJavaElement[] elemsForClipboard= {fieldF};
-			IJavaElement[] pasteSelectedJavaElements= {typeA};
-			boolean enabled= true;
-			copyAndPasteTypedSources(elemsForClipboard, pasteSelectedJavaElements, enabled);
-			compareContents("A");
-		} finally{
-			delete(cuA);
-		}
-	}
-
-	public void testPastingTypedResources3() throws Exception {
-		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
-		try {
-			IType typeA= cuA.getType("A");
-			IJavaElement fieldF= typeA.getField("f");
-			IJavaElement fieldG= typeA.getField("g");
-			IJavaElement[] elemsForClipboard= {fieldF, fieldG};
-			IJavaElement[] pasteSelectedJavaElements= {typeA};
-			boolean enabled= true;
-			copyAndPasteTypedSources(elemsForClipboard, pasteSelectedJavaElements, enabled);
-			compareContents("A");
-		} finally{
-			delete(cuA);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/PasteResourcesFromClipboardActionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/PasteResourcesFromClipboardActionTest.java
deleted file mode 100644
index 72a04f0..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/PasteResourcesFromClipboardActionTest.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.reorg;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.ISourceManipulation;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.ui.actions.SelectionDispatchAction;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-import org.eclipse.jdt.ui.tests.refactoring.infra.MockClipboard;
-import org.eclipse.jdt.ui.tests.refactoring.infra.MockWorkbenchSite;
-
-import org.eclipse.jdt.internal.ui.refactoring.reorg.CopyToClipboardAction;
-import org.eclipse.jdt.internal.ui.refactoring.reorg.PasteAction;
-
-public class PasteResourcesFromClipboardActionTest extends RefactoringTest{
-
-	private static final Class clazz= PasteResourcesFromClipboardActionTest.class;
-
-	private ICompilationUnit fCuA;
-	private ICompilationUnit fCuB;
-	
-	private IPackageFragment fPackageQ;
-	private IPackageFragment fPackageQ_R;
-	private static final String CU_A_NAME= "A";
-	private static final String CU_B_NAME= "B";
-	private IFile faTxt;
-	private IJavaProject fSimpleProject;
-	private IJavaProject fAnotherProject;
-	
-	private Clipboard fClipboard;
-	
-	public PasteResourcesFromClipboardActionTest(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test test) {
-		return new RefactoringTestSetup(test);
-	}
-
-	private IFile createFile(IFolder folder, String fileName) throws Exception {
-		IFile file= folder.getFile(fileName);
-		file.create(getStream("aa"), true, null);	
-		return file;
-	}
-	
-	private static IJavaProject createProject(String name, String srcFolderName) throws Exception{
-		IJavaProject project= JavaProjectHelper.createJavaProject(name, "bin");
-		JavaProjectHelper.addRTJar(project);
-		if (srcFolderName != null)
-			JavaProjectHelper.addSourceContainer(project, srcFolderName);
-			
-		return project;	
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fClipboard= new MockClipboard(Display.getDefault());
-		fCuA= createCU(getPackageP(), CU_A_NAME + ".java", "package p; class A{}");
-		fCuB= createCU(getPackageP(), CU_B_NAME + ".java", "package p; class B{}");
-		
-		fPackageQ= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment("q", true, null);
-		fPackageQ_R= RefactoringTestSetup.getDefaultSourceFolder().createPackageFragment("q.r", true, null);
-		
-		faTxt= createFile((IFolder)getPackageP().getUnderlyingResource(), "a.txt");
-		
-		int count= 0;
-		boolean success= false;
-		while (count < 10 && ! success){
-			success= clearClipboard();
-			count++;
-		}
-		if (! success)
-			return;
-		
-		fSimpleProject= createProject("SimpleProject", null);
-		fAnotherProject= createProject("AnotherProject", "src");
-		
-		assertTrue("A.java does not exist", fCuA.exists());
-		assertTrue("B.java does not exist", fCuB.exists());
-		assertTrue("q does not exist", fPackageQ.exists());
-		assertTrue("q.r does not exist", fPackageQ_R.exists());
-		assertTrue("a.txt does not exist", faTxt.exists());
-		assertTrue("project SP does not exist", fSimpleProject.exists());
-		assertTrue("project AP does not exist", fAnotherProject.exists());
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		fClipboard.dispose();
-		performDummySearch();
-		delete(fCuA);
-		delete(fCuB);
-		delete(fPackageQ_R);
-		delete(fPackageQ);
-		delete(faTxt);
-		delete(fSimpleProject);
-		delete(fAnotherProject);
-	}
-	
-	/**
-	 * @return true iff successful
-	 */
-	private boolean clearClipboard() {
-		try{
-			fClipboard.setContents(new Object[0], new Transfer[0]);
-			return true;
-		} catch (SWTError e){
-			if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD)
-				throw e;
-			return false;
-		}	
-	}
-
-	private static void delete(ISourceManipulation element) {
-		try {
-			if (element != null && ((IJavaElement)element).exists())
-				element.delete(false, null);
-		} catch(JavaModelException e) {
-			//ignore, we must keep going
-		}		
-	}
-	private static void delete(IFile element) {
-		try {
-			if (element != null && element.exists())
-				element.delete(true, false, null);
-		} catch(CoreException e) {
-			//ignore, we must keep going
-		}
-	}
-	
-	private static void delete(IJavaProject project){
-		try {
-			if (project != null && project.exists()){
-				project.setRawClasspath(new IClasspathEntry[0], project.getProject().getFullPath(), null);
-				project.getProject().delete(true, true, null);
-			}	
-		} catch(CoreException e) {
-			//ignore, we must keep going
-		}
-	}
-
-	private void doCopy(Object[] copySelection) {
-		if (copySelection == null)
-			return; 
-			
-		SelectionDispatchAction pasteAction= new PasteAction(new MockWorkbenchSite(copySelection), fClipboard);	
-		CopyToClipboardAction copyAction= new CopyToClipboardAction(new MockWorkbenchSite(copySelection), fClipboard, pasteAction);
-		copyAction.update(copyAction.getSelection());
-		copyAction.setAutoRepeatOnFailure(true);
-		assertTrue("copy not enabled", copyAction.isEnabled());
-		copyAction.run();
-	}
-
-	private void checkEnabled(Object[] copySelection, Object[] pasteSelection) {
-		doCopy(copySelection);		
-		SelectionDispatchAction pasteAction= new PasteAction(new MockWorkbenchSite(pasteSelection), fClipboard);
-		pasteAction.update(pasteAction.getSelection());
-		assertTrue("paste incorrectly disabled", pasteAction.isEnabled());
-	}
-	
-	public void testProject() throws Exception{
-		checkEnabled(new Object[]{RefactoringTestSetup.getProject()}, new Object[]{getPackageP()});
-		checkEnabled(new Object[]{RefactoringTestSetup.getProject()}, new Object[]{fPackageQ});
-		checkEnabled(new Object[]{RefactoringTestSetup.getProject()}, new Object[]{fSimpleProject});
-		checkEnabled(new Object[]{RefactoringTestSetup.getProject()}, new Object[]{fAnotherProject});
-		checkEnabled(new Object[]{RefactoringTestSetup.getProject()}, new Object[]{RefactoringTestSetup.getProject()});
-		checkEnabled(new Object[]{RefactoringTestSetup.getProject()}, new Object[]{getRoot()});
-		checkEnabled(new Object[]{RefactoringTestSetup.getProject()}, new Object[]{fCuA});
-		checkEnabled(new Object[]{RefactoringTestSetup.getProject()}, new Object[]{faTxt});
-	}
-	
-	public void testCu() throws Exception{
-		checkEnabled(new Object[]{fCuA}, new Object[]{getPackageP()});
-		checkEnabled(new Object[]{fCuA}, new Object[]{fPackageQ});
-		checkEnabled(new Object[]{fCuA}, new Object[]{fSimpleProject});
-		checkEnabled(new Object[]{fCuA}, new Object[]{fAnotherProject});
-		checkEnabled(new Object[]{fCuA}, new Object[]{RefactoringTestSetup.getProject()});
-		checkEnabled(new Object[]{fCuA}, new Object[]{getRoot()});
-		checkEnabled(new Object[]{fCuA}, new Object[]{fCuA});		
-		checkEnabled(new Object[]{fCuA}, new Object[]{faTxt});
-	}
-	
-	public void testFile() throws Exception{
-		checkEnabled(new Object[]{faTxt}, new Object[]{getPackageP()});
-		checkEnabled(new Object[]{faTxt}, new Object[]{fPackageQ});
-		checkEnabled(new Object[]{faTxt}, new Object[]{fSimpleProject});
-		checkEnabled(new Object[]{faTxt}, new Object[]{fAnotherProject});
-		checkEnabled(new Object[]{faTxt}, new Object[]{RefactoringTestSetup.getProject()});
-		checkEnabled(new Object[]{faTxt}, new Object[]{getRoot()});
-		checkEnabled(new Object[]{faTxt}, new Object[]{fCuA});
-		checkEnabled(new Object[]{faTxt}, new Object[]{faTxt});
-	}
-	
-	public void testPackage() throws Exception{
-		checkEnabled(new Object[]{getPackageP()}, new Object[]{fSimpleProject});
-		checkEnabled(new Object[]{getPackageP()}, new Object[]{getRoot()});
-		checkEnabled(new Object[]{getPackageP()}, new Object[]{getPackageP()});
-		checkEnabled(new Object[]{getPackageP()}, new Object[]{fPackageQ});
-		
-		checkEnabled(new Object[]{getPackageP()}, new Object[]{fAnotherProject});
-		checkEnabled(new Object[]{getPackageP()}, new Object[]{RefactoringTestSetup.getProject()});		
-		checkEnabled(new Object[]{getPackageP()}, new Object[]{fCuA});
-		checkEnabled(new Object[]{getPackageP()}, new Object[]{faTxt});
-	}
-	
-	public void testRoot() throws Exception {		
-		checkEnabled(new Object[]{getRoot()}, new Object[]{fAnotherProject});
-		checkEnabled(new Object[]{getRoot()}, new Object[]{RefactoringTestSetup.getProject()});		
-		
-		checkEnabled(new Object[]{getRoot()}, new Object[]{getRoot()});
-		checkEnabled(new Object[]{getRoot()}, new Object[]{fSimpleProject});
-		checkEnabled(new Object[]{getRoot()}, new Object[]{getPackageP()});
-		checkEnabled(new Object[]{getRoot()}, new Object[]{fPackageQ});
-		checkEnabled(new Object[]{getRoot()}, new Object[]{fCuA});
-		checkEnabled(new Object[]{getRoot()}, new Object[]{faTxt});
-	}
-	
-
-	public void testEnabled2() throws Exception{
-		checkEnabled(new Object[]{fCuA, fCuB}, new Object[]{getPackageP()});
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/typeconstraints/TypeConstraintTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/typeconstraints/TypeConstraintTests.java
deleted file mode 100644
index 19e99dd..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/typeconstraints/TypeConstraintTests.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.typeconstraints;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ASTCreator;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ConstraintCollector;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ConstraintOperator;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ConstraintVariable;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ConstraintVariableFactory;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.FullConstraintCreator;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.ITypeConstraint;
-import org.eclipse.jdt.internal.corext.refactoring.typeconstraints.TypeConstraintFactory;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTestSetup;
-import org.eclipse.jdt.ui.tests.refactoring.RefactoringTest;
-
-public class TypeConstraintTests extends RefactoringTest {
-
-	private static final Class clazz= TypeConstraintTests.class;
-	private static final String PATH= "TypeConstraints/";
-
-	public TypeConstraintTests(String name) {
-		super(name);
-	}
-
-	protected String getRefactoringPath() {
-		return PATH;
-	}
-
-	public static Test suite() {
-		return new RefactoringTestSetup(new TestSuite(clazz));
-	}
-	
-	public static Test setUpTest(Test someTest) {
-		return new RefactoringTestSetup(someTest);
-	}
-	
-	private String getSimpleTestFileName(){
-		return "A_" + getName() + ".java"; 
-	}
-	
-	private String getTestFileName(){
-		return TEST_PATH_PREFIX + getRefactoringPath() + getSimpleTestFileName();
-	}
-
-	private ICompilationUnit createCUfromTestFile(IPackageFragment pack) throws Exception {
-		return createCU(pack, getSimpleTestFileName(), getFileContents(getTestFileName()));
-	}
-
-	private CompilationUnit getCuNode() throws Exception {
-		ICompilationUnit cu= createCUfromTestFile(getPackageP());
-		return ASTCreator.createAST(cu, null);
-	}
-
-	private void numberHelper(int number) throws Exception {
-		CompilationUnit cuNode= getCuNode();
-		ConstraintCollector collector= getCollector();
-		cuNode.accept(collector);
-		ITypeConstraint[] constraints= collector.getConstraints();
-		assertEquals(Arrays.asList(constraints).toString(), number, constraints.length);
-	}
-
-	public void testNumber0() throws Exception{
-		numberHelper(2);
-	}
-
-	public void testNumber1() throws Exception{
-		numberHelper(3);
-	}
-
-	public void testNumber2() throws Exception{
-		numberHelper(10);
-	}
-
-	private ConstraintCollector getCollector() {
-		TypeConstraintFactory factory = new TypeConstraintFactory(){
-			public boolean filter(ConstraintVariable v1, ConstraintVariable v2, ConstraintOperator o){
-				return false;
-			}
-		};
-		ConstraintCollector collector= new ConstraintCollector(new FullConstraintCreator(new ConstraintVariableFactory(), factory));
-		return collector;
-	}
-	
-	private static List allToStrings(Object[] elements) {
-		String[] strings= new String[elements.length];
-		for (int i= 0; i < elements.length; i++) {
-			strings[i]= elements[i].toString();
-		}
-		return new ArrayList(Arrays.asList(strings));//want to be able to remove stuff from it
-	}
-	
-	private void testConstraints(String[] constraintStrings) throws Exception{
-		CompilationUnit cuNode= getCuNode();
-		ConstraintCollector collector= getCollector();
-		cuNode.accept(collector);
-		ITypeConstraint[] constraints= collector.getConstraints();
-		
-		List externals= allToStrings(constraints);
-		assertEquals("length", constraintStrings.length, constraints.length);
-		for (int i= 0; i < constraintStrings.length; i++) {
-			assertTrue("missing constraint:" + constraintStrings[i], externals.remove(constraintStrings[i]));
-		}
-	}
-	
-	public void testConstraints0() throws Exception{
-		String[] strings= {"[null] <= [a0]", "[a0] <= [a1]", "[a0] =^= A", "[a1] =^= A", "Decl(A:f()) =^= p.A"};
-		testConstraints(strings);
-	}
-
-	public void testConstraints1() throws Exception{
-		String[] strings= {"[null] <= [a0]", "[a0] == [a1]", "[a0] =^= A", "[a1] =^= A", "Decl(A:a0) =^= p.A", "Decl(A:a1) =^= p.A"};
-		testConstraints(strings);
-	}
-
-	public void testConstraints2() throws Exception{
-		String[] strings= {"[null] <= [a0]", "[(A)a0] =^= A", "[(A)a0] <= [a1]", "[a0] <= [(A)a0] or [(A)a0] <= [a0]", "[a0] =^= A", "[a1] =^= A", "Decl(A:f()) =^= p.A"};
-		testConstraints(strings);
-	}
-
-	public void testConstraints3() throws Exception{
-		String[] strings= {"[null] <= [a]", "[null] <= [b]", "[a] == [b]", "[a] =^= A", "[b] =^= A", "Decl(A:f()) =^= p.A"};
-		testConstraints(strings);
-	}
-
-	public void testConstraints4() throws Exception{
-		String[] strings= {"[as0] =^= A[]", "[a0] <= A", "[{a0}] <= [as0]", "Decl(A:f()) =^= p.A", "[null] <= [a0]", "[a0] =^= A"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints5() throws Exception{
-		String[] strings= {"[as0] =^= A[]", "Decl(A:f()) =^= p.A", "[a0] <= A", "[a0] =^= A", "[null] <= [a0]", "[new A[]{a0}] <= [as0]"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints6() throws Exception{
-		String[] strings= {"Decl(A:f()) =^= p.A", "Decl(A:A(A)) =^= p.A", "[new A(a0)] =^= p.A", "[a0] <= [Parameter(0,A:A(A))]", "[a1] =^= A", "[a] =^= A", "[a0] =^= A", "[null] <= [a0]", "[new A(a0)] <= [a1]", "[Parameter(0,A:A(A))] =^= [a]"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints7() throws Exception{
-		String[] strings= {"Decl(A:A()) =^= p.A", "Decl(A:A(A)) =^= p.A", "[null] <= [Parameter(0,A:A(A))]", "[Parameter(0,A:A(A))] =^= [a]", "[a] =^= A"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints8() throws Exception{
-		String[] strings= {"Decl(A:x) =^= p.A", "Decl(A:f()) =^= p.A", "[x] =^= java.lang.Object", "Decl(A:aField) =^= p.A", "[this] <= [x]", "[aField] =^= A", "[x] =^= Object", "[this] =^= p.A", "[aField] <= Decl(A:x)"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints9() throws Exception{
-		String[] strings= {"Decl(A:f()) =^= p.A", "[a] =^= A", "[x] =^= boolean", "[a instanceof A] <= [x]", "[null] <= [a]", "[a] <= A or A <= [a]"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints10() throws Exception{
-		String[] strings= {"[null] <= [A:f1()]_returnType", "Decl(A:f1()) =^= p.A", "[A:f1()]_returnType =^= A[]"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints11() throws Exception{
-		String[] strings= {"[null] <= [A:f(A, Object)]_returnType", "[Parameter(1,B:f(A, Object))] =^= [a4]", 
-							"[B:f(A, Object)]_returnType =^= A", "Decl(B:f(A, Object)) < Decl(A:f(A, Object))",
-							"[Parameter(1,A:f(A, Object))] == [Parameter(1,B:f(A, Object))]", 
-							"[Parameter(0,A:f(A, Object))] == [Parameter(0,B:f(A, Object))]", 
-							"[A:f(A, Object)]_returnType == [B:f(A, Object)]_returnType", 
-							"[Parameter(0,B:f(A, Object))] =^= [a3]", 
-							"[Parameter(0,A:f(A, Object))] =^= [a0]", "Decl(A:f(A, Object)) =^= p.A", 
-							"[null] <= [B:f(A, Object)]_returnType", "[Parameter(1,A:f(A, Object))] =^= [a1]", 
-							"[A:f(A, Object)]_returnType =^= A", "Decl(B:f(A, Object)) =^= p.B",
-							"[a3] =^= A", "[a0] =^= A", "[a1] =^= Object", "[a4] =^= Object"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints12() throws Exception{
-		String[] strings= { "Decl(B:f(A, Object)) =^= p.B", "[Parameter(1,B:f(A, Object))] =^= [a4]", "[B:f(A, Object)]_returnType =^= A", "[null] <= [B:f(A, Object)]_returnType", "[A:f(A, Object)]_returnType =^= A", "[Parameter(1,A:f(A, Object))] =^= [a1]", "Decl(A:f(A, Object)) =^= p.A", "[Parameter(0,B:f(A, Object))] =^= [a3]", "[null] <= [A:f(A, Object)]_returnType", "[Parameter(0,A:f(A, Object))] =^= [a0]", "[a3] =^= A", "[a0] =^= A", "[a1] =^= Object", "[a4] =^= Object" };
-		testConstraints(strings);
-	}	
-
-	public void testConstraints13() throws Exception{
-		String[] strings= {"Decl(B:f(A, Object)) =^= p.B", "[Parameter(1,B:f(A, Object))] =^= [a4]", "[B:f(A, Object)]_returnType =^= A", "[null] <= [B:f(A, Object)]_returnType", "[A:f(A, Object)]_returnType =^= A", "[Parameter(1,A:f(A, Object))] =^= [a1]", "Decl(A:f(A, Object)) =^= p.A", "[Parameter(0,B:f(A, Object))] =^= [a3]", "[null] <= [A:f(A, Object)]_returnType", "[Parameter(0,A:f(A, Object))] =^= [a0]", "[a3] =^= A", "[a0] =^= A", "[a1] =^= Object", "[a4] =^= Object"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints14() throws Exception{
-		String[] strings= {"[A:f(A)]_returnType == [B:f(A)]_returnType", "[Parameter(0,A:f(A))] == [Parameter(0,B:f(A))]", "[B:f(A)]_returnType =^= A", "Decl(B:f(A)) < Decl(A:f(A))", "[A:f(A)]_returnType =^= A", "Decl(B:f(A)) < Decl(I:f(A))", "[null] <= [A:f(A)]_returnType", "[Parameter(0,A:f(A))] =^= [a0]", "[I:f(A)]_returnType =^= A", "Decl(A:f(A)) =^= p.A", "[ax] =^= B", "[Parameter(0,B:f(A))] =^= [a3]", "[null] <= [B:f(A)]_returnType", "[a3] <= [Parameter(0,B:f(A))]", "[ax.f(a3)] =^= [B:f(A)]_returnType", "[ax] <= Decl(I:f(A)) or [ax] <= Decl(A:f(A))", "Decl(B:f(A)) =^= p.B", "[I:f(A)]_returnType == [B:f(A)]_returnType", "[Parameter(0,I:f(A))] == [Parameter(0,B:f(A))]", "[null] <= [ax]", "[Parameter(0,I:f(A))] =^= [ai]", "Decl(I:f(A)) =^= p.I", "[a3] =^= A", "[a0] =^= A", "[ai] =^= A"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints15() throws Exception{
-		String[] strings= {"[Parameter(0,A:f(A))] =^= [a0]", "[I:f(A)]_returnType == [B:f(A)]_returnType", "[Parameter(0,I:f(A))] == [Parameter(0,B:f(A))]", "[null] <= [A:f(A)]_returnType", "[A:f(A)]_returnType == [B:f(A)]_returnType", "[Parameter(0,A:f(A))] == [Parameter(0,B:f(A))]", "Decl(B:f(A)) < Decl(A:f(A))", "[super.f(a3)] =^= [A:f(A)]_returnType", "Decl(A:f(A)) =^= p.A", "[null] <= [B:f(A)]_returnType", "[Parameter(0,I:f(A))] =^= [ai]", "[Parameter(0,B:f(A))] =^= [a3]", "[A:f(A)]_returnType =^= A", "Decl(B:f(A)) =^= p.B", "Decl(I:f(A)) =^= p.I", "Decl(B:f(A)) < Decl(I:f(A))", "[a3] <= [Parameter(0,A:f(A))]", "[I:f(A)]_returnType =^= A", "[B:f(A)]_returnType =^= A", "[a3] =^= A", "[a0] =^= A", "[ai] =^= A"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints16() throws Exception{
-		String[] strings= {"Decl(A:aField) =^= p.A", "Decl(A:f()) =^= p.A", "[this] =^= p.A", "[this] =^= p.A", "[this] <= [aTemp]", "[this] <= [aField]", "[this] <= [a]", "[a] =^= A", "[aField] =^= A", "[aTemp] =^= A", "[this] =^= p.A"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints17() throws Exception{
-		String[] strings= {"Decl(A:f()) =^= p.A", "[null] <= [a]", "[A:f()]_returnType =^= A", "[a] =^= A", "[a] <= [A:f()]_returnType"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints18() throws Exception{
-		String[] strings= {"[Parameter(0,B:B(A))] =^= [a1]", "Decl(B:B(A)) =^= p.B", "[Parameter(0,A:A(A))] =^= [a0]", "Decl(A:A(A)) =^= p.A", "[a1] <= [Parameter(0,A:A(A))]", "[a1] =^= A", "[a0] =^= A"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints19() throws Exception{
-		String[] strings= {"[aField] =^= p.A", "[a] =^= A", "Decl(B:f()) =^= p.B", "[a] <= [aField]", "[null] <= [a]", "Decl(A:aField) =^= p.A", "[aField] =^= A"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints20() throws Exception{
-		String[] strings= {"Decl(B:aField) =^= p.B", "Decl(A:aField) =^= p.A", "Decl(B:aField) < Decl(A:aField)", "[aField] =^= A", "[aField] =^= A"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints21() throws Exception{
-		String[] strings= {"Decl(A:f2(A[])) =^= p.A", "[Parameter(0,A:f2(A[]))] =^= [as]", "[as] =^= A[]"};
-		testConstraints(strings);
-	}	
-
-	public void testConstraints22() throws Exception{
-		String[] strings= {"[null] <= [A:f(A, Object)]_returnType", "[Parameter(0,A:f(A, Object))] =^= [a0]", "[Parameter(1,A:f(A, Object))] =^= [a1]", "[A:f(A, Object)]_returnType =^= A", "Decl(A:f(A, Object)) =^= p.A", "[a1] =^= Object", "[a0] =^= A"};
-		testConstraints(strings);
-	}	
-	
-	public void testConstraints23() throws Exception{
-		//test for bug 41271 NullPointerException dumping set of ITypeConstraints to System.out 
-		String[] strings= {"[args.length] =^= int", "[0] <= [i]", "[i] =^= int", "[args] <= Decl((array type):length)", "[args] =^= String[]", "[Parameter(0,Test1:main(String[]))] =^= [args]", "Decl(Test1:main(String[])) =^= p.Test1"};
-		testConstraints(strings);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests.refactoring/test.xml b/org.eclipse.jdt.ui.tests.refactoring/test.xml
deleted file mode 100644
index e22a0b7..0000000
--- a/org.eclipse.jdt.ui.tests.refactoring/test.xml
+++ /dev/null

@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jdt.ui.tests.refactoring"/>
-  <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="refactoring-folder" 
-              value="${eclipse-home}/refactoring_folder"/>
-    <delete dir="${refactoring-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${refactoring-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.ui.tests.all.AllAllTests"/>
-    </ant>
-  </target>
-
-  <!-- performance test target -->
-  <target name="performance-suite">
-    <property name="jdt-ui-refactoring-performance-folder" value="${eclipse-home}/jdt_ui_refactoring_performance_folder"/>
-    
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenamePackagePerfTests1"/>
-    </ant>
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenamePackagePerfTests2"/>
-    </ant>
-    
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenameTypePerfAcceptanceTests"/>
-    </ant>
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenameTypePerfTests1"/>
-    </ant>
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenameTypePerfTests2"/>
-    </ant>
-    
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenameMethodPerfTests1"/>
-    </ant>
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenameMethodPerfTests2"/>
-    </ant>
-    
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenameMethodWithOverloadPerfTests"/>
-    </ant>
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.RenameMethodWithHidingPerfTests"/>
-    </ant>
-    
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.MoveCompilationUnitPerfTests1"/>
-    </ant>
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.MoveCompilationUnitPerfTests2"/>
-    </ant>
-    
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.MoveStaticMembersPerfTests1"/>
-    </ant>
-    <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-refactoring-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.reorg.MoveStaticMembersPerfTests2"/>
-    </ant>
-  </target>
-  
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-
-  <!-- This target runs the performance test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="performance" depends="init,performance-suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-		
-</project>

diff --git a/org.eclipse.jdt.ui.tests/.classpath b/org.eclipse.jdt.ui.tests/.classpath
deleted file mode 100644
index dff88d3..0000000
--- a/org.eclipse.jdt.ui.tests/.classpath
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="examples"/>
-	<classpathentry kind="src" path="test plugin"/>
-	<classpathentry kind="src" path="ui"/>
-	<classpathentry kind="src" path="chkpii"/>
-	<classpathentry kind="src" path="leaks"/>
-	<classpathentry kind="src" path="performance"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.ui.tests/.cvsignore b/org.eclipse.jdt.ui.tests/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.jdt.ui.tests/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests/.plugins-path b/org.eclipse.jdt.ui.tests/.plugins-path
deleted file mode 100644
index 36f1716..0000000
--- a/org.eclipse.jdt.ui.tests/.plugins-path
+++ /dev/null

@@ -1 +0,0 @@
-platformPath = file:/d:/workspaces/eclipse-sh1/plugins/

diff --git a/org.eclipse.jdt.ui.tests/.project b/org.eclipse.jdt.ui.tests/.project
deleted file mode 100644
index b27d919..0000000
--- a/org.eclipse.jdt.ui.tests/.project
+++ /dev/null

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.ui.tests</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.jdt.ui</project>
-		<project>org.eclipse.jface.text</project>
-		<project>org.eclipse.search</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.editors</project>
-		<project>org.eclipse.ui.ide</project>
-		<project>org.eclipse.ui.views</project>
-		<project>org.eclipse.ui.workbench.texteditor</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.jdt.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ba98fb1..0000000
--- a/org.eclipse.jdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Wed Sep 01 12:04:13 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.jdt.ui.tests/about.html b/org.eclipse.jdt.ui.tests/about.html
deleted file mode 100644
index fad1e4a..0000000
--- a/org.eclipse.jdt.ui.tests/about.html
+++ /dev/null

@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that may be have been sourced from third parties as follows:</p>
-
-<p><b>JUnit 3.7</b></p>
-<p>The plug-in is based on software developed by JUnit.org.  Your use of JUnit 3.7 in both source and binary code
-form contained in the plug-in is subject to the terms and conditions of the IBM Public License 1.0 which is available at
-<a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>.
-The source code is located in testresources/junit37-noUI-src.zip.</p>
-
-<p>i) IBM effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;</p>
-<p>ii) IBM effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;</p>
-<p>iii) IBM states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests/activation/org/eclipse/jdt/ui/tests/activation/JavaActivationTest.java b/org.eclipse.jdt.ui.tests/activation/org/eclipse/jdt/ui/tests/activation/JavaActivationTest.java
deleted file mode 100644
index b35e06c..0000000
--- a/org.eclipse.jdt.ui.tests/activation/org/eclipse/jdt/ui/tests/activation/JavaActivationTest.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.activation;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.TestCase;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-public class JavaActivationTest extends TestCase {
-	
-	private IJavaProject project;
-
-	protected void setUp() throws Exception {
-		project= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-	}
-
-	protected void tearDown() throws Exception {
-	    getPage().closeAllEditors(false);
-		JavaProjectHelper.delete(project);
-	}
-
-	private IWorkbenchPage getPage() {
-	    IWorkbench workbench= PlatformUI.getWorkbench();
-	    return workbench.getActiveWorkbenchWindow().getActivePage();
-	}
-	
-	private ICompilationUnit createTestCU() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(project, "src");
-		IPackageFragment pack= sourceFolder.createPackageFragment("pack0", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("public class List1 {\n}\n");
-		return pack.createCompilationUnit("List1.java", buf.toString(), false, null);
-	}
-	
-	public void testOpenJavaEditor() throws Exception {
-		String[] expectedActivations= {
-		        // activated since running tests
-		        "org.eclipse.jdt.junit.runtime", 
-		        "org.eclipse.pde.junit.runtime",
-		        "org.eclipse.jdt.ui.tests", 
-		        "org.junit", 
-		        
-		        // expected activations
-		        "org.osgi.framework",
-		        "org.eclipse.osgi.services",
-		        "org.eclipse.osgi.util",
-		        "org.eclipse.core.runtime",
-		        "org.eclipse.update.configurator",
-		        "org.eclipse.compare",
-		        "org.eclipse.core.filebuffers",
-		        "org.eclipse.core.resources",
-		        "org.eclipse.core.runtime.compatibility",
-		        "org.eclipse.debug.core",
-		        "org.eclipse.debug.ui", // ???
-		        "org.eclipse.help",
-		        "org.eclipse.jdt.core",
-		        "org.eclipse.jdt.ui",
-		        "org.eclipse.jface",
-		        "org.eclipse.jface.text",
-		        "org.eclipse.swt",
-		        "org.eclipse.team.core",
-		        "org.eclipse.text",
-		        "org.eclipse.ui",
-		        "org.eclipse.ui.editors",
-		        "org.eclipse.ui.externaltools", // ???
-		        "org.eclipse.ui.ide",
-		        "org.eclipse.ui.views",
-		        "org.eclipse.ui.workbench",
-		        "org.eclipse.ui.workbench.texteditor",
-		        "org.eclipse.update.core",
-		        "org.eclipse.update.scheduler" // ???
-		};
-		ICompilationUnit unit= createTestCU();
-		EditorUtility.openInEditor(unit);
-		IPluginDescriptor[] descriptors = Platform.getPluginRegistry().getPluginDescriptors();
-		
-		Set set= new HashSet();
-		set.addAll(Arrays.asList(expectedActivations));
-		
-		for (int i = 0; i < descriptors.length; i++) {
-		    IPluginDescriptor descriptor= descriptors[i];
-		    String uniqueIdentifier= descriptor.getUniqueIdentifier();
-		    if (descriptor.isPluginActivated())
-		        assertTrue ("plugin should not be activated: "+uniqueIdentifier,  set.contains(uniqueIdentifier)) ;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/build.properties b/org.eclipse.jdt.ui.tests/build.properties
deleted file mode 100644
index 84c8d52..0000000
--- a/org.eclipse.jdt.ui.tests/build.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
-               about.html,\
-               testresources/,\
-               *.jar,\
-               leaks/ProfileNatives.dll
-source.javauitests.jar = examples/,\
-                         test plugin/,\
-                         ui/,\
-                         leaks/,\
-                         performance/

diff --git a/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ChkpiiTests.java b/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ChkpiiTests.java
deleted file mode 100644
index 50989d8..0000000
--- a/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ChkpiiTests.java
+++ /dev/null

@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.chkpii;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.StringTokenizer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.osgi.service.environment.Constants;
-
-public class ChkpiiTests extends TestCase {
-	
-	private String fLogDirectoryName;
-	
-	private static final int HTML= 0;
-	private static final int PROPERTIES= 1;
-	private static final int XML= 2;
-	
-	/**
-	 * Checks if the given log file contains errors.
-	 * 
-	 * @param logFilePath the path of the chkpii log file
-	 * @return <code>true</code> if there are errors in the log file
-	 */
-	private boolean hasErrors(String logFilePath) {
-		BufferedReader aReader= null;
-		
-		try {
-			aReader= new BufferedReader(new InputStreamReader(new FileInputStream(logFilePath)));
-			String aLine= aReader.readLine();
-			while (aLine != null) {
-				int aNumber= parseLine(aLine);
-				if (aNumber > 0)
-					return true;
-
-				aLine= aReader.readLine();
-			}
-		} catch (FileNotFoundException e) {
-			System.out.println("Could not open log file: " + logFilePath); //$NON-NLS-1$
-			return true;
-		} catch (IOException e) {
-			System.out.println("Error reading log file: " + logFilePath); //$NON-NLS-1$
-			return true;
-		} finally {
-			if (aReader != null) {
-				try {
-					aReader.close();
-				} catch (IOException e) {
-					return true;
-				}
-			}
-		}
-		
-		return false;
-	}
-	
-	public void testChkpii() {
-			
-		boolean testExecuted= testChkpii(HTML);
-		assertTrue("Could not run chkpii test. See console for details.", testExecuted); //$NON-NLS-1$
-		boolean result1= !hasErrors(getOutputFile(HTML));
-
-		testChkpii(XML);
-		assertTrue("Could not run chkpii test. See console for details.", testExecuted); //$NON-NLS-1$
-		boolean result2= !hasErrors(getOutputFile(XML));
-		
-		testChkpii(PROPERTIES);
-		assertTrue("Could not run chkpii test. See console for details.", testExecuted); //$NON-NLS-1$
-		boolean result3= !hasErrors(getOutputFile(PROPERTIES));
-
-		assertTrue("CHKPII warnings or errors in files. See " + fLogDirectoryName + " for details.", (result1 && result2 && result3)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-		
-	private boolean testChkpii(int type) {
-		Runtime aRuntime= Runtime.getRuntime();
-		String chkpiiString= getChkpiiString(type);
-		BufferedReader aBufferedReader= null;
-		StringBuffer consoleLog= new StringBuffer();
-		try {
-			Process aProcess= aRuntime.exec(chkpiiString);
-			aBufferedReader= new BufferedReader(new InputStreamReader(aProcess.getInputStream()));
-			String line= aBufferedReader.readLine();
-			while (line != null) {
-				consoleLog.append(line);
-				consoleLog.append('\n');
-				line= aBufferedReader.readLine();
-			}
-			aProcess.waitFor();
-		} catch (IOException e) {
-			e.printStackTrace();
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		} finally {
-			if (aBufferedReader != null)
-				try {
-					aBufferedReader.close();
-				} catch (IOException ex) {
-				}
-		}
-		if (!new File(getOutputFile(type)).exists()) {
-			System.out.println(consoleLog.toString());
-			System.out.flush();
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Method getChkpiiString.
-	 * 
-	 * @param HTML
-	 * @return String
-	 */
-	private String getChkpiiString(int type) {
-		return getExec() + " " + getFilesToTest(type) + " -E -O " + getOutputFile(type) + " -XM @" + getExcludeErrors() + " -X " + getExcludeFile () + " -S"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	}
-
-
-	private String getPluginDirectory() {
-		
-		// Get some path inside a plug-in
-		String filePath= toLocation(getClass().getResource("ignoreFiles.txt"));
-
-		StringTokenizer tokenizer= new StringTokenizer(filePath, File.pathSeparator);
-		String path= tokenizer.nextToken();
-		while (tokenizer.hasMoreTokens()) {
-			String token= tokenizer.nextToken();
-			if (token.equals("bin"))
-				break;
-			
-			path= path + File.pathSeparator + token; 
-		}
-		return path + File.pathSeparator;
-	}
-
-	/**
-	 * Method getFilesToTest.
-	 * 
-	 * @param HTML
-	 * @return String
-	 */
-	private String getFilesToTest(int type) {
-			
-		String aString= getPluginDirectory();
-			
-		switch (type) {
-			case HTML :
-				return aString + "*.htm*"; //$NON-NLS-1$
-			case PROPERTIES :
-				return aString + "*.properties"; //$NON-NLS-1$
-							
-			case XML : 
-				return aString + "*.xml"; //$NON-NLS-1$
-			
-			default :
-				return aString + "*.*"; //$NON-NLS-1$
-		}
-	}
-	
-	private String toLocation(URL platformURL) {
-		File localFile;
-		try {
-			localFile= new File(Platform.asLocalURL(platformURL).getFile());
-		} catch (IOException e) {
-			e.printStackTrace();
-			return platformURL.getFile();
-		}
-		try {
-			return localFile.getCanonicalPath();
-		} catch (IOException e) {
-			e.printStackTrace();
-			return localFile.getPath();
-		}
-	}
-	
-	/**
-	 * Method getExcludeFiles.
-	 * 
-	 * @return String
-	 */
-	private String getExcludeFile() {
-		return toLocation(getClass().getResource("ignoreFiles.txt"));
-	}
-	
-	/**
-	 * Returns the output file path.
-	 * 
-	 * @param type the file type
-	 * @return the string with the output file path
-	 */
-	private String getOutputFile(int type) {
-
-		switch (type) {
-
-			case HTML :
-				return fLogDirectoryName + File.separator + "html.txt"; //$NON-NLS-1$
-
-			case PROPERTIES :
-				return fLogDirectoryName + File.separator + "properties.txt"; //$NON-NLS-1$
-		
-			case XML : 
-				return fLogDirectoryName + File.separator + "xml.txt"; //$NON-NLS-1$
-
-			default :
-				return fLogDirectoryName + File.separator + "other.txt"; //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Method getExec.
-	 * 
-	 * @return String
-	 */
-	private String getExec() {
-		return new File("chkpii.exe").getPath(); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Method getExcludeErrors.
-	 */
-	private String getExcludeErrors() {
-		
-		String fileName;
-		
-		if (Platform.getOS().equals(Constants.OS_WIN32))
-			fileName= "ignoreErrorsWindows.txt"; //$NON-NLS-1$
-		else
-			fileName= "ignoreErrorsUnix.txt"; //$NON-NLS-1$
-		
-		return toLocation(getClass().getResource(fileName));
-	}
-		
-	/**
-	 * Method parseLine.
-	 * 
-	 * @param aLine
-	 * @return -1 if not an error or warning line or the number of errors or
-	 * warnings.
-	 */
-	private int parseLine(String aLine) {
-		int index= aLine.indexOf("Files Contain Error"); //$NON-NLS-1$
-		
-//		if (index == -1) {
-//			index= aLine.indexOf("Files Contain Warning"); //$NON-NLS-1$
-//		}
-		
-		if (index == -1) {
-			index= aLine.indexOf("Files Could Not Be Processed"); //$NON-NLS-1$
-		}
-		
-		if (index == -1) {
-			return index;
-		}
-		
-		String aString= aLine.substring(0, index).trim();
-		return Integer.parseInt(aString);
-	}
-	
-	/**
-	 * Constructor for EmptyDirectoriesTest.
-	 * @param arg0
-	 */
-	public ChkpiiTests(String arg0) {
-		super(arg0);
-	}
-
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		fLogDirectoryName= getPluginDirectory() + "chkpiiResults" + File.separator; //$NON-NLS-1$ //$NON-NLS-2$
-
-		new File(fLogDirectoryName).mkdirs();
-
-		new File(getOutputFile(PROPERTIES)).delete();
-		new File(getOutputFile(HTML)).delete();
-		new File(getOutputFile(XML)).delete();
-		
-	}
-
-	/*
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		fLogDirectoryName= null;		
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreErrorsUnix.txt b/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreErrorsUnix.txt
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreErrorsUnix.txt
+++ /dev/null


diff --git a/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreErrorsWindows.txt b/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreErrorsWindows.txt
deleted file mode 100644
index 3a88561..0000000
--- a/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreErrorsWindows.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-127
-128

diff --git a/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreFiles.txt b/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreFiles.txt
deleted file mode 100644
index d28dc42..0000000
--- a/org.eclipse.jdt.ui.tests/chkpii/org/eclipse/jdt/ui/tests/chkpii/ignoreFiles.txt
+++ /dev/null

@@ -1,41 +0,0 @@
-feature.properties
-feature.xml
-cpl*.html
-license.html
-notice.html
-buildnotes*.htm
-buildnotes*.html
-*/bin/*
-*/plugin-export/*
-*/.metadata/*
-*/doc_zip/*
-*/scripts/*
-com.oti.zrh.contextids/*
-com.oti.zrh.eclipse.tools/*
-com.oti.zrh.eclipse.doc.tools-feature/*
-com.oti.zrh.eclipse.tools-updateSite/*
-Eclipse*JDT*Builds/*
-org.eclipse.jdt.launching/*
-org.eclipse.jdt.launching.j9/*
-org.eclipse.jdt.ui.tests.refactoring/resources/*
-platform-search-home/*
-platform-text-home/*
-jdt-ui-home/*
-org.eclipse.jdt.ui/core*extension\org/eclipse/jdt/internal/corext/template/default-codetemplates.xml
-org.eclipse.platform.doc.isv/buildDoc.xml
-org.eclipse.jdt.doc.isv/buildDoc.xml
-org.eclipse.jdt.core/*
-org.eclipse.tomcat/conf/*
-org.eclipse.ui/plugin.xml
-org.eclipse.platform.source/*
-org.apache.ant/*
-org.eclipse.help.webapp/*
-org.eclipse.pde.ui/*
-org.eclipse.pde.build/*
-org.eclipse.debug.core/*
-org.eclipse.jdt.debug.ui/*
-org.eclipse.jdt.debug/*
-org.eclipse.debug.ui/*
-org.eclipse.releng.tools/*
-org.eclipse.ui.console/*
-org.eclipse.sdk.tests-feature/plugins/*
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/AddTestMarkersAction.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/AddTestMarkersAction.java
deleted file mode 100644
index bfb7d8a..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/AddTestMarkersAction.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-import java.util.HashMap;
-
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.ToolFactory;
-import org.eclipse.jdt.core.compiler.IScanner;
-import org.eclipse.jdt.core.compiler.ITerminalSymbols;
-
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-
-/** In plugin.xml:
-    <extension
-         id="testmarker"
-         name="jdt-test-problem"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.core.resources.problemmarker">
-      </super>
-   </extension>
-   <extension
-         point="org.eclipse.ui.ide.markerResolution">
-      <markerResolutionGenerator
-            markerType="org.eclipse.jdt.ui.tests.testmarker"
-            class="org.eclipse.jdt.ui.tests.quickfix.MarkerResolutionGenerator">
-      </markerResolutionGenerator>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.ICompilationUnit"
-            id="org.eclipse.jdt.ui.examples.AddTestMarkersAction">
-         <action
-               label="%AddTestMarkersAction.label"
-               tooltip="%AddTestMarkersAction.tooltip"
-               class="org.eclipse.jdt.ui.examples.AddTestMarkersAction"
-               menubarPath="AddTestMarkers"
-               enablesFor="1"
-               id="addTestmarkers">
-         </action>
-      </objectContribution>
-   </extension>
- */
-
-public class AddTestMarkersAction extends Action implements IActionDelegate {
-
-	public static final String MARKER_TYPE= "org.eclipse.jdt.ui.tests.testmarker";
-	
-	private ICompilationUnit fCompilationUnit;
-	
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		try {
-			EditorUtility.openInEditor(fCompilationUnit);
-			
-			IScanner scanner= ToolFactory.createScanner(true, false, false, true);
-			scanner.setSource(fCompilationUnit.getSource().toCharArray());
-			
-			int count= 0;
-			int tok;
-			do {
-				tok= scanner.getNextToken();
-				if (isComment(tok)) {
-					int start= scanner.getCurrentTokenStartPosition();
-					int end= scanner.getCurrentTokenEndPosition() + 1;
-					int line= scanner.getLineNumber(start);
-					createMarker(fCompilationUnit, line, start, end - start);
-					count++;
-				}
-			} while (tok != ITerminalSymbols.TokenNameEOF);
-			
-			MessageDialog.openInformation(null, "Test Markers", count + " markers added");
-		} catch (Exception e) {
-			JavaTestPlugin.log(e);
-		}
-		
-	}
-
-	public static boolean isComment(int token) {
-		return token == ITerminalSymbols.TokenNameCOMMENT_BLOCK || token == ITerminalSymbols.TokenNameCOMMENT_JAVADOC 
-			|| token == ITerminalSymbols.TokenNameCOMMENT_LINE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fCompilationUnit= null;
-		if (selection instanceof IStructuredSelection) {
-			Object object= ((IStructuredSelection) selection).getFirstElement();
-			if (object instanceof ICompilationUnit) {
-				fCompilationUnit= (ICompilationUnit) object;
-				
-			}
-		}
-	}
-	
-	
-	private void createMarker(ICompilationUnit cu, int line, int offset, int len) throws CoreException {
-		HashMap map= new HashMap();
-		map.put(IMarker.LOCATION, cu.getElementName());
-		map.put(IMarker.MESSAGE, "Test marker");
-		map.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
-		map.put(IMarker.LINE_NUMBER, new Integer(line));
-		map.put(IMarker.CHAR_START, new Integer(offset));
-		map.put(IMarker.CHAR_END, new Integer(offset + len));
-	
-		MarkerUtilities.createMarker(cu.getResource(), map, MARKER_TYPE);
-	}	
-
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/CheckBoxExample.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/CheckBoxExample.java
deleted file mode 100644
index af9e321..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/CheckBoxExample.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-
-import java.util.List;
-import java.util.Random;
-
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.CheckedListDialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
-
-
-public class CheckBoxExample {
-	private Shell fShell;
-	
-	public CheckBoxExample() {
-	}
-	
-	public CheckBoxExample close () {
-		if ((fShell != null) && (!fShell.isDisposed ())) fShell.dispose ();
-		fShell= null;
-		return this;
-	}
-	
-	public CheckBoxExample open () {
-		fShell= new Shell ();
-		fShell.setText("Message Dialog Example");
-		fShell.setLayout(new GridLayout());
-		
-		Adapter adapter= new Adapter();
-
-
-		
-		String[] addButtons= new String[] { 
-			/* 0 */ "Add1", 
-			/* 1 */ "Check 0", 
-			/* 2 */ "Print", 
-			/* 3 */ null, 
-			/* 4 */ "Check All", 
-			/* 5 */ "Uncheck All", 
-			/* 6 */ null, 
-			/* 7 */ "Remove"
-		};
-		CheckedListDialogField list= new CheckedListDialogField(adapter, addButtons, new LabelProvider());
-		list.setCheckAllButtonIndex(4);
-		list.setUncheckAllButtonIndex(5);
-		list.setRemoveButtonIndex(7);
-		list.setLabelText("List: ");
-				
-		LayoutUtil.doDefaultLayout(fShell, new DialogField[] { list }, false);
-		
-		fShell.setSize(400,500);
-		fShell.open ();
-		return this;
-	}
-	
-	private static Random fgRandom= new Random();
-	
-	private class Adapter implements IStringButtonAdapter, IDialogFieldListener, IListAdapter {
-		
-		// -------- IStringButtonAdapter
-		public void changeControlPressed(DialogField field) {
-		}		
-				
-		// -------- IListAdapter
-		public void customButtonPressed(ListDialogField field, int index) {
-			if (field instanceof CheckedListDialogField) {
-				CheckedListDialogField list= (CheckedListDialogField)field;
-				if (index == 0) {
-					list.addElement("element-" + (fgRandom.nextInt() % 1000));
-				} else if (index == 2) {
-					System.out.println("---- printing all");
-					List checked= list.getCheckedElements();
-					for (int i= 0; i < checked.size(); i++) {
-						System.out.println(checked.get(i).toString());
-					}
-				} else {
-					list.setChecked(list.getElement(0), true);
-				}	
-			}
-		}
-		
-		public void selectionChanged(ListDialogField field) {}
-		
-		// -------- IDialogFieldListener
-		public void dialogFieldChanged(DialogField field) {
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#doubleClicked(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField)
-		 */
-		public void doubleClicked(ListDialogField field) {
-		}
-	}	
-	
-	public CheckBoxExample run () {
-		Display display= fShell.getDisplay ();
-		while (!fShell.isDisposed ()) {
-			if (!display.readAndDispatch ()) display.sleep ();
-		}
-		return this;
-	}
-	
-	public static void main(java.lang.String[] args) {
-		new CheckBoxExample().open().run().close();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/DialogFieldExample.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/DialogFieldExample.java
deleted file mode 100644
index 0f4882d..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/DialogFieldExample.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-
-import java.util.Random;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogFieldGroup;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
-
-
-public class DialogFieldExample {
-	private Shell fShell;
-	
-	public DialogFieldExample() {
-	}
-	
-	public DialogFieldExample close () {
-		if ((fShell != null) && (!fShell.isDisposed ())) fShell.dispose ();
-		fShell= null;
-		return this;
-	}
-	
-	private class MylabelProvider extends LabelProvider implements ITableLabelProvider {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-		 */
-		public Image getColumnImage(Object element, int columnIndex) {
-			return null;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-		 */
-		public String getColumnText(Object element, int columnIndex) {
-			if (columnIndex == 0) {
-				return element.toString();
-			} else {
-				return "" + columnIndex;
-			}
-		}
-	}
-	
-	
-	public DialogFieldExample open () {
-		fShell= new Shell ();
-		fShell.setText("Message Dialog Example");
-		fShell.setLayout(new GridLayout());
-		
-		Adapter adapter= new Adapter();
-		
-		StringButtonDialogField string1= new StringButtonDialogField(adapter);
-		string1.setLabelText("String1: ");
-		string1.setText("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-		
-		StringButtonDialogField stringbutton= new StringButtonDialogField(adapter);
-		stringbutton.setLabelText("StringButton: ");
-		stringbutton.setButtonLabel("Click");
-		stringbutton.setText("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-
-		
-		String[] addButtons= new String[] { 
-			/* 0 */ "Add1",
-			/* 1 */ "Add2",
-			/* 2 */ null,
-			/* 3 */ "Up",
-			/* 4 */ "Down",					
-			/* 5 */ null,
-			/* 6 */ "Remove"
-		};
-		String[] columnHeaders= new String[] { "Name", "Number" };
-		
-		
-		ListDialogField list= new ListDialogField(adapter, addButtons, new MylabelProvider());
-		list.setUpButtonIndex(3);
-		list.setDownButtonIndex(4);
-		list.setRemoveButtonIndex(6);
-		list.setLabelText("List: ");
-		
-		list.setTableColumns(new ListDialogField.ColumnsDescription(columnHeaders, true));
-		
-		for (int i= 0; i < 30; i++) {
-				list.addElement(i + "firstxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-		}
-		
-		SelectionButtonDialogField selButton= new SelectionButtonDialogField(SWT.PUSH);
-		selButton.setLabelText("Press Button");
-		
-		String[] radioButtons1= new String[] { "Option One", "Option Two", "Option Three" };
-		SelectionButtonDialogFieldGroup rdgroup1= new SelectionButtonDialogFieldGroup(SWT.RADIO, radioButtons1, 3, 0);
-		rdgroup1.setLabelText("Radio Button Group");
-		
-		String[] radioButtons2= new String[] { "Option One", "Option Two", "Option Three" };
-		SelectionButtonDialogFieldGroup rdgroup2= new SelectionButtonDialogFieldGroup(SWT.CHECK, radioButtons2, 3);
-		rdgroup2.setLabelText("Radio Button Group 2");		
-		
-		LayoutUtil.doDefaultLayout(fShell, new DialogField[] { string1, rdgroup2, stringbutton, selButton, list, rdgroup1 }, false);
-		
-		((GridData)string1.getTextControl(null).getLayoutData()).widthHint= 100;
-		((GridData)stringbutton.getTextControl(null).getLayoutData()).widthHint= 100;
-		
-		fShell.setSize(fShell.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		fShell.open ();
-		return this;
-	}
-	
-	private static Random fgRandom= new Random();
-	
-	private class Adapter implements IStringButtonAdapter, IDialogFieldListener, IListAdapter {
-		
-		// -------- IStringButtonAdapter
-		public void changeControlPressed(DialogField field) {
-		}		
-				
-		// -------- IListAdapter
-		public void customButtonPressed(ListDialogField field, int index) {
-			if (field != null) {
-				field.addElement("elementxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-" + fgRandom.nextInt());
-			}
-		}
-		
-		public void selectionChanged(ListDialogField field) {}
-		
-		// -------- IDialogFieldListener
-		public void dialogFieldChanged(DialogField field) {
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#doubleClicked(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField)
-		 */
-		public void doubleClicked(ListDialogField field) {
-		}
-	}	
-	
-	public DialogFieldExample run () {
-		Display display= fShell.getDisplay ();
-		while (!fShell.isDisposed ()) {
-			if (!display.readAndDispatch ()) display.sleep ();
-		}
-		return this;
-	}
-	
-	public static void main(java.lang.String[] args) {
-		new DialogFieldExample().open().run().close();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MultiElementListSelectorExample.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MultiElementListSelectorExample.java
deleted file mode 100644
index 0f0c3b8..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MultiElementListSelectorExample.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-
-import java.util.Random;
-
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-import org.eclipse.jdt.internal.ui.dialogs.MultiElementListSelectionDialog;
-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
-
-
-public class MultiElementListSelectorExample {
-
-
-	public static void main(String[] args) {
-
-
-		ISelectionStatusValidator validator= new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection != null && selection.length == 1) {
-					return new StatusInfo();
-				} else {
-					StatusInfo status= new StatusInfo();
-					status.setError("Single selection");
-					return status;
-				}
-				
-			}
-		};
-
-
-
-		Random random= new Random();
-		
-		ILabelProvider elementRenderer= new org.eclipse.jface.viewers.LabelProvider() {
-			public String getText(Object element) {
-				return element.toString();
-			}
-		};
-		
-		int nLists= 3;
-		
-		Object[][] elements= new Object[nLists][];
-		for (int i= 0; i < nLists; i++) {
-			int size= random.nextInt(15);
-			elements[i]= new String[size];
-			for (int k= 0; k < size; k++) {
-				elements[i][k]= "elem-" + i + "-" + k;
-			}
-		}
-		Display display= new Display();
-		MultiElementListSelectionDialog d= new MultiElementListSelectionDialog(new Shell(display), elementRenderer);
-		d.setTitle("Title");
-		d.setIgnoreCase(true);
-		d.setMessage("this is a message");
-		d.setValidator(validator);
-		d.setElements(elements);
-		
-		d.open();
-		
-		Object[] res= d.getResult();
-		for (int i= 0; i < res.length; i++)
-			System.out.println(res[i]);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyProjectCreationWizard.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyProjectCreationWizard.java
deleted file mode 100644
index f653a1b..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyProjectCreationWizard.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.ui.wizards.JavaCapabilityConfigurationPage;
-
-/**
-<extension 
-	point="org.eclipse.ui.newWizards">
-  	<wizard
-		id="org.eclipse.jdt.ui.examples.MyProjectCreationWizard"
-		name="My project"
-		class="org.eclipse.jdt.ui.examples.MyProjectCreationWizard"
-		category="org.eclipse.jdt.ui.java"
-		project="true"
-		finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
-		icon="icons/full/ctool16/newjprj_wiz.gif">
-		<description>My project</description>
-    </wizard>	 
-</extension>
- */   
-
-/**
- * This example shows how to implement an own project wizard that uses the
- * JavaCapabilityConfigurationPage to allow the user to configure the Java build path.
- */
-public class MyProjectCreationWizard extends Wizard implements IExecutableExtension, INewWizard {
-
-	private WizardNewProjectCreationPage fMainPage;
-	private JavaCapabilityConfigurationPage fJavaPage;
-	
-	private IConfigurationElement fConfigElement;
-
-	private IWorkbench fWorkbench;
-	public MyProjectCreationWizard() {
-		setWindowTitle("New XY Project");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) {
-		//  The config element will be used in <code>finishPage</code> to set the result perspective.
-		fConfigElement= cfig;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		fWorkbench= workbench; 
-	}
-
-	/* (non-Javadoc)
-	 * @see Wizard#addPages
-	 */	
-	public void addPages() {
-		super.addPages();
-		fMainPage= new WizardNewProjectCreationPage("NewProjectCreationWizard");
-		fMainPage.setTitle("New");
-		fMainPage.setDescription("Create a new XY project.");
-		
-		// the main page
-		addPage(fMainPage);
-		
-		// the Java build path configuration page
-		fJavaPage= new JavaCapabilityConfigurationPage() {
-			public void setVisible(boolean visible) {
-				// need to override to react to changes on first page
-				updatePage();
-				super.setVisible(visible);
-			}
-		};
-		addPage(fJavaPage);
-		
-		//	TODO: add your pages here
-	}
-	
-	private void updatePage() {
-		IJavaProject jproject= JavaCore.create(fMainPage.getProjectHandle());
-		if (!jproject.equals(fJavaPage.getJavaProject())) {
-			fJavaPage.init(jproject, null, null, false);	
-		}
-	}
-	
-	private void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
-		if (monitor == null) {
-			monitor= new NullProgressMonitor();
-		}
-		try {		
-			monitor.beginTask("Creating XY project...", 3); // 3 steps
-
-			IProject project= fMainPage.getProjectHandle();
-			IPath locationPath= fMainPage.getLocationPath();
-		
-			// create the project
-			IProjectDescription desc= project.getWorkspace().newProjectDescription(project.getName());
-			if (!fMainPage.useDefaults()) {
-				desc.setLocation(locationPath);
-			}
-			project.create(desc, new SubProgressMonitor(monitor, 1));
-			project.open(new SubProgressMonitor(monitor, 1));
-			
-			updatePage();
-			fJavaPage.configureJavaProject(new SubProgressMonitor(monitor, 1));
-			// TODO: configure your page / nature
-	
-			// change to the perspective specified in the plugin.xml		
-			BasicNewProjectResourceWizard.updatePerspective(fConfigElement);
-			BasicNewResourceWizard.selectAndReveal(project, fWorkbench.getActiveWorkbenchWindow());
-			
-		} finally {
-			monitor.done();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see Wizard#performFinish
-	 */		
-	public boolean performFinish() {
-		WorkspaceModifyOperation op= new WorkspaceModifyOperation() {
-			protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-				finishPage(monitor);
-			}
-		};
-		try {
-			getContainer().run(false, true, op);
-		} catch (InvocationTargetException e) {
-			return false; // TODO: should open error dialog and log
-		} catch  (InterruptedException e) {
-			return false; // canceled
-		}
-		return true;
-	}
-			
-
-
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyQuickAssistProcessor.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyQuickAssistProcessor.java
deleted file mode 100644
index 1ca539a..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyQuickAssistProcessor.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MethodInvocation;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-import org.eclipse.jdt.ui.text.java.IQuickAssistProcessor;
-
-import org.eclipse.jdt.internal.corext.dom.Bindings;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.text.correction.ASTRewriteCorrectionProposal;
-
-/**
- *
- */
-public class MyQuickAssistProcessor implements IQuickAssistProcessor {
-	
-	private boolean getConvertProposal(IInvocationContext context, List result) {
-		ASTNode node= context.getCoveringNode();
-		if (!(node instanceof StringLiteral)) {
-			return false;
-		}
-		if (result == null) {
-			return true;
-		}
-		
-		StringLiteral oldLiteral= (StringLiteral) node;
-		
-		AST ast= node.getAST();
-		StringLiteral newLiteral= ast.newStringLiteral();
-		newLiteral.setEscapedValue(oldLiteral.getEscapedValue().toUpperCase());
-		
-		ASTRewrite rewrite= ASTRewrite.create(ast);
-		rewrite.replace(oldLiteral, newLiteral, null);
-		Image image= JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
-		result.add(new ASTRewriteCorrectionProposal("To uppercase", context.getCompilationUnit(), rewrite, 10, image));
-		return true;
-	}
-	
-	private boolean getASTProposal(IInvocationContext context, List result) {
-		ASTNode node= context.getASTRoot();
-		
-		AST ast= node.getAST();
-		final ASTRewrite rewrite= ASTRewrite.create(ast);
-		
-		ASTVisitor visitor= new ASTVisitor() {
-			public boolean visit(MethodInvocation inv) {
-				if (!inv.arguments().isEmpty()) {
-					return true;
-				}
-				Expression expression= inv.getExpression();
-				if (expression == null || expression.resolveTypeBinding() == null) {
-					return true;
-				}
-				ITypeBinding expressionBinding= expression.resolveTypeBinding();
-				if (Bindings.findTypeInHierarchy(expressionBinding, ASTNode.class.getName()) == null) {
-					return true;
-				}
-				IMethodBinding methodBinding= inv.resolveMethodBinding();
-				if (methodBinding == null) {
-					return true;
-				}
-				ITypeBinding returnType= methodBinding.getReturnType();
-				String name= returnType.getName();
-				if ("void".equals(name)) { //$NON-NLS-1$
-					return true;
-				}
-				if ("getAST".equals(methodBinding.getName())) { //$NON-NLS-1$
-					return true;
-				}
-				
-				String invName;
-				if ("int".equals(name)) { //$NON-NLS-1$
-					invName= "getIntAttribute"; //$NON-NLS-1$
-				} else if ("boolean".equals(name)) { //$NON-NLS-1$
-					invName= "getBooleanAttribute"; //$NON-NLS-1$
-				} else if ("List".equals(name)) { //$NON-NLS-1$
-					invName= "getChildList"; //$NON-NLS-1$
-				} else if (Bindings.findTypeInHierarchy(returnType, ASTNode.class.getName()) != null) {
-					invName= "getChildNode"; //$NON-NLS-1$
-				} else {
-					invName= "getAttribute"; //$NON-NLS-1$
-				}
-				AST ast2= inv.getAST();
-				MethodInvocation newInv= ast2.newMethodInvocation();
-				newInv.arguments().add(rewrite.createCopyTarget(expression));
-				
-				Name arg= ast2.newName(new String[] { expressionBinding.getName(), toConstantName(methodBinding.getName()) });
-				newInv.arguments().add(arg);
-				newInv.setName(ast2.newSimpleName(invName));
-				
-				rewrite.replace(inv, newInv, null);
-				return true;
-			}
-		};
-		node.accept(visitor);
-		
-		Image image= JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
-		result.add(new ASTRewriteCorrectionProposal("Use AST Properties", context.getCompilationUnit(), rewrite, 10, image));
-		return true;
-	}
-	
-	private static String getPropertyName(String name) {
-		if (name.startsWith("get")) {
-			return name.substring(3);
-		} else if (name.startsWith("is")) {
-			return name;
-		}
-		return name;
-	}
-	
-	private static String toConstantName(String name) {
-		String string= getPropertyName(name);
-		
-		StringBuffer buf= new StringBuffer();
-		for (int i= 0; i < string.length(); i++) {
-			char ch= string.charAt(i);
-			if (i != 0 && Character.isUpperCase(ch)) {
-				buf.append('_');
-			}
-			buf.append(Character.toUpperCase(ch));
-		}
-		buf.append("_PROPERTY"); //$NON-NLS-1$
-		return buf.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.text.java.IQuickAssistProcessor#hasAssists(org.eclipse.jdt.ui.text.java.IInvocationContext)
-	 */
-	public boolean hasAssists(IInvocationContext context) {
-		return getConvertProposal(context, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.ui.text.java.IQuickAssistProcessor#getAssists(org.eclipse.jdt.ui.text.java.IInvocationContext, org.eclipse.jdt.ui.text.java.IProblemLocation[])
-	 */
-	public IJavaCompletionProposal[] getAssists(IInvocationContext context, IProblemLocation[] locations) {
-		ArrayList resultingCollections= new ArrayList();
-		getConvertProposal(context, resultingCollections);
-		//getASTProposal(context, resultingCollections);
-		return (IJavaCompletionProposal[]) resultingCollections.toArray(new IJavaCompletionProposal[resultingCollections.size()]);
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyQuickFixProcessor.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyQuickFixProcessor.java
deleted file mode 100644
index 46d9cda..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyQuickFixProcessor.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.compiler.IProblem;
-
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-import org.eclipse.jdt.ui.text.java.IQuickFixProcessor;
-
-import org.eclipse.jdt.internal.ui.text.correction.ReplaceCorrectionProposal;
-
-/**
- *
- */
-public class MyQuickFixProcessor implements IQuickFixProcessor {
-/* Active on files with the name A.java
-
-<extension
-      point="org.eclipse.jdt.ui.quickFixProcessors">
-   <quickFixProcessor
-         id= "org.eclipse.jdt.ui.examples.MyQuickFixProcessor"
-         class="org.eclipse.jdt.ui.examples.MyQuickFixProcessor"
-         name="Example Quick Fix Processor">
-         <objectState adaptable="org.eclipse.core.resources.IResource">
-           <property name="name" value="A.java"/>
-        </objectState>
-   </quickFixProcessor>
-</extension> 
-
-*/
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.ui.text.correction.ICorrectionProcessor#hasCorrections(org.eclipse.jdt.core.ICompilationUnit, int)
-	 */
-	public boolean hasCorrections(ICompilationUnit unit, int problemId) {
-		return (problemId == IProblem.NumericValueOutOfRange);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.ui.text.correction.ICorrectionProcessor#getCorrections(org.eclipse.jdt.internal.ui.text.correction.IAssistContext, org.eclipse.jdt.internal.ui.text.correction.IProblemLocation[])
-	 */
-	public IJavaCompletionProposal[] getCorrections(IInvocationContext context, IProblemLocation[] locations) throws CoreException {
-		for (int i= 0; i < locations.length; i++) {
-			if (locations[i].getProblemId() == IProblem.NumericValueOutOfRange) {
-				return getNumericValueOutOfRangeCorrection(context, locations[i]);
-			}
-		}
-		return null;
-	}
-
-	private IJavaCompletionProposal[] getNumericValueOutOfRangeCorrection(IInvocationContext context, IProblemLocation location) {
-		ICompilationUnit cu= context.getCompilationUnit();
-		
-		ReplaceCorrectionProposal proposal= new ReplaceCorrectionProposal("Change to 0", cu, location.getOffset(), location.getLength(), "0", 5);
-		return new IJavaCompletionProposal[] { proposal };
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TabExample.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TabExample.java
deleted file mode 100644
index a1133ee..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TabExample.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
-
-
-public class TabExample {
-	private Shell fShell;
-	
-	public TabExample() {
-	}
-	
-	public TabExample close () {
-		if ((fShell != null) && (!fShell.isDisposed ())) fShell.dispose ();
-		fShell= null;
-		return this;
-	}
-	
-	public TabExample open () {
-		fShell= new Shell ();
-		fShell.setText("TabTest");
-		fShell.setLayout(new GridLayout());
-		
-		TabFolder folder= new TabFolder(fShell, SWT.NONE);	
-		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-		//folder.setLayout(new PageContainerFillLayout(0, 0, 20, 20));
-		//folder.setLayout(new FillLayout());
-	
-		/*folder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				turnToPage(event);
-			}
-		});*/	
-				
-		TabItem item;
-		Label label;
-		
-		item= new TabItem(folder, SWT.NONE);
-		item.setText("Tab0");
-		
-		String[] addButtons= new String[] { 
-			/* 0 */ "Add1",
-			/* 1 */ "Add2",			
-			/* 2 */ null,
-			/* 3 */ "Remove"
-		};
-		ListDialogField list= new ListDialogField(new Adapter(), addButtons, new LabelProvider());
-		list.setRemoveButtonIndex(3);
-		list.setLabelText("List: ");
-
-
-		Composite c1= new Composite(folder, SWT.NONE);
-		LayoutUtil.doDefaultLayout(c1, new DialogField[] { list }, true);
-		
-		item.setControl(c1);
-		
-		item= new TabItem(folder, SWT.NONE);
-		item.setText("Tab1");
-		label= new Label(folder, SWT.LEFT);
-		label.setText("Tab1");
-		item.setControl(label);
-		
-		item= new TabItem(folder, SWT.NONE);
-		item.setText("Tab2");
-		label= new Label(folder, SWT.LEFT);
-		label.setText("Tab2");
-		item.setControl(label);
-		
-		item= new TabItem(folder, SWT.NONE);
-		item.setText("Tab3");
-		label= new Label(folder, SWT.LEFT);
-		label.setText("Tab3");
-		item.setControl(label);
-				
-		fShell.setSize(400,500);
-		fShell.open ();
-		return this;
-	}
-
-
-	private class Adapter implements IStringButtonAdapter, IDialogFieldListener, IListAdapter {
-		
-		// -------- IStringButtonAdapter
-		public void changeControlPressed(DialogField field) {
-		}		
-				
-		// -------- IListAdapter
-		public void customButtonPressed(ListDialogField field, int index) {
-		}
-		
-		public void selectionChanged(ListDialogField field) {
-		}
-		
-		// -------- IDialogFieldListener
-		public void dialogFieldChanged(DialogField field) {
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#doubleClicked(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField)
-		 */
-		public void doubleClicked(ListDialogField field) {
-		}
-	}
-	
-	public TabExample run () {
-		Display display= fShell.getDisplay ();
-		while (!fShell.isDisposed ()) {
-			if (!display.readAndDispatch ()) display.sleep ();
-		}
-		return this;
-	}
-	
-	public static void main(java.lang.String[] args) {
-		new TabExample().open().run().close();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TreeListDialogFieldExample.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TreeListDialogFieldExample.java
deleted file mode 100644
index a916d27..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TreeListDialogFieldExample.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-
-import java.util.Random;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.ITreeListAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.TreeListDialogField;
-
-
-public class TreeListDialogFieldExample {
-	private Shell fShell;
-	
-	public TreeListDialogFieldExample() {
-	}
-	
-	public TreeListDialogFieldExample close () {
-		if ((fShell != null) && (!fShell.isDisposed ())) fShell.dispose ();
-		fShell= null;
-		return this;
-	}
-	
-	
-		
-	public TreeListDialogFieldExample open () {
-		fShell= new Shell ();
-		fShell.setText("Message Dialog Example");
-		fShell.setLayout(new GridLayout());
-		
-		Adapter adapter= new Adapter();
-		
-		
-		String[] addButtons= new String[] { 
-			/* 0 */ "Add1",
-			/* 1 */ "Add2",
-			/* 2 */ null,
-			/* 3 */ "Up",
-			/* 4 */ "Down",					
-			/* 5 */ null,
-			/* 6 */ "Remove"
-		};
-		
-		TreeListDialogField list= new TreeListDialogField(adapter, addButtons, new LabelProvider());
-		list.setUpButtonIndex(3);
-		list.setDownButtonIndex(4);
-		list.setRemoveButtonIndex(6);
-		list.setLabelText("List: ");
-		
-	
-		for (int i= 0; i < 30; i++) {
-				list.addElement(i + "firstxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-		}
-		
-		
-		LayoutUtil.doDefaultLayout(fShell, new DialogField[] { list }, false);
-		
-		fShell.setSize(fShell.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		fShell.open ();
-		return this;
-	}
-	
-	private static Random fgRandom= new Random();
-	
-	private class Adapter implements ITreeListAdapter {
-		
-		// -------- IStringButtonAdapter
-		public void changeControlPressed(DialogField field) {
-		}		
-				
-		// -------- ITreeListAdapter
-		public void customButtonPressed(TreeListDialogField field, int index) {
-			field.addElement("elementxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-" + fgRandom.nextInt());
-		}
-		
-		public void selectionChanged(TreeListDialogField field) {}
-		
-		public Object[] getChildren(TreeListDialogField field, Object element) {
-			if (field.getElements().contains(element)) {
-				return new String[] {
-					"Source Attachment: c:/hello/z.zip",
-					"Javadoc Location: http://www.oo.com/doc"
-				};
-			}
-			return new String[0];
-		}
-
-		public Object getParent(TreeListDialogField field, Object element) {
-			return null;
-		}
-
-		public boolean hasChildren(TreeListDialogField field, Object element) {
-			return field.getElements().contains(element);
-		}		
-		
-		// -------- IDialogFieldListener
-		public void dialogFieldChanged(DialogField field) {
-		}
-
-		public void doubleClicked(TreeListDialogField field) {
-		}
-
-		public void keyPressed(TreeListDialogField field, KeyEvent event) {
-		}
-
-	}	
-	
-	public TreeListDialogFieldExample run () {
-		Display display= fShell.getDisplay ();
-		while (!fShell.isDisposed ()) {
-			if (!display.readAndDispatch ()) display.sleep ();
-		}
-		return this;
-	}
-	
-	public static void main(java.lang.String[] args) {
-		new TreeListDialogFieldExample().open().run().close();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TwoPaneElementSelectorExample.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TwoPaneElementSelectorExample.java
deleted file mode 100644
index 3f94bab..0000000
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TwoPaneElementSelectorExample.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.examples;
-
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-import org.eclipse.ui.dialogs.TwoPaneElementSelector;
-
-
-
-
-public class TwoPaneElementSelectorExample {
-
-
-	public static void main(String[] args) {
-		java.util.Random random= new java.util.Random();
-		Object[] elements= new Object[8000];
-		for (int i= 0; i < elements.length; i++)
-			elements[i]= new Integer(random.nextInt()).toString();
-		ILabelProvider elementRenderer= new org.eclipse.jface.viewers.LabelProvider() {
-			public String getText(Object element) {
-				return element.toString();
-			}
-		};
-		ILabelProvider qualfierRenderer= new org.eclipse.jface.viewers.LabelProvider() {
-			public String getText(Object element) {
-				return element.toString();
-			}
-		};
-		Display display= new Display();
-		TwoPaneElementSelector d= new TwoPaneElementSelector(new Shell(display), elementRenderer, qualfierRenderer);
-		d.setTitle("Title");
-		d.setMessage("this is a message");
-		d.setElements(elements);
-		
-		d.open();
-		
-		Object res= d.getResult();
-		System.out.println("res= "+res);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/launchconfigs/PerformanceTestSuite.launch b/org.eclipse.jdt.ui.tests/launchconfigs/PerformanceTestSuite.launch
deleted file mode 100644
index 09d7786..0000000
--- a/org.eclipse.jdt.ui.tests/launchconfigs/PerformanceTestSuite.launch
+++ /dev/null

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.ui.tests.performance.PerformanceTestSuite"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="location1" value="C:\e\runtime-test-workspace"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="vmargs" value="-Xms250M -Xmx250M -DInternalPrintPerformanceResults -Dperf_ctrl=dbloc="/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl de_CH -clean"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.ui.tests"/>
-<booleanAttribute key="askclear" value="false"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<stringAttribute key="location0" value="C:\e\runtime-test-workspace"/>
-</launchConfiguration>

diff --git a/org.eclipse.jdt.ui.tests/leaks/LeakTestExample.launch b/org.eclipse.jdt.ui.tests/leaks/LeakTestExample.launch
deleted file mode 100644
index dda86e6..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/LeakTestExample.launch
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.ui.tests.leaks.JavaLeakTest"/>
-<booleanAttribute key="tracing" value="true"/>
-<stringAttribute key="vminstall" value="jdk1.4.2_03"/>
-<stringAttribute key="location1" value="C:\workspaces\junit-workbench-workspace"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="vmargs" value="-XrunProfileNatives -Xmx256M"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="onePluginID" value=""/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl de_CH"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.ui.tests"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="onePlugin" value="false"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="PATH" value="%PATH%;${workspace_loc}\org.eclipse.jdt.ui.tests\leaks"/>
-</mapAttribute>
-<stringAttribute key="location0" value="C:\workspaces\junit-workbench-workspace"/>
-</launchConfiguration>

diff --git a/org.eclipse.jdt.ui.tests/leaks/ProfileNatives.dll b/org.eclipse.jdt.ui.tests/leaks/ProfileNatives.dll
deleted file mode 100644
index d333185..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/ProfileNatives.dll
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/LeakTestCase.java b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/LeakTestCase.java
deleted file mode 100644
index 18e4c5f..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/LeakTestCase.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.leaktest;
-
-import junit.framework.TestCase;
-
-
-
-/**
- * Base class for leak test cases. To use the offered functionality, the test case has to run
- * in a LeakTestSetup that establishes the profile connection.
- */
-public class LeakTestCase extends TestCase {
-	
-	public LeakTestCase(String name) {
-		super(name);
-	}
-
-	
-	/**
-	 * Assert that two counts are different. The method does not fail if the profile connection
-	 * has not established (e.g. because profiling is not supported on the given platform)
-	 * @param startCount
-	 * @param endCount
-	 */
-	protected void assertDifferentCount(int startCount, int endCount) {
-		assertDifferentCount(null, startCount, endCount);
-	}
-	
-	/**
-	 * Assert that two counts are different. The method does not fail if the profile connection
-	 * has not established (e.g. because profiling is not supported on the given platform)
-	 * @param message Message to be printed if the test fails.
-	 * @param startCount
-	 * @param endCount
-	 */
-	protected void assertDifferentCount(String message, int startCount, int endCount) {
-		ProfilerConnector connection= LeakTestSetup.getProfilerConnector();
-		if (connection != null && (startCount == endCount)) {
-			String str= message != null ? message + ": " : "";
-			assertTrue(str + "instance count is not different: (" + startCount + " / " + endCount + " )", false);
-		}
-	}
-	
-	/**
-	 * Assert that two counts are equal. The method does not fail if the profile connection
-	 * has not established (e.g. because profiling is not supported on the given platform)
-	 * @param startCount
-	 * @param endCount
-	 */
-	protected void assertEqualCount(int startCount, int endCount) {
-		assertEqualCount(null, startCount, endCount);
-	}
-	
-	/**
-	 * Assert that two counts are equal. The method does not fail if the profile connection
-	 * has not established (e.g. because profiling is not supported on the given platform)
-	 * @param message Message to be printed if the test fails.
-	 * @param startCount
-	 * @param endCount
-	 */
-	protected void assertEqualCount(String message, int startCount, int endCount) {
-		ProfilerConnector connection= LeakTestSetup.getProfilerConnector();
-		if (connection != null && (startCount != endCount)) {
-			// only compare if connection could be established
-			String str= message != null ? message + ": " : "";
-			assertTrue(str + "instance count is not the same: (" + startCount + " / " + endCount + " )", false);
-		}
-	}
-	
-	/**
-	 * Returns the number of instances of a given class that are live (not garbage).
-	 * @param cl The class of the instances to count
-	 * @return Returns the current number of instances of the given class or <code>-1</code> if
-	 * no connection is established.
-	 * @throws ProfileException ProfileException is thrown if the request failed unexpectedly.
-	 */
-	protected int getInstanceCount(Class cl) throws ProfileException {
-		ProfilerConnector connection= LeakTestSetup.getProfilerConnector();
-		if (connection != null) {
-			return connection.getInstanceCount(cl);
-		}
-		return -1;
-	}
-	
-	/**
-	 * Returns the number of instances of a given class that are live (not garbage).
-	 * @param cl The class of the instances to count
-	 * @return Returns the current number of instances of the given class or <code>-1</code> if
-	 * no connection is established.
-	 * @throws ProfileException ProfileException is thrown if the request failed unexpectedly.
-	 */
-	protected int getInstanceCount(Class cl, Class[] excludedClasses) throws ProfileException {
-		ProfilerConnector connection= LeakTestSetup.getProfilerConnector();
-		if (connection != null) {
-			return connection.getInstanceCount(cl, excludedClasses);
-		}
-		return -1;
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/LeakTestSetup.java b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/LeakTestSetup.java
deleted file mode 100644
index 78a314b..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/LeakTestSetup.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.leaktest;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-
-/**
- *
- */
-public class LeakTestSetup extends TestSetup {
-	
-	private static LeakTestSetup fgCurrentSetup= null;
-	private ProfilerConnector fConnection;
-	
-	/**
-	 * @return Returns the profiler Connection or <code>null</code> if no profiler connection
-	 * could be established (e.g. because not supported on the platform)
-	 */
-	public static ProfilerConnector getProfilerConnector() {
-		return fgCurrentSetup.getConnection();
-	}
-		
-		
-	public LeakTestSetup(Test test) {
-		super(test);
-		if (fgCurrentSetup == null) {
-			fgCurrentSetup= this;
-		}
-	}
-	
-	protected void setUp() throws Exception {
-		if (fgCurrentSetup != this) {
-			return;
-		}
-		try {
-			fConnection= new ProfilerConnector();
-		} catch (ProfileException e) {
-			fConnection= null;
-		}
-	}
-
-	protected void tearDown() throws Exception {
-		if (fgCurrentSetup != this) {
-			return;
-		}
-		fConnection.close();
-	}
-
-	/**
-	 * @return Returns the connection.
-	 */
-	public ProfilerConnector getConnection() {
-		return fConnection;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfileException.java b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfileException.java
deleted file mode 100644
index 07c5e4e..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfileException.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.leaktest;
-
-
-
-public class ProfileException extends Exception {
-
-	public ProfileException(String msg, Throwable e) {
-		super(msg, e);
-	}
-
-	public ProfileException(Throwable e) {
-		super(e);
-	}
-
-	public ProfileException(String msg) {
-		super(msg);
-	}
-
-}
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfileNatives.java b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfileNatives.java
deleted file mode 100644
index 04ce24c..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfileNatives.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.leaktest;
-
-import java.util.Vector;
-
-
-public class ProfileNatives {
-	private static boolean fgIsNativeLoaded= false;
-	static {
-		try {
-			System.loadLibrary("ProfileNatives");
-			fgIsNativeLoaded= isInitialized0();
-		} catch (UnsatisfiedLinkError e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private static native int getInstanceCount0(Class clazz, Class[] excludedClasses);
-	private static native boolean isInitialized0();
-
-	public static boolean isInitialized() {
-		return fgIsNativeLoaded;
-	}
-	
-	public static int getInstanceCount(Class clazz, Class[] excludedClasses) throws ProfileException {
-		int instanceCount= getInstanceCount0(clazz, excludedClasses);
-		if (instanceCount < 0)
-			throw new ProfileException("Could not get instance count");
-		return instanceCount;
-	}
-	
-	public static int getInstanceCount(Class clazz) throws ProfileException {
-		return getInstanceCount(clazz, new Class[0]);
-	}
-	
-	public static void main(String[] args) {
-		try {
-			System.out.println("count1= "+getInstanceCount(Vector.class));
-			MyThread t= new MyThread();
-			t.setObject(new Vector());
-			System.out.println("count2= "+getInstanceCount(Vector.class));
-			t.getObject();
-			t.doStop();
-			
-			System.out.println("count3= "+getInstanceCount(Vector.class));
-			Object o= new TestClass(new Vector()).createInner();
-			o.toString();
-			System.out.println("count4= "+getInstanceCount(Vector.class));
-			o= null;
-			System.out.println("count5= "+getInstanceCount(Vector.class));
-			
-			System.out.println("count6= "+getInstanceCount(Vector.class));
-			o= new TestClass(new Vector()).createAnon();
-			System.out.println("count7= "+getInstanceCount(Vector.class));
-			o= null;
-			System.out.println("count8= "+getInstanceCount(Vector.class));
-			} catch (ProfileException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-	
-	static class TestClass {
-		int fFoo;
-		Object fBar;
-		
-		TestClass(Object bar) {
-			fBar= bar;
-		}
-		
-		/**
-		 * @return
-		 */
-		public Object createAnon() {
-			return new Runnable() {
-
-				public void run() {
-					// TODO Auto-generated method stub
-					
-				}
-				
-			};
-		}
-
-		Object createInner() {
-			return new Inner();
-		}
-		
-		public class Inner {
-			
-		}
-	}
-	
-	static class MyThread extends Thread {
-		ThreadLocal fLocal;
-		boolean fStop= false;
-		MyThread() {
-			fLocal= new ThreadLocal();
-			this.start();
-		}
-		
-		public void setObject(Object foo) {
-			fLocal.set(foo);
-		}
-		
-		public Object getObject() {
-			return fLocal.get();
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Thread#run()
-		 */
-		public void run() {
-			while (!fStop) {
-				System.out.println("sleeping");
-				try {
-					Thread.sleep(1000);
-				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-			System.out.println("thread stopping");
-		}
-		
-		public void doStop() {
-			fStop= true;
-		}
-	}
-}
-	

diff --git a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfilerConnector.java b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfilerConnector.java
deleted file mode 100644
index deadd08..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/ProfilerConnector.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.leaktest;
-
-import java.util.Vector;
-
-/**
- *
- */
-public class ProfilerConnector {
-
-	public ProfilerConnector() throws ProfileException {
-		if (!ProfileNatives.isInitialized()) {
-			throw new ProfileException("Not connected to a profiler");
-		}
-	}
-	
-	public int getInstanceCount(Class cl) throws ProfileException {
-		return ProfileNatives.getInstanceCount(cl);
-	}
-
-	public int getInstanceCount(Class cl, Class[] excludedClasses) throws ProfileException {
-		return ProfileNatives.getInstanceCount(cl, excludedClasses);
-	}
-	
-	public void close() {
-	}
-	
-	
-	private static Vector fgReference;
-	
-	public static void main(String[] str) {
-		try {
-			ProfilerConnector pc= new ProfilerConnector(); //$NON-NLS-1$
-			System.out.println("Connection installed.\n"); //$NON-NLS-1$
-			System.out.println("instance count Vector: " + pc.getInstanceCount(Vector.class));
-			fgReference= new Vector();
-			fgReference.add(fgReference);
-			
-			System.out.println("instance count Vector: " + pc.getInstanceCount(Vector.class));
-			fgReference= null;
-			System.out.println("instance count Vector: " + pc.getInstanceCount(Vector.class));
-			
-			pc.close();
-		} catch (ProfileException e) {
-			e.printStackTrace();
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/example/LeakTestExample.java b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/example/LeakTestExample.java
deleted file mode 100644
index 53e3364..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/example/LeakTestExample.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.leaktest.example;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.leaktest.LeakTestCase;
-import org.eclipse.jdt.ui.leaktest.LeakTestSetup;
-
-
-public class LeakTestExample extends LeakTestCase {
-
-	private static final Class THIS= LeakTestExample.class;
-	
-	private static class MyClass {
-		char[] text= new char[1000];
-	}
-	
-
-	public static Test suite() {
-		return new LeakTestSetup(new TestSuite(THIS));
-	}
-	
-	private Object fGlobalReference;
-	
-
-	public LeakTestExample(String name) {
-		super(name);
-	}
-			
-	public void testLeakGlobalReference() throws Exception {
-		Class cl= MyClass.class;
-
-		// get the count before creating the instance
-		int count1= getInstanceCount(cl);
-		
-		// create the instance
-		fGlobalReference= new MyClass();
-
-		// get the count after creating the instance
-		int count2= getInstanceCount(cl);
-		assertDifferentCount("after creation: ", count1, count2);
-		
-		// clear all references to the instance
-		fGlobalReference= null;
-		
-		// get the count after clearing the reference of the instance
-		int count3= getInstanceCount(cl);
-		assertEqualCount("after clear: ", count1, count3);
-	}
-	
-	public void testNoLeakGlobalReference() throws Exception {
-		Class cl= MyClass.class;
-
-		// get the count before creating my instance
-		int count1= getInstanceCount(cl);
-		
-		// create the instance
-		fGlobalReference= new MyClass();
-
-		// get the count after creating the instance
-		int count2= getInstanceCount(cl);
-		assertDifferentCount("after creation: ", count1, count2);
-		
-		// add the instance to a list
-		ArrayList list= new ArrayList();
-		list.add(fGlobalReference);
-		
-		// clear the global references of the instance
-		fGlobalReference= null;
-		
-		// get the count after clearing the global reference of the instance
-		// instance should still be here, it is referenced in the list
-		int count3= getInstanceCount(cl);
-		assertEqualCount("after clear: ", count2, count3);
-	}
-	
-	public void testLeakLocalReference() throws Exception {
-		Class cl= MyClass.class;
-
-		int count1= getInstanceCount(cl);
-		
-		MyClass reference= new MyClass();
-		
-		int count2= getInstanceCount(cl);
-		assertDifferentCount("after creation: ", count1, count2);
-		
-		reference.toString();
-		reference= null;
-		
-		int count3= getInstanceCount(cl);
-		assertEqualCount("after clear: ", count1, count3);
-	}
-	
-	public void testNoLeakLocalReference() throws Exception {
-		Class cl= MyClass.class;
-
-		int count1= getInstanceCount(cl);
-		
-		MyClass reference= new MyClass();
-
-		int count2= getInstanceCount(cl);
-		assertDifferentCount("after creation: ", count1, count2);
-		
-		ArrayList list= new ArrayList();
-		list.add(reference);
-		
-		reference= null;
-		
-		int count3= getInstanceCount(cl);
-		assertEqualCount("after clear: ", count2, count3);
-	}
-	
-
-}

diff --git a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java
deleted file mode 100644
index 4aa7da2..0000000
--- a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java
+++ /dev/null

@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.leaks;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.INewWizard;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.ui.leaktest.LeakTestCase;
-import org.eclipse.jdt.ui.leaktest.LeakTestSetup;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jdt.internal.ui.text.JavaReconciler;
-import org.eclipse.jdt.internal.ui.wizards.JavaProjectWizard;
-import org.eclipse.jdt.internal.ui.wizards.NewClassCreationWizard;
-import org.eclipse.jdt.internal.ui.wizards.NewInterfaceCreationWizard;
-
-public class JavaLeakTest extends LeakTestCase {
-	
-	private IJavaProject fJProject1;
-
-	private static final Class THIS= JavaLeakTest.class;
-	
-	public JavaLeakTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		if (true) {
-			return new LeakTestSetup(new TestSuite(THIS));
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new JavaLeakTest("testLeak"));
-			return new LeakTestSetup(suite);
-		}	
-	}
-
-
-	protected void setUp() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		assertTrue("rt not found", JavaProjectHelper.addRTJar(fJProject1) != null);
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fJProject1);
-	}
-
-	private ICompilationUnit createTestCU(String typeName) throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack0", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("public class "+typeName+" {\n}\n");
-		return pack2.createCompilationUnit(typeName+".java", buf.toString(), false, null);
-	}
-	
-
-	public void testJavaEditorClose() throws Exception {
-		final Class cl= CompilationUnitEditor.class;
-		
-		// known reference via a ThreadLocal ref to JavaReconciler.BackgroundThread
-		final Class[] excludedClasses= new Class[] { JavaReconciler.class };
-
-		// count before opening the editor
-		final int count1= getInstanceCount(cl, excludedClasses);
-		
-		// open an editor on a CU
-		ICompilationUnit unit= createTestCU("List1");
-		IEditorPart part= EditorUtility.openInEditor(unit);
-		// make sure the received instance has the type we're expecting
-		assertEquals(part.getClass(), cl);
-
-		int count2= getInstanceCount(cl, excludedClasses);
-		assertDifferentCount("JavaEditor", count1, count2);
-		
-		// close the editor
-		boolean res= JavaPlugin.getActivePage().closeEditor(part, false);
-		part= null;
-		assertTrue("Could not close editor", res);
-		
-		final boolean[] runnableFinished= new boolean[] { false };
-		
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				runnableFinished[0]= true;
-			}
-		});
-		// closing editors is posted via the event queue.
-		while (!runnableFinished[0])
-			Display.getDefault().readAndDispatch();
-		int count3 = getInstanceCount(cl, excludedClasses);
-		assertEqualCount("JavaEditor", count1, count3);
-	}
-
-	public void testJavaEditorCloseAll() throws Exception {
-		final Class cl= CompilationUnitEditor.class;
-		
-		// known reference via a ThreadLocal ref to JavaReconciler.BackgroundThread
-		final Class[] excludedClasses= new Class[] { JavaReconciler.class };
-
-		// count before opening the editor
-		final int count1= getInstanceCount(cl, excludedClasses);
-		
-		// open an editor on a CU
-		ICompilationUnit unit= createTestCU("List2");
-		IEditorPart part= EditorUtility.openInEditor(unit);
-		// make sure the received instance has the type we're expecting
-		assertEquals(part.getClass(), cl);
-
-		int count2= getInstanceCount(cl, excludedClasses);
-		assertDifferentCount("JavaEditor", count1, count2);
-		
-		// close the editor
-		boolean res= JavaPlugin.getActivePage().closeAllEditors(false);
-		part= null;
-		assertTrue("Could not close editor", res);
-		
-		final boolean[] runnableFinished= new boolean[] { false };
-		
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				runnableFinished[0]= true;
-			}
-		});
-		// closing editors is posted via the event queue.
-		while (!runnableFinished[0])
-			Display.getDefault().readAndDispatch();
-		int count3 = getInstanceCount(cl, excludedClasses);
-		assertEqualCount("JavaEditor", count1, count3);
-	}
-	
-	public void testNewClassWizard() throws Exception {
-		int count1= getInstanceCount(NewClassCreationWizard.class);
-		doWizardLeakTest(new NewClassCreationWizard());
-		int count2= getInstanceCount(NewClassCreationWizard.class);
-		assertEqualCount("NewClassCreationWizard", count1, count2);
-	}
-	
-	public void testNewInterfaceWizard() throws Exception {
-		int count1= getInstanceCount(NewInterfaceCreationWizard.class);
-		doWizardLeakTest(new NewInterfaceCreationWizard());
-		int count2= getInstanceCount(NewInterfaceCreationWizard.class);
-		assertEqualCount("NewInterfaceCreationWizard", count1, count2);
-	}
-	
-	public void testNewJavaProjectWizard() throws Exception {
-		int count1= getInstanceCount(JavaProjectWizard.class);
-		doWizardLeakTest(new JavaProjectWizard());
-		int count2= getInstanceCount(JavaProjectWizard.class);
-		assertEqualCount("NewProjectCreationWizard", count1, count2);
-	}		
-	
-	private void doWizardLeakTest(INewWizard wizard) throws Exception {
-		wizard.init(JavaPlugin.getDefault().getWorkbench(), new StructuredSelection(fJProject1));
-		
-		Shell shell= JavaPlugin.getActiveWorkbenchShell();
-		WizardDialog dialog= new WizardDialog(shell, wizard);
-		dialog.setBlockOnOpen(false);
-		dialog.create();
-		dialog.open();
-		
-		dialog.close();
-		wizard= null;
-		dialog= null;
-	}	
-	
-
-}

diff --git a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/FileTool.java b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/FileTool.java
deleted file mode 100644
index 4907773..0000000
--- a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/FileTool.java
+++ /dev/null

@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.performance;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-
-public class FileTool {
-	
-	/**
-	 * A buffer.
-	 */
-	private static byte[] fgBuffer = new byte[8192];
-	
-	/**
-	 * Unzips the given zip file to the given destination directory
-	 * extracting only those entries the pass through the given
-	 * filter.
-	 * 
-	 * @param zipFile the zip file to unzip
-	 * @param dstDir the destination directory
-	 * @throws IOException
-	 */
-	public static void unzip(ZipFile zipFile, File dstDir) throws IOException {
-		unzip(zipFile, dstDir, dstDir, 0);
-	}
-	
-	private static void unzip(ZipFile zipFile, File rootDstDir, File dstDir, int depth) throws IOException {
-	
-		Enumeration entries = zipFile.entries();
-	
-		try {
-			while(entries.hasMoreElements()){
-				ZipEntry entry = (ZipEntry)entries.nextElement();
-				if(entry.isDirectory()){
-					continue;
-				}
-				String entryName = entry.getName();
-				File file = new File(dstDir, changeSeparator(entryName, '/', File.separatorChar));
-				file.getParentFile().mkdirs();
-				InputStream src = null;
-				OutputStream dst = null;
-				try {
-					src = zipFile.getInputStream(entry);
-					dst = new FileOutputStream(file);
-					transferData(src, dst);
-				} finally {
-					if(dst != null){
-						try {
-							dst.close();
-						} catch(IOException e){
-						}
-					}
-					if(src != null){
-						try {
-							src.close();
-						} catch(IOException e){
-						}
-					}
-				}
-			}
-		} finally {
-			try {
-				zipFile.close();
-			} catch(IOException e){
-			}
-		}
-	}
-	/**
-	 * Returns the given file path with its separator
-	 * character changed from the given old separator to the
-	 * given new separator.
-	 * 
-	 * @param path a file path
-	 * @param oldSeparator a path separator character
-	 * @param newSeparator a path separator character
-	 * @return the file path with its separator character
-	 * changed from the given old separator to the given new
-	 * separator
-	 */
-	public static String changeSeparator(String path, char oldSeparator, char newSeparator){
-		return path.replace(oldSeparator, newSeparator);
-	}
-	
-	/**
-	 * Copies all bytes in the given source file to
-	 * the given destination file.
-	 * 
-	 * @param source the given source file
-	 * @param destination the given destination file
-	 * @throws IOException
-	 */
-	public static void transferData(File source, File destination) throws IOException {
-		destination.getParentFile().mkdirs();
-		InputStream is = null;
-		OutputStream os = null;
-		try {
-			is = new FileInputStream(source);
-			os = new FileOutputStream(destination);
-			transferData(is, os);
-		} finally {
-			if(os != null){
-				try {
-					os.close();
-				} catch(IOException e){
-				}
-			}
-			if(is != null){
-				try {
-					is.close();
-				} catch(IOException e){
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Copies all bytes in the given source stream to
-	 * the given destination stream. Neither streams
-	 * are closed.
-	 * 
-	 * @param source the given source stream
-	 * @param destination the given destination stream
-	 * @throws IOException
-	 */
-	public static void transferData(InputStream source, OutputStream destination) throws IOException {
-		int bytesRead = 0;
-		while(bytesRead != -1){
-			bytesRead = source.read(fgBuffer, 0, fgBuffer.length);
-			if(bytesRead != -1){
-				destination.write(fgBuffer, 0, bytesRead);
-			}
-		}
-	}
-
-	/**
-	 * Copies the given source file to the given destination file.
-	 * 
-	 * @param src the given source file
-	 * @param dst the given destination file
-	 * @throws IOException
-	 */
-	public static void copy(File src, File dst) throws IOException {
-		if(src.isDirectory()){
-			String[] srcChildren = src.list();
-			for(int i = 0; i < srcChildren.length; ++i){
-				File srcChild= new File(src, srcChildren[i]);
-				File dstChild= new File(dst, srcChildren[i]);
-				copy(srcChild, dstChild);
-			}
-		} else
-			transferData(src, dst);
-	}
-
-	public static File getFileInPlugin(Plugin plugin, IPath path) {
-		try {
-			URL installURL= plugin.getBundle().getEntry(path.toString());
-			URL localURL= Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-
-	public static StringBuffer read(String fileName) throws IOException {
-		return read(new FileReader(fileName));
-	}
-
-	public static StringBuffer read(Reader reader) throws IOException {
-		StringBuffer s= new StringBuffer();
-		try {
-			char[] buffer= new char[8196];
-			int chars= reader.read(buffer);
-			while (chars != -1) {
-				s.append(buffer, 0, chars);
-				chars= reader.read(buffer);
-			}
-		} finally {
-			try {
-				reader.close();
-			} catch (IOException e) {
-			}
-		}
-		return s;
-	}
-
-	public static void write(String fileName, StringBuffer content) throws IOException {
-		Writer writer= new FileWriter(fileName);
-		try {
-			writer.write(content.toString());
-		} finally {
-			try {
-				writer.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/JdtPerformanceTestCase.java b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/JdtPerformanceTestCase.java
deleted file mode 100644
index 664ec7c..0000000
--- a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/JdtPerformanceTestCase.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.performance;
-
-import java.util.ArrayList;
-
-import org.eclipse.test.performance.PerformanceTestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.ITypeNameRequestor;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-
-import org.eclipse.jdt.internal.corext.util.AllTypesCache;
-
-public class JdtPerformanceTestCase extends PerformanceTestCase {
-
-	private static class Requestor implements ITypeNameRequestor {
-		public void acceptClass(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-		}
-		public void acceptInterface(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-		}
-	}
-
-	public JdtPerformanceTestCase() {
-		super();
-	}
-	
-	public JdtPerformanceTestCase(String name) {
-		super(name);
-	}
-	
-	protected void joinBackgroudActivities() throws CoreException {
-		// Join Building
-		boolean interrupted= true;
-		while (interrupted) {
-			try {
-				Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-				interrupted= false;
-			} catch (InterruptedException e) {
-				interrupted= true;
-			}
-		}
-		// Join indexing
-		new SearchEngine().searchAllTypeNames(
-			null,
-			null,
-			SearchPattern.R_EXACT_MATCH,
-			IJavaSearchConstants.CLASS,
-			SearchEngine.createJavaSearchScope(new IJavaElement[0]),
-			new Requestor(),
-			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-			null);
-		// Join all types cache
-		AllTypesCache.getTypes(SearchEngine.createJavaSearchScope(new IJavaElement[0]), 
-			IJavaSearchConstants.CLASS, new NullProgressMonitor(), new ArrayList());
-	}
-
-	protected void finishMeasurements() {
-		stopMeasuring();
-		commitMeasurements();
-		assertPerformance();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/PerformanceTestSuite.java b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/PerformanceTestSuite.java
deleted file mode 100644
index 2924a42..0000000
--- a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/PerformanceTestSuite.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.performance.views.PackageExplorerPerfTest;
-import org.eclipse.jdt.ui.tests.performance.views.TypeHierarchyPerfTest;
-
-public class PerformanceTestSuite {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("jdt.ui performance tests");
-		
-		suite.addTest(TypeHierarchyPerfTest.suite());
-		suite.addTest(PackageExplorerPerfTest.suite());
-		
-		return suite;
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/SWTTestProject.java b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/SWTTestProject.java
deleted file mode 100644
index e313d25..0000000
--- a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/SWTTestProject.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.performance;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-
-public class SWTTestProject {
-	
-	public static final String PROJECT= "org.eclipse.swt";
-	private static final String PROJECT_ZIP= "/testResources/org.eclipse.swt-R3_0.zip";
-
-	private IJavaProject fProject;
-	
-	public SWTTestProject() throws Exception {
-		setUpProject();
-	}
-	
-	public IJavaProject getProject() {
-		return fProject;
-	}
-	
-	public void delete() throws Exception {
-		if (fProject != null && fProject.exists()) {
-			JavaProjectHelper.delete(fProject);
-		}
-	}
-	
-	private void setUpProject() throws IOException, ZipException, CoreException {
-		String workspacePath= ResourcesPlugin.getWorkspace().getRoot().getLocation().toString() + "/";
-		FileTool.unzip(new ZipFile(FileTool.getFileInPlugin(JavaTestPlugin.getDefault(), new Path(PROJECT_ZIP))), new File(workspacePath));
-		File oldFile= new File(workspacePath + PROJECT + "/.classpath_win32");
-		File newFile= new File(workspacePath + PROJECT + "/.classpath");
-		Assert.assertTrue(oldFile.renameTo(newFile));
-
-		IProject project= createExistingProject(PROJECT);
-		fProject= JavaCore.create(project);
-		Assert.assertTrue(fProject.exists());
-	}
-
-	private IProject createExistingProject(String projectName) throws CoreException {
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IProject project= workspace.getRoot().getProject(projectName);
-		IProjectDescription description= workspace.newProjectDescription(projectName);
-		description.setLocation(null);
-
-		project.create(description, null);
-		project.open(null);
-		return project;
-	}	
-}

diff --git a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/PackageExplorerPerfTest.java b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/PackageExplorerPerfTest.java
deleted file mode 100644
index 5c62fca..0000000
--- a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/PackageExplorerPerfTest.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.performance.views;
-
-import java.io.File;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.tests.performance.JdtPerformanceTestCase;
-
-public class PackageExplorerPerfTest extends JdtPerformanceTestCase {
-
-	private static class MyTestSetup extends TestSetup {
-		public static final String SRC_CONTAINER= "src";
-		
-		public static IJavaProject fJProject1;
-		public static IPackageFragmentRoot fJunitSrcRoot;
-		
-		public MyTestSetup(Test test) {
-			super(test);
-		}
-		protected void setUp() throws Exception {
-			fJProject1= JavaProjectHelper.createJavaProject("Testing", "bin");
-			assertTrue("rt not found", JavaProjectHelper.addRTJar(fJProject1) != null);
-			File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-			fJunitSrcRoot= JavaProjectHelper.addSourceContainerWithImport(fJProject1, SRC_CONTAINER, junitSrcArchive);
-		}
-		protected void tearDown() throws Exception {
-			if (fJProject1 != null && fJProject1.exists())
-				JavaProjectHelper.delete(fJProject1);
-		}
-	}
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite("PackageExplorerPerfTest");
-		suite.addTest(new PackageExplorerPerfTest("testOpen"));
-		suite.addTest(new PackageExplorerPerfTest("testSelect"));
-		suite.addTest(new PackageExplorerPerfTest("testExpand"));
-		return new MyTestSetup(suite);
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new MyTestSetup(someTest);
-	}
-	
-	public PackageExplorerPerfTest(String name) {
-		super(name);
-	}
-	
-	public void testOpen() throws Exception {
-		joinBackgroudActivities();
-		IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		startMeasuring();
-		page.showView(JavaUI.ID_PACKAGES);
-		finishMeasurements();
-	}
-	
-	public void testSelect() throws Exception {
-		joinBackgroudActivities();
-		TreeViewer viewer= getViewer();
-		StructuredSelection selection= new StructuredSelection(MyTestSetup.fJProject1);
-		startMeasuring();
-		viewer.setSelection(selection);
-		finishMeasurements();
-	}
-	
-	public void testExpand() throws Exception {
-		joinBackgroudActivities();
-		TreeViewer viewer= getViewer();
-		startMeasuring();
-		viewer.expandToLevel(MyTestSetup.fJProject1, 1);
-		finishMeasurements();
-	}
-	
-	private TreeViewer getViewer() {
-		IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		return ((PackageExplorerPart)page.findView(JavaUI.ID_PACKAGES)).getTreeViewer();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/TypeHierarchyPerfTest.java b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/TypeHierarchyPerfTest.java
deleted file mode 100644
index 1fcf2ab..0000000
--- a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/TypeHierarchyPerfTest.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.performance.views;
-
-import java.io.File;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.util.OpenTypeHierarchyUtil;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.jdt.ui.tests.performance.JdtPerformanceTestCase;
-
-public class TypeHierarchyPerfTest extends JdtPerformanceTestCase {
-
-	private static class MyTestSetup extends TestSetup {
-		public static final String SRC_CONTAINER= "src";
-		
-		public static IJavaProject fJProject1;
-		public static IPackageFragmentRoot fJunitSrcRoot;
-		
-		public MyTestSetup(Test test) {
-			super(test);
-		}
-		
-		protected void setUp() throws Exception {
-			fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-			assertTrue("rt not found", JavaProjectHelper.addRTJar(fJProject1) != null);
-			File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-			fJunitSrcRoot= JavaProjectHelper.addSourceContainerWithImport(fJProject1, SRC_CONTAINER, junitSrcArchive);
-		}
-	
-		protected void tearDown() throws Exception {
-			if (fJProject1 != null && fJProject1.exists())
-				JavaProjectHelper.delete(fJProject1);
-		}
-	}
-	
-	public static Test suite() {
-		return new MyTestSetup(new TestSuite(TypeHierarchyPerfTest.class));
-	}
-
-	public static Test setUpTest(Test someTest) {
-		return new MyTestSetup(someTest);
-	}
-	
-	public void testOpenObjectHierarchy() throws Exception {
-		//cold
-		measureOpenHierarchy(MyTestSetup.fJProject1.findType("java.lang.Object"));
-	}
-	
-	public void testOpenCollHierarchy() throws Exception {
-		//junit source folder
-		measureOpenHierarchy(MyTestSetup.fJunitSrcRoot);
-	}
-	
-	public void testOpenObjectHierarchy2() throws Exception {
-		//warm
-		measureOpenHierarchy(MyTestSetup.fJProject1.findType("java.lang.Object"));
-	}
-	
-	private void measureOpenHierarchy(IJavaElement element) throws Exception {
-		joinBackgroudActivities();
-		
-		startMeasuring();
-		
-		OpenTypeHierarchyUtil.open(element, JavaPlugin.getActiveWorkbenchWindow());
-
-		stopMeasuring();
-		commitMeasurements();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/plugin.properties b/org.eclipse.jdt.ui.tests/plugin.properties
deleted file mode 100644
index 0b15d33..0000000
--- a/org.eclipse.jdt.ui.tests/plugin.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-Plugin.name= Java Test Plugin
-Plugin.providerName= Eclipse.org
-javaElementDecorator.label= Java Element Decorator
-
-AddTestMarkersAction.label= Add Test Markers
-AddTestMarkersAction.tooltip= Add Test Markers
-
-exampleQuickFixProcessor.name= Example Quick Fix Processor
-exampleQuickAssistProcessor.name= Example Quick Assist Processor

diff --git a/org.eclipse.jdt.ui.tests/plugin.xml b/org.eclipse.jdt.ui.tests/plugin.xml
deleted file mode 100644
index 8367ad2..0000000
--- a/org.eclipse.jdt.ui.tests/plugin.xml
+++ /dev/null

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.ui.tests"
-   name="%Plugin.name"
-   version="3.1.0"
-   provider-name="%Plugin.providerName"
-   class="org.eclipse.jdt.testplugin.JavaTestPlugin">
-
-   <runtime>
-      <library name="javauitests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.search"/>
-	  <import plugin="org.eclipse.ltk.core.refactoring"/>
-	  <import plugin="org.eclipse.test.performance"/>
-   </requires>
-
-
-<!-- **************** TEST DECORATOR ******************* -->
-   <extension
-         point="org.eclipse.ui.decorators">
-      <decorator
-            objectClass="org.eclipse.jdt.core.IJavaElement"
-            adaptable="true"
-            label="%javaElementDecorator.label"
-            state="false"
-            class="org.eclipse.jdt.testplugin.JavaElementDecorator"
-            id="org.eclipse.jdt.ui.tests.javaElementDecorator">
-      </decorator>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="MochPluginView"
-            class="org.eclipse.jdt.ui.tests.packageview.MockPluginView"
-            id="org.eclipse.jdt.ui.tests.packageview.MockPluginView">
-      </view>
-      <view
-            name="MockPluginView"
-            class="org.eclipse.jdt.ui.tests.browsing.MockPluginView"
-            id="org.eclipse.jdt.ui.tests.browsing.MockPluginView">
-      </view>
-   </extension>
-<!-- **************** TEST MARKER for quick fix ******************* -->
-   <extension
-         id="testmarker"
-         name="jdt-test-problem"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.core.resources.textmarker">
-      </super>
-   </extension>
-   <extension
-         point="org.eclipse.ui.ide.markerResolution">
-      <markerResolutionGenerator
-            markerType="org.eclipse.jdt.ui.tests.testmarker"
-            class="org.eclipse.jdt.ui.tests.quickfix.MarkerResolutionGenerator">
-      </markerResolutionGenerator>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.ICompilationUnit"
-            id="org.eclipse.jdt.ui.examples.AddTestMarkersAction">
-         <action
-               label="%AddTestMarkersAction.label"
-               tooltip="%AddTestMarkersAction.tooltip"
-               class="org.eclipse.jdt.ui.examples.AddTestMarkersAction"
-               menubarPath="AddTestMarkers"
-               enablesFor="1"
-               id="addTestmarkers">
-         </action>
-      </objectContribution>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.ui.quickFixProcessors">
-      <quickFixProcessor
-            name="%exampleQuickFixProcessor.name"
-            class="org.eclipse.jdt.ui.examples.MyQuickFixProcessor"
-            id="org.eclipse.jdt.ui.examples.MyQuickFixProcessor">
-         <enablement>
-           <with variable="compilationUnit">
-            <adapt
-                  type="org.eclipse.core.resources.IResource">
-               <test
-                     value="A.java"
-                     property="org.eclipse.jdt.internal.ui.matchesPattern">
-               </test>
-            </adapt>
-           </with>
-         </enablement>
-      </quickFixProcessor>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.ui.quickAssistProcessors">
-      <quickAssistProcessor
-            name="%exampleQuickAssistProcessor.name"
-            class="org.eclipse.jdt.ui.examples.MyQuickAssistProcessor"
-            id="org.eclipse.jdt.ui.examples.MyQuickAssistProcessor">
-         <enablement>
-           <with variable="projectNatures">
-              <iterate operator="or">
-                 <equals value="org.eclipse.jdt.core.javanature"/>
-              </iterate>
-           </with>
-         </enablement>
-      </quickAssistProcessor>
-   </extension>
-
-</plugin>

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaElementDecorator.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaElementDecorator.java
deleted file mode 100644
index 84cca01..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaElementDecorator.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-
-/**
- * Allows to test decorators for Java elements
- */
-public class JavaElementDecorator extends LabelProvider implements ILabelDecorator {
-
-	/*
-	 * @see ILabelDecorator#decorateImage(Image, Object)
-	 */
-	public Image decorateImage(Image image, Object element) {
-		return null;
-	}
-
-	/*
-	 * @see ILabelDecorator#decorateText(String, Object)
-	 */
-	public String decorateText(String text, Object element) {
-		return text + "*";
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaProjectHelper.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaProjectHelper.java
deleted file mode 100644
index cd539f7..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaProjectHelper.java
+++ /dev/null

@@ -1,560 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.zip.ZipFile;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.ITypeNameRequestor;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.util.CoreUtility;
-
-/**
- * Helper methods to set up a IJavaProject.
- */
-public class JavaProjectHelper {
-	
-	public static final IPath RT_STUBS= new Path("testresources/rtstubs.jar");
-	public static final IPath RT15_STUBS= new Path("testresources/rtstubs.jar"); // TODO: create rt15 stubs
-	public static final IPath JUNIT_SRC= new Path("testresources/junit37-noUI-src.zip");
-	
-	public static final IPath MYLIB= new Path("testresources/mylib.jar");
-	
-	private static final int MAX_RETRY= 5;
-		
-	/**
-	 * Creates a IJavaProject.
-	 */	
-	public static IJavaProject createJavaProject(String projectName, String binFolderName) throws CoreException {
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IProject project= root.getProject(projectName);
-		if (!project.exists()) {
-			project.create(null);
-		} else {
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-		}
-		
-		if (!project.isOpen()) {
-			project.open(null);
-		}
-		
-		IPath outputLocation;
-		if (binFolderName != null && binFolderName.length() > 0) {
-			IFolder binFolder= project.getFolder(binFolderName);
-			if (!binFolder.exists()) {
-				CoreUtility.createFolder(binFolder, false, true, null);
-			}
-			outputLocation= binFolder.getFullPath();
-		} else {
-			outputLocation= project.getFullPath();
-		}
-		
-		if (!project.hasNature(JavaCore.NATURE_ID)) {
-			addNatureToProject(project, JavaCore.NATURE_ID, null);
-		}
-		
-		IJavaProject jproject= JavaCore.create(project);
-		
-		jproject.setOutputLocation(outputLocation, null);
-		jproject.setRawClasspath(new IClasspathEntry[0], null);
-		
-		return jproject;	
-	}
-	
-	/**
-	 * Creates a Java project with JUnit source.
-	 * 
-	 * @param projectName the project name
-	 * @param srcContainerName the source container name
-	 * @param outputFolderName the output folder name
-	 * @return the IJavaProject
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws InvocationTargetException
-	 * @since 3.1
-	 */	
-	public static IJavaProject createJavaProjectWithJUnitSource(String projectName, String srcContainerName, String outputFolderName) throws CoreException, IOException, InvocationTargetException {
-		IJavaProject project= createJavaProject(projectName, outputFolderName); //$NON-NLS-2$
-		
-		IPackageFragmentRoot jdk= JavaProjectHelper.addVariableRTJar(project, "JRE_LIB_TEST", null, null);//$NON-NLS-1$
-		Assert.assertNotNull(jdk);
-		
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		Assert.assertTrue(junitSrcArchive != null && junitSrcArchive.exists());
-		
-		JavaProjectHelper.addSourceContainerWithImport(project, srcContainerName, junitSrcArchive);
-		
-		return project;
-	}
-
-	
-	/**
-	 * Sets the compiler options to 1.5
-	 * @param options The compiler options to configure
-	 */	
-	public static void set15CompilerOptions(Map options) {
-		options.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_5);
-		options.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.ERROR);
-		options.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_5);
-		options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_5);
-	}
-	
-	/**
-	 * Sets the compiler options to 1.4
-	 * @param options The compiler options to configure
-	 */	
-	public static void set14CompilerOptions(Map options) {
-		options.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_4);
-		options.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.ERROR);
-		options.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_3);
-		options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_2);
-	}
-	
-	/**
-	 * Removes a IJavaProject.
-	 */		
-	public static void delete(final IJavaProject jproject) throws CoreException {
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				performDummySearch();
-				jproject.setRawClasspath(new IClasspathEntry[0], jproject.getProject().getFullPath(), null);
-				for (int i= 0; i < MAX_RETRY; i++) {
-					try {
-						jproject.getProject().delete(true, true, null);
-						i= MAX_RETRY;
-					} catch (CoreException e) {
-						if (i == MAX_RETRY - 1) {
-							JavaPlugin.log(e);
-							throw e;
-						}
-						try {
-							Thread.sleep(1000); // sleep a second
-						} catch (InterruptedException e1) {
-						} 
-					}
-				}
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, null);	
-		
-	}
-
-	/**
-	 * Removes all files in the project and sets the given classpath
-	 */			
-	public static void clear(final IJavaProject jproject, final IClasspathEntry[] entries) throws CoreException {
-		performDummySearch();
-		
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				jproject.setRawClasspath(entries, null);
-		
-				IResource[] resources= jproject.getProject().members();
-				for (int i= 0; i < resources.length; i++) {
-					if (!resources[i].getName().startsWith(".")) {
-						resources[i].delete(true, null);
-					}
-				}
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, null);
-	}
-	
-
-	public static void performDummySearch() throws JavaModelException {
-		new SearchEngine().searchAllTypeNames(
-			null,
-			null,
-			SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE,
-			IJavaSearchConstants.CLASS,
-			SearchEngine.createJavaSearchScope(new IJavaElement[0]),
-			new Requestor(),
-			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-			null);
-	}
-
-
-	/**
-	 * Adds a source container to a IJavaProject.
-	 */		
-	public static IPackageFragmentRoot addSourceContainer(IJavaProject jproject, String containerName) throws CoreException {
-		return addSourceContainer(jproject, containerName, new Path[0]);
-	}
-
-	/**
-	 * Adds a source container to a IJavaProject.
-	 */		
-	public static IPackageFragmentRoot addSourceContainer(IJavaProject jproject, String containerName, IPath[] exclusionFilters) throws CoreException {
-		return addSourceContainer(jproject, containerName, new Path[0], exclusionFilters);
-	}
-	
-	/**
-	 * Adds a source container to a IJavaProject.
-	 */		
-	public static IPackageFragmentRoot addSourceContainer(IJavaProject jproject, String containerName, IPath[] inclusionFilters, IPath[] exclusionFilters) throws CoreException {
-		IProject project= jproject.getProject();
-		IContainer container= null;
-		if (containerName == null || containerName.length() == 0) {
-			container= project;
-		} else {
-			IFolder folder= project.getFolder(containerName);
-			if (!folder.exists()) {
-				CoreUtility.createFolder(folder, false, true, null);
-			}
-			container= folder;
-		}
-		IPackageFragmentRoot root= jproject.getPackageFragmentRoot(container);
-		
-		IClasspathEntry cpe= JavaCore.newSourceEntry(root.getPath(), inclusionFilters, exclusionFilters, null);
-		addToClasspath(jproject, cpe);		
-		return root;
-	}
-
-	/**
-	 * @deprecated use addSourceContainerWithImport(IJavaProject jproject, String containerName, File zipFile) to make sure that the zip file is correctly closed
-	 */	
-	public static IPackageFragmentRoot addSourceContainerWithImport(IJavaProject jproject, String containerName, ZipFile zipFile) throws InvocationTargetException, CoreException {
-		return addSourceContainerWithImport(jproject, containerName, zipFile, new Path[0]);
-	}
-	
-	/**
-	 * Adds a source container to a IJavaProject and imports all files contained
-	 * in the given Zip file.
-	 */		
-	public static IPackageFragmentRoot addSourceContainerWithImport(IJavaProject jproject, String containerName, File zipFile) throws InvocationTargetException, CoreException, IOException {
-		return addSourceContainerWithImport(jproject, containerName, zipFile, new Path[0]);
-	}
-
-	/**
-	 * @deprecated use addSourceContainerWithImport(IJavaProject jproject, String containerName, File zipFile, IPath[]) to make sure that the zip file is correctly closed
-	 */
-	public static IPackageFragmentRoot addSourceContainerWithImport(IJavaProject jproject, String containerName, ZipFile zipFile, IPath[] exclusionFilters) throws InvocationTargetException, CoreException {
-		IPackageFragmentRoot root= addSourceContainer(jproject, containerName, exclusionFilters);
-		importFilesFromZip(zipFile, root.getPath(), null);
-		return root;
-	}
-
-	/**
-	 * Adds a source container to a IJavaProject and imports all files contained
-	 * in the given Zip file.
-	 */		
-	public static IPackageFragmentRoot addSourceContainerWithImport(IJavaProject jproject, String containerName, File zipFile, IPath[] exclusionFilters) throws InvocationTargetException, CoreException, IOException {
-		ZipFile file= new ZipFile(zipFile);
-		try {
-			IPackageFragmentRoot root= addSourceContainer(jproject, containerName, exclusionFilters);
-			importFilesFromZip(file, root.getPath(), null);
-			return root;
-		} finally {
-			if (file != null) {
-				file.close();
-			}
-		}
-	}	
-
-	/**
-	 * Removes a source folder from a IJavaProject.
-	 */		
-	public static void removeSourceContainer(IJavaProject jproject, String containerName) throws CoreException {
-		IFolder folder= jproject.getProject().getFolder(containerName);
-		removeFromClasspath(jproject, folder.getFullPath());
-		folder.delete(true, null);
-	}
-
-	/**
-	 * Adds a library entry to a IJavaProject.
-	 */	
-	public static IPackageFragmentRoot addLibrary(IJavaProject jproject, IPath path) throws JavaModelException {
-		return addLibrary(jproject, path, null, null);
-	}
-
-	/**
-	 * Adds a library entry with source attchment to a IJavaProject.
-	 */			
-	public static IPackageFragmentRoot addLibrary(IJavaProject jproject, IPath path, IPath sourceAttachPath, IPath sourceAttachRoot) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newLibraryEntry(path, sourceAttachPath, sourceAttachRoot);
-		addToClasspath(jproject, cpe);
-		return jproject.getPackageFragmentRoot(path.toString());
-	}
-
-
-	/**
-	 * Copies the library into the project and adds it as library entry.
-	 */			
-	public static IPackageFragmentRoot addLibraryWithImport(IJavaProject jproject, IPath jarPath, IPath sourceAttachPath, IPath sourceAttachRoot) throws IOException, CoreException {
-		IProject project= jproject.getProject();
-		IFile newFile= project.getFile(jarPath.lastSegment());
-		InputStream inputStream= null;
-		try {
-			inputStream= new FileInputStream(jarPath.toFile()); 
-			newFile.create(inputStream, true, null);
-		} finally {
-			if (inputStream != null) {
-				try { inputStream.close(); } catch (IOException e) { }
-			}
-		}				
-		return addLibrary(jproject, newFile.getFullPath(), sourceAttachPath, sourceAttachRoot);
-	}	
-
-	/**
-	 * Creates and adds a class folder to the class path.
-	 */			
-	public static IPackageFragmentRoot addClassFolder(IJavaProject jproject, String containerName, IPath sourceAttachPath, IPath sourceAttachRoot) throws CoreException {
-		IProject project= jproject.getProject();
-		IContainer container= null;
-		if (containerName == null || containerName.length() == 0) {
-			container= project;
-		} else {
-			IFolder folder= project.getFolder(containerName);
-			if (!folder.exists()) {
-				CoreUtility.createFolder(folder, false, true, null);
-			}
-			container= folder;
-		}
-		return addLibrary(jproject, container.getFullPath(), sourceAttachPath, sourceAttachRoot);
-	}
-
-	/**
-	 * @deprecated Use addClassFolderWithImport(IJavaProject, String, IPath, IPath, File) to make sure that the zip file is correctly closed
-	 */			
-	public static IPackageFragmentRoot addClassFolderWithImport(IJavaProject jproject, String containerName, IPath sourceAttachPath, IPath sourceAttachRoot, ZipFile zipFile) throws CoreException, InvocationTargetException {
-		IPackageFragmentRoot root= addClassFolder(jproject, containerName, sourceAttachPath, sourceAttachRoot);
-		importFilesFromZip(zipFile, root.getPath(), null);
-		return root;
-	}
-	
-	/**
-	 * Creates and adds a class folder to the class path and imports all files
-	 * contained in the given Zip file.
-	 */			
-	public static IPackageFragmentRoot addClassFolderWithImport(IJavaProject jproject, String containerName, IPath sourceAttachPath, IPath sourceAttachRoot, File zipFile) throws IOException, CoreException, InvocationTargetException {
-		ZipFile file= new ZipFile(zipFile);
-		try {
-			IPackageFragmentRoot root= addClassFolder(jproject, containerName, sourceAttachPath, sourceAttachRoot);
-			importFilesFromZip(file, root.getPath(), null);
-			return root;
-		} finally {
-			if (file != null) {
-				file.close();
-			}
-		}
-	}	
-
-	/**
-	 * Adds a library entry pointing to a JRE.
-	 * @return Can return null, if no JRE installation was found.
-	 */	
-	public static IPackageFragmentRoot addRTJar(IJavaProject jproject) throws CoreException {
-
-		IPath[] rtJarPath= findRtJar();
-		if (rtJarPath != null) {
-			return addLibrary(jproject, rtJarPath[0], rtJarPath[1], rtJarPath[2]);
-		}
-		return null;
-	}
-	
-	/**
-	 * Adds a variable entry with source attchment to a IJavaProject.
-	 * Can return null if variable can not be resolved.
-	 */			
-	public static IPackageFragmentRoot addVariableEntry(IJavaProject jproject, IPath path, IPath sourceAttachPath, IPath sourceAttachRoot) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newVariableEntry(path, sourceAttachPath, sourceAttachRoot);
-		addToClasspath(jproject, cpe);
-		IPath resolvedPath= JavaCore.getResolvedVariablePath(path);
-		if (resolvedPath != null) {
-			return jproject.getPackageFragmentRoot(resolvedPath.toString());
-		}
-		return null;
-	}
-	
-	/**
-	 * Adds a variable entry pointing to a JRE.
-	 * The arguments specify the names of the variable to be used.
-	 * @param libVarName Name of the variable for the library
-	 * @param srcVarName Name of the variable for the source attchment. Can be <code>null</code>.
-	 * @param srcrootVarName Name of the variable for the source attchment root. Can be <code>null</code>.
-	 * @return Returns <code>null</code>, if no JRE installation was found.
-	 */	
-	public static IPackageFragmentRoot addVariableRTJar(IJavaProject jproject, String libVarName, String srcVarName, String srcrootVarName) throws CoreException {
-		IPath[] rtJarPaths= findRtJar();
-		if (rtJarPaths != null) {
-			IPath libVarPath= new Path(libVarName);
-			IPath srcVarPath= null;
-			IPath srcrootVarPath= null;
-			JavaCore.setClasspathVariable(libVarName, rtJarPaths[0], null);
-			if (srcVarName != null) {
-				IPath varValue= rtJarPaths[1] != null ? rtJarPaths[1] : Path.EMPTY;
-				JavaCore.setClasspathVariable(srcVarName, varValue, null);
-				srcVarPath= new Path(srcVarName);
-			}
-			if (srcrootVarName != null) {
-				IPath varValue= rtJarPaths[2] != null ? rtJarPaths[2] : Path.EMPTY;
-				JavaCore.setClasspathVariable(srcrootVarName, varValue, null);
-				srcrootVarPath= new Path(srcrootVarName);
-			}
-			return addVariableEntry(jproject, libVarPath, srcVarPath, srcrootVarPath);
-		}
-		return null;
-	}	
-
-	/**
-	 * Adds a required project entry.
-	 */		
-	public static void addRequiredProject(IJavaProject jproject, IJavaProject required) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newProjectEntry(required.getProject().getFullPath());
-		addToClasspath(jproject, cpe);
-	}	
-	
-	public static void removeFromClasspath(IJavaProject jproject, IPath path) throws JavaModelException {
-		IClasspathEntry[] oldEntries= jproject.getRawClasspath();
-		int nEntries= oldEntries.length;
-		ArrayList list= new ArrayList(nEntries);
-		for (int i= 0 ; i < nEntries ; i++) {
-			IClasspathEntry curr= oldEntries[i];
-			if (!path.equals(curr.getPath())) {
-				list.add(curr);			
-			}
-		}
-		IClasspathEntry[] newEntries= (IClasspathEntry[])list.toArray(new IClasspathEntry[list.size()]);
-		jproject.setRawClasspath(newEntries, null);
-	}	
-
-	/**
-	 * Sets autobuilding state for the test workspace.
-	 */
-	public static boolean setAutoBuilding(boolean state) throws CoreException {
-		// disable auto build
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		IWorkspaceDescription desc= workspace.getDescription();
-		boolean result= desc.isAutoBuilding();
-		desc.setAutoBuilding(state);
-		workspace.setDescription(desc);
-		return result;
-	}
-
-	public static void addToClasspath(IJavaProject jproject, IClasspathEntry cpe) throws JavaModelException {
-		IClasspathEntry[] oldEntries= jproject.getRawClasspath();
-		for (int i= 0; i < oldEntries.length; i++) {
-			if (oldEntries[i].equals(cpe)) {
-				return;
-			}
-		}
-		int nEntries= oldEntries.length;
-		IClasspathEntry[] newEntries= new IClasspathEntry[nEntries + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, nEntries);
-		newEntries[nEntries]= cpe;
-		jproject.setRawClasspath(newEntries, null);
-	}
-	
-	/**
-	 * Try to find rt.jar
-	 */
-	public static IPath[] findRtJar() {
-		File rtStubs= JavaTestPlugin.getDefault().getFileInPlugin(RT_STUBS);
-		if (rtStubs != null && rtStubs.exists()) {
-			return new IPath[] {
-				new Path(rtStubs.getPath()),
-				null,
-				null
-			};
-		}
-		return null;
-	}
-	
-	/**
-	 * Try to find a 1.5 rt.jar
-	 */
-	public static IPath[] find15RtJar() {
-		File rtStubs= JavaTestPlugin.getDefault().getFileInPlugin(RT15_STUBS);
-		if (rtStubs != null && rtStubs.exists()) {
-			return new IPath[] {
-				new Path(rtStubs.getPath()),
-				null,
-				null
-			};
-		}
-		return null;
-	}
-		
-	private static void addNatureToProject(IProject proj, String natureId, IProgressMonitor monitor) throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures= description.getNatureIds();
-		String[] newNatures= new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length]= natureId;
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, monitor);
-	}
-	
-	private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {		
-		ZipFileStructureProvider structureProvider=	new ZipFileStructureProvider(srcZipFile);
-		try {
-			ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, new ImportOverwriteQuery());
-			op.run(monitor);
-		} catch (InterruptedException e) {
-			// should not happen
-		}
-	}
-	
-	private static class ImportOverwriteQuery implements IOverwriteQuery {
-		public String queryOverwrite(String file) {
-			return ALL;
-		}	
-	}		
-	
-	private static class Requestor implements ITypeNameRequestor{
-		
-		public void acceptClass(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-		}
-
-		public void acceptInterface(char[] packageName, char[] simpleTypeName, char[][] enclosingTypeNames, String path) {
-		}
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaTestPlugin.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaTestPlugin.java
deleted file mode 100644
index e6b90df..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaTestPlugin.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-
-
-public class JavaTestPlugin extends Plugin {
-	
-	private static JavaTestPlugin fgDefault;
-	
-	public JavaTestPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		fgDefault= this;
-	}
-	
-	public static JavaTestPlugin getDefault() {
-		return fgDefault;
-	}
-	
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	public static void enableAutobuild(boolean enable) throws CoreException {
-		// disable auto build
-		IWorkspace workspace= JavaTestPlugin.getWorkspace();
-		IWorkspaceDescription desc= workspace.getDescription();
-		desc.setAutoBuilding(enable);
-		workspace.setDescription(desc);
-	}
-	
-	public File getFileInPlugin(IPath path) {
-		try {
-			URL installURL= new URL(getDescriptor().getInstallURL(), path.toString());
-			URL localURL= Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-	
-	public static String getPluginId() {
-		return getDefault().getDescriptor().getUniqueIdentifier();
-	}
-
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-	
-	public static void logErrorMessage(String message) {
-		log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, null));
-	}
-
-	public static void logErrorStatus(String message, IStatus status) {
-		if (status == null) {
-			logErrorMessage(message);
-			return;
-		}
-		MultiStatus multi= new MultiStatus(getPluginId(), IStatus.ERROR, message, null);
-		multi.add(status);
-		log(multi);
-	}
-	
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, e.getMessage(), e)); //$NON-NLS-1$
-	}	
-	
-		
-
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/StringAsserts.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/StringAsserts.java
deleted file mode 100644
index 9d1de59..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/StringAsserts.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import junit.framework.Assert;
-
-/**
- *
- */
-public class StringAsserts {
-	/**
-	 * 
-	 */
-	public StringAsserts() {
-		super();
-	}
-	
-	private static int getDiffPos(String str1, String str2) {
-		int len1= Math.min(str1.length(), str2.length());
-		
-		int diffPos= -1;
-		for (int i= 0; i < len1; i++) {
-			if (str1.charAt(i) != str2.charAt(i)) {
-				diffPos= i;
-				break;
-			}
-		}
-		if (diffPos == -1 && str1.length() != str2.length()) {
-			diffPos= len1;
-		}
-		return diffPos;
-	}
-	
-	private static final int printRange= 6;
-	
-	public static void assertEqualString(String actual, String expected) {	
-		if (actual == null || expected == null) {
-			if (actual == expected) {
-				return;
-			}
-			if (actual == null) {
-				Assert.assertTrue("Content not as expected: is 'null' expected: " + expected, false);
-			} else {
-				Assert.assertTrue("Content not as expected: expected 'null' is: " + actual, false);
-			}
-		}
-		
-		int diffPos= getDiffPos(actual, expected);
-		if (diffPos != -1) {
-			int diffAhead= Math.max(0, diffPos - printRange);
-			int diffAfter= Math.min(actual.length(), diffPos + printRange);
-			
-			String diffStr= actual.substring(diffAhead, diffPos) + '^' + actual.substring(diffPos, diffAfter);
-			
-			// use detailed message
-			String message= "Content not as expected: is\n" + actual + "\nDiffers at pos " + diffPos + ": " + diffStr + "\nexpected:\n" + expected;  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-			
-			Assert.assertEquals(message, expected, actual);
-		}
-	}
-	
-	public static void assertEqualStringIgnoreDelim(String actual, String expected) throws IOException {
-		if (actual == null || expected == null) {
-			if (actual == expected) {
-				return;
-			}
-			if (actual == null) {
-				Assert.assertTrue("Content not as expected: is 'null' expected: " + expected, false);
-			} else {
-				Assert.assertTrue("Content not as expected: expected 'null' is: " + actual, false);
-			}
-		}
-		
-		BufferedReader read1= new BufferedReader(new StringReader(actual));
-		BufferedReader read2= new BufferedReader(new StringReader(expected));
-		
-		int line= 1;
-		do {
-			String s1= read1.readLine();
-			String s2= read2.readLine();
-			
-			if (s1 == null || !s1.equals(s2)) {
-				if (s1 == null && s2 == null) {
-					return;
-				}
-				String diffStr= (s1 == null) ? s2 : s1;
-				
-				String message= "Content not as expected: Content is: \n" + actual + "\nDiffers at line " + line + ": " + diffStr + "\nExpected contents: \n" + expected;
-				Assert.assertEquals(message, expected, actual);
-			}
-			line++;
-		} while (true);
-	}	
-	
-	public static void assertEqualStringsIgnoreOrder(String[] actuals, String[] expecteds) {
-		ArrayList list1= new ArrayList(Arrays.asList(actuals));
-		ArrayList list2= new ArrayList(Arrays.asList(expecteds));
-		
-		for (int i= list1.size() - 1; i >= 0; i--) {
-			if (list2.remove(list1.get(i))) {
-				list1.remove(i);
-			}
-		}
-		
-		int n1= list1.size();
-		int n2= list2.size();
-		
-		if (n1 + n2 > 0) {
-			if (n1 == 1 && n2 == 1) {
-				assertEqualString((String) list1.get(0), (String) list2.get(0));
-			}
-			
-			StringBuffer buf= new StringBuffer();
-			for (int i= 0; i < n1; i++) {
-				String s1= (String) list1.get(i);
-				if (s1 != null) {
-					buf.append(s1);
-					buf.append("\n");
-				}
-			}
-			String actual= buf.toString();
-			
-			buf= new StringBuffer();
-			for (int i= 0; i < n2; i++) {
-				String s2= (String) list2.get(i);
-				if (s2 != null) {
-					buf.append(s2);
-					buf.append("\n");
-				}
-			}
-			String expected= buf.toString();
-
-			String message= "Content not as expected: Content is: \n" + actual + "\nExpected contents: \n" + expected;
-			Assert.assertEquals(message, expected, actual);
-		}				
-	}
-	
-	public static void assertExpectedExistInProposals(String[] actuals, String[] expecteds) {
-		ArrayList list1= new ArrayList(Arrays.asList(actuals));
-		ArrayList list2= new ArrayList(Arrays.asList(expecteds));
-		
-		for (int i= list1.size() - 1; i >= 0; i--) {
-			if (list2.remove(list1.get(i))) {
-				list1.remove(i);
-			}
-		}
-		
-		int n1= list1.size();
-		int n2= list2.size();
-		
-		if (n2 > 0) {
-			if (n1 == 1 && n2 == 1) {
-				assertEqualString((String) list1.get(0), (String) list2.get(0));
-			}
-			
-			StringBuffer buf= new StringBuffer();
-			for (int i= 0; i < n1; i++) {
-				String s1= (String) list1.get(i);
-				if (s1 != null) {
-					buf.append(s1);
-					buf.append("\n");
-				}
-			}
-			String actual= buf.toString();
-			
-			buf= new StringBuffer();
-			for (int i= 0; i < n2; i++) {
-				String s2= (String) list2.get(i);
-				if (s2 != null) {
-					buf.append(s2);
-					buf.append("\n");
-				}
-			}
-			String expected= buf.toString();
-
-			String message= "Content not as expected: Content is: \n" + actual + "\nExpected contents: \n" + expected;
-			Assert.assertEquals(message, expected, actual);
-		}
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/TestOptions.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/TestOptions.java
deleted file mode 100644
index d526d60..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/TestOptions.java
+++ /dev/null

@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin;
-
-import java.util.Hashtable;
-
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.formatter.align.Alignment;
-
-public class TestOptions {
-	
-	public static Hashtable getFormatterOptions() {
-		Hashtable result= JavaCore.getDefaultOptions();
-		result.putAll(TestFormatterOptions.getSettings());
-		return result;
-	}
-	
-	public static void initializeCodeGenerationOptions() {
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_KEYWORD_THIS, false);
-		store.setValue(PreferenceConstants.CODEGEN_IS_FOR_GETTERS, true);
-		store.setValue(PreferenceConstants.CODEGEN_EXCEPTION_VAR_NAME, "e"); //$NON-NLS-1$
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, true);
-		store.setValue(PreferenceConstants.ORGIMPORTS_IMPORTORDER, "java;javax;org;com"); //$NON-NLS-1$
-		store.setValue(PreferenceConstants.ORGIMPORTS_ONDEMANDTHRESHOLD, 99);
-		store.setValue(PreferenceConstants.ORGIMPORTS_IGNORELOWERCASE, true);
-	}
-}
-
-class TestFormatterOptions {
-	
-	public static Hashtable getSettings() {
-		TestFormatterOptions options = new TestFormatterOptions();
-		options.setDefaultSettings();
-		return options.getMap();
-	}
-	
-	public int alignment_for_arguments_in_allocation_expression;
-	public int alignment_for_arguments_in_explicit_constructor_call;
-	public int alignment_for_arguments_in_method_invocation;
-	public int alignment_for_arguments_in_qualified_allocation_expression;
-	public int alignment_for_binary_expression;
-	public int alignment_for_compact_if;
-	public int alignment_for_conditional_expression;
-	public int alignment_for_expressions_in_array_initializer;
-	public int alignment_for_multiple_fields;
-	public int alignment_for_parameters_in_constructor_declaration;
-	public int alignment_for_parameters_in_method_declaration;
-	public int alignment_for_selector_in_method_invocation;
-	public int alignment_for_superclass_in_type_declaration;
-	public int alignment_for_superinterfaces_in_type_declaration;
-	public int alignment_for_throws_clause_in_constructor_declaration;
-	public int alignment_for_throws_clause_in_method_declaration;
-	
-	public boolean align_type_members_on_columns;
-	
-	public String brace_position_for_anonymous_type_declaration;
-	public String brace_position_for_array_initializer;
-	public String brace_position_for_block;
-	public String brace_position_for_block_in_case;
-	public String brace_position_for_constructor_declaration;
-	public String brace_position_for_method_declaration;
-	public String brace_position_for_type_declaration;
-	public String brace_position_for_switch;
-	
-	public int continuation_indentation;
-	public int continuation_indentation_for_array_initializer;
-	
-	public int blank_lines_after_imports;
-	public int blank_lines_after_package;
-	public int blank_lines_before_field;
-	public int blank_lines_before_first_class_body_declaration;
-	public int blank_lines_before_imports;
-	public int blank_lines_before_member_type;
-	public int blank_lines_before_method;
-	public int blank_lines_before_new_chunk;
-	public int blank_lines_before_package;
-	public int blank_lines_between_type_declarations;
-	public int blank_lines_at_beginning_of_method_body;
-	
-	public boolean indent_statements_compare_to_block;
-	public boolean indent_statements_compare_to_body;
-	public boolean indent_body_declarations_compare_to_type_header;
-	public boolean indent_breaks_compare_to_cases;
-	public boolean indent_switchstatements_compare_to_cases;
-	public boolean indent_switchstatements_compare_to_switch;
-	
-	public boolean insert_new_line_after_opening_brace_in_array_initializer;
-	public boolean insert_new_line_before_catch_in_try_statement;
-	public boolean insert_new_line_before_closing_brace_in_array_initializer;
-	public boolean insert_new_line_before_else_in_if_statement;
-	public boolean insert_new_line_before_finally_in_try_statement;
-	public boolean insert_new_line_before_while_in_do_statement;
-	public boolean insert_new_line_in_empty_anonymous_type_declaration;
-	public boolean insert_new_line_in_empty_block;
-	public boolean insert_new_line_in_empty_method_body;
-	public boolean insert_new_line_in_empty_type_declaration;
-	public boolean insert_space_after_assignment_operator;
-	public boolean insert_space_after_binary_operator;
-	public boolean insert_space_after_closing_paren_in_cast;
-	public boolean insert_space_after_closing_brace_in_block;
-	public boolean insert_space_after_colon_in_assert;
-	public boolean insert_space_after_colon_in_case;
-	public boolean insert_space_after_colon_in_conditional;
-	public boolean insert_space_after_colon_in_labeled_statement;
-	public boolean insert_space_after_comma_in_allocation_expression;
-	public boolean insert_space_after_comma_in_array_initializer;
-	public boolean insert_space_after_comma_in_constructor_declaration_parameters;
-	public boolean insert_space_after_comma_in_constructor_declaration_throws;
-	public boolean insert_space_after_comma_in_explicit_constructor_call_arguments;
-	public boolean insert_space_after_comma_in_for_increments;
-	public boolean insert_space_after_comma_in_for_inits;
-	public boolean insert_space_after_comma_in_method_invocation_arguments;
-	public boolean insert_space_after_comma_in_method_declaration_parameters;
-	public boolean insert_space_after_comma_in_method_declaration_throws;
-	public boolean insert_space_after_comma_in_multiple_field_declarations;
-	public boolean insert_space_after_comma_in_multiple_local_declarations;
-	public boolean insert_space_after_comma_in_superinterfaces;
-	public boolean insert_space_after_opening_bracket_in_array_allocation_expression;
-	public boolean insert_space_after_opening_bracket_in_array_reference;
-	public boolean insert_space_after_opening_brace_in_array_initializer;
-	public boolean insert_space_after_opening_paren_in_cast;
-	public boolean insert_space_after_opening_paren_in_catch;
-	public boolean insert_space_after_opening_paren_in_constructor_declaration;
-	public boolean insert_space_after_opening_paren_in_for;
-	public boolean insert_space_after_opening_paren_in_if;
-	public boolean insert_space_after_opening_paren_in_method_declaration;
-	public boolean insert_space_after_opening_paren_in_method_invocation;
-	public boolean insert_space_after_opening_paren_in_parenthesized_expression;
-	public boolean insert_space_after_opening_paren_in_switch;
-	public boolean insert_space_after_opening_paren_in_synchronized;
-	public boolean insert_space_after_opening_paren_in_while;
-	public boolean insert_space_after_postfix_operator;
-	public boolean insert_space_after_prefix_operator;
-	public boolean insert_space_after_question_in_conditional;
-	public boolean insert_space_after_semicolon_in_for;
-	public boolean insert_space_after_unary_operator;
-	public boolean insert_space_before_assignment_operator;
-	public boolean insert_space_before_binary_operator;
-	public boolean insert_space_before_closing_brace_in_array_initializer;
-	public boolean insert_space_before_closing_bracket_in_array_allocation_expression;
-	public boolean insert_space_before_closing_bracket_in_array_reference;
-	public boolean insert_space_before_closing_paren_in_cast;
-	public boolean insert_space_before_closing_paren_in_catch;
-	public boolean insert_space_before_closing_paren_in_constructor_declaration;
-	public boolean insert_space_before_closing_paren_in_for;
-	public boolean insert_space_before_closing_paren_in_if;
-	public boolean insert_space_before_closing_paren_in_method_declaration;
-	public boolean insert_space_before_closing_paren_in_method_invocation;
-	public boolean insert_space_before_closing_paren_in_parenthesized_expression;
-	public boolean insert_space_before_closing_paren_in_switch;
-	public boolean insert_space_before_closing_paren_in_synchronized;
-	public boolean insert_space_before_closing_paren_in_while;
-	public boolean insert_space_before_colon_in_assert;
-	public boolean insert_space_before_colon_in_case;
-	public boolean insert_space_before_colon_in_conditional;
-	public boolean insert_space_before_colon_in_default;
-	public boolean insert_space_before_colon_in_labeled_statement;
-	public boolean insert_space_before_comma_in_allocation_expression;
-	public boolean insert_space_before_comma_in_array_initializer;
-	public boolean insert_space_before_comma_in_constructor_declaration_parameters;
-	public boolean insert_space_before_comma_in_constructor_declaration_throws;
-	public boolean insert_space_before_comma_in_explicit_constructor_call_arguments;
-	public boolean insert_space_before_comma_in_for_increments;
-	public boolean insert_space_before_comma_in_for_inits;
-	public boolean insert_space_before_comma_in_method_invocation_arguments;
-	public boolean insert_space_before_comma_in_method_declaration_parameters;
-	public boolean insert_space_before_comma_in_method_declaration_throws;
-	public boolean insert_space_before_comma_in_multiple_field_declarations;
-	public boolean insert_space_before_comma_in_multiple_local_declarations;
-	public boolean insert_space_before_comma_in_superinterfaces;
-	public boolean insert_space_before_opening_brace_in_anonymous_type_declaration;
-	public boolean insert_space_before_opening_brace_in_array_initializer;
-	public boolean insert_space_before_opening_brace_in_block;
-	public boolean insert_space_before_opening_brace_in_constructor_declaration;
-	public boolean insert_space_before_opening_brace_in_method_declaration;
-	public boolean insert_space_before_opening_brace_in_type_declaration;
-	public boolean insert_space_before_opening_bracket_in_array_allocation_expression;
-	public boolean insert_space_before_opening_bracket_in_array_reference;
-	public boolean insert_space_before_opening_bracket_in_array_type_reference;
-	public boolean insert_space_before_opening_paren_in_catch;
-	public boolean insert_space_before_opening_paren_in_constructor_declaration;
-	public boolean insert_space_before_opening_paren_in_for;
-	public boolean insert_space_before_opening_paren_in_if;
-	public boolean insert_space_before_opening_paren_in_method_invocation;
-	public boolean insert_space_before_opening_paren_in_method_declaration;
-	public boolean insert_space_before_opening_paren_in_switch;
-	public boolean insert_space_before_opening_brace_in_switch;
-	public boolean insert_space_before_opening_paren_in_synchronized;
-	public boolean insert_space_before_opening_paren_in_parenthesized_expression;
-	public boolean insert_space_before_opening_paren_in_while;
-	public boolean insert_space_before_postfix_operator;
-	public boolean insert_space_before_prefix_operator;
-	public boolean insert_space_before_question_in_conditional;
-	public boolean insert_space_before_semicolon;
-	public boolean insert_space_before_semicolon_in_for;
-	public boolean insert_space_before_unary_operator;
-	public boolean insert_space_between_brackets_in_array_type_reference;
-	public boolean insert_space_between_empty_braces_in_array_initializer;
-	public boolean insert_space_between_empty_brackets_in_array_allocation_expression;
-	public boolean insert_space_between_empty_parens_in_constructor_declaration;
-	public boolean insert_space_between_empty_parens_in_method_declaration;
-	public boolean insert_space_between_empty_parens_in_method_invocation;
-	public boolean compact_else_if;
-	public boolean keep_guardian_clause_on_one_line;
-	public boolean keep_else_statement_on_same_line;
-	public boolean keep_empty_array_initializer_on_one_line;
-	public boolean keep_simple_if_on_one_line;
-	public boolean keep_then_statement_on_same_line;
-	public int number_of_empty_lines_to_preserve;
-	public boolean put_empty_statement_on_new_line;
-	public int tab_size;
-	public final char filling_space = ' ';
-	public int page_width;
-	public boolean use_tab;
-
-	public int initial_indentation_level;
-	public String line_separator;
-	
-	private TestFormatterOptions() {
-		// cannot be instantiated
-	}
-
-	private String getAlignment(int alignment) {
-		return Integer.toString(alignment);
-	}
-
-	private Hashtable getMap() {
-		Hashtable options = new Hashtable();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_ALLOCATION_EXPRESSION, getAlignment(this.alignment_for_arguments_in_allocation_expression));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_EXPLICIT_CONSTRUCTOR_CALL, getAlignment(this.alignment_for_arguments_in_explicit_constructor_call));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION, getAlignment(this.alignment_for_arguments_in_method_invocation));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_QUALIFIED_ALLOCATION_EXPRESSION, getAlignment(this.alignment_for_arguments_in_qualified_allocation_expression));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_BINARY_EXPRESSION, getAlignment(this.alignment_for_binary_expression));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_COMPACT_IF, getAlignment(this.alignment_for_compact_if));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_CONDITIONAL_EXPRESSION, getAlignment(this.alignment_for_conditional_expression));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_EXPRESSIONS_IN_ARRAY_INITIALIZER, getAlignment(this.alignment_for_expressions_in_array_initializer));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_MULTIPLE_FIELDS, getAlignment(this.alignment_for_multiple_fields));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_CONSTRUCTOR_DECLARATION, getAlignment(this.alignment_for_parameters_in_constructor_declaration));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_PARAMETERS_IN_METHOD_DECLARATION, getAlignment(this.alignment_for_parameters_in_method_declaration));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_SELECTOR_IN_METHOD_INVOCATION, getAlignment(this.alignment_for_selector_in_method_invocation));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_SUPERCLASS_IN_TYPE_DECLARATION, getAlignment(this.alignment_for_superclass_in_type_declaration));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_SUPERINTERFACES_IN_TYPE_DECLARATION, getAlignment(this.alignment_for_superinterfaces_in_type_declaration));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_THROWS_CLAUSE_IN_CONSTRUCTOR_DECLARATION, getAlignment(this.alignment_for_throws_clause_in_constructor_declaration));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_THROWS_CLAUSE_IN_METHOD_DECLARATION, getAlignment(this.alignment_for_throws_clause_in_method_declaration));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_ALIGN_TYPE_MEMBERS_ON_COLUMNS, this.align_type_members_on_columns ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ANONYMOUS_TYPE_DECLARATION, this.brace_position_for_anonymous_type_declaration);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER, this.brace_position_for_array_initializer);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK, this.brace_position_for_block);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK_IN_CASE, this.brace_position_for_block_in_case);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_CONSTRUCTOR_DECLARATION, this.brace_position_for_constructor_declaration);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION, this.brace_position_for_method_declaration);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_TYPE_DECLARATION, this.brace_position_for_type_declaration);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_SWITCH, this.brace_position_for_switch);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION, Integer.toString(this.continuation_indentation));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_CONTINUATION_INDENTATION_FOR_ARRAY_INITIALIZER, Integer.toString(this.continuation_indentation_for_array_initializer));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AFTER_IMPORTS, Integer.toString(this.blank_lines_after_imports));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AFTER_PACKAGE, Integer.toString(this.blank_lines_after_package));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_FIELD, Integer.toString(this.blank_lines_before_field));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_FIRST_CLASS_BODY_DECLARATION, Integer.toString(this.blank_lines_before_first_class_body_declaration));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_IMPORTS, Integer.toString(this.blank_lines_before_imports));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_MEMBER_TYPE, Integer.toString(this.blank_lines_before_member_type));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_METHOD, Integer.toString(this.blank_lines_before_method));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_NEW_CHUNK, Integer.toString(this.blank_lines_before_new_chunk));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BEFORE_PACKAGE, Integer.toString(this.blank_lines_before_package));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_BETWEEN_TYPE_DECLARATIONS, Integer.toString(this.blank_lines_between_type_declarations));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_BLANK_LINES_AT_BEGINNING_OF_METHOD_BODY, Integer.toString(this.blank_lines_at_beginning_of_method_body));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_STATEMENTS_COMPARE_TO_BLOCK, this.indent_statements_compare_to_block ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_STATEMENTS_COMPARE_TO_BODY, this.indent_statements_compare_to_body ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_BODY_DECLARATIONS_COMPARE_TO_TYPE_HEADER, this.indent_body_declarations_compare_to_type_header ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_BREAKS_COMPARE_TO_CASES, this.indent_breaks_compare_to_cases ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_SWITCHSTATEMENTS_COMPARE_TO_CASES, this.indent_switchstatements_compare_to_cases ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INDENT_SWITCHSTATEMENTS_COMPARE_TO_SWITCH, this.indent_switchstatements_compare_to_switch ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, this.insert_new_line_after_opening_brace_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CATCH_IN_TRY_STATEMENT, this.insert_new_line_before_catch_in_try_statement? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, this.insert_new_line_before_closing_brace_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_ELSE_IN_IF_STATEMENT, this.insert_new_line_before_else_in_if_statement? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_FINALLY_IN_TRY_STATEMENT, this.insert_new_line_before_finally_in_try_statement? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_BEFORE_WHILE_IN_DO_STATEMENT, this.insert_new_line_before_while_in_do_statement? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_ANONYMOUS_TYPE_DECLARATION, this.insert_new_line_in_empty_anonymous_type_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_BLOCK, this.insert_new_line_in_empty_block? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_METHOD_BODY, this.insert_new_line_in_empty_method_body? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_IN_EMPTY_TYPE_DECLARATION, this.insert_new_line_in_empty_type_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_ASSIGNMENT_OPERATOR, this.insert_space_after_assignment_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_BINARY_OPERATOR, this.insert_space_after_binary_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_PAREN_IN_CAST, this.insert_space_after_closing_paren_in_cast? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_BRACE_IN_BLOCK, this.insert_space_after_closing_brace_in_block? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COLON_IN_ASSERT, this.insert_space_after_colon_in_assert? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COLON_IN_CASE, this.insert_space_after_colon_in_case? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COLON_IN_CONDITIONAL, this.insert_space_after_colon_in_conditional? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COLON_IN_LABELED_STATEMENT, this.insert_space_after_colon_in_labeled_statement? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ALLOCATION_EXPRESSION, this.insert_space_after_comma_in_allocation_expression? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ARRAY_INITIALIZER, this.insert_space_after_comma_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_CONSTRUCTOR_DECLARATION_PARAMETERS, this.insert_space_after_comma_in_constructor_declaration_parameters? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_CONSTRUCTOR_DECLARATION_THROWS, this.insert_space_after_comma_in_constructor_declaration_throws? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_EXPLICIT_CONSTRUCTOR_CALL_ARGUMENTS, this.insert_space_after_comma_in_explicit_constructor_call_arguments? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_FOR_INCREMENTS, this.insert_space_after_comma_in_for_increments? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_FOR_INITS, this.insert_space_after_comma_in_for_inits? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_METHOD_INVOCATION_ARGUMENTS, this.insert_space_after_comma_in_method_invocation_arguments? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_METHOD_DECLARATION_PARAMETERS, this.insert_space_after_comma_in_method_declaration_parameters? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_METHOD_DECLARATION_THROWS, this.insert_space_after_comma_in_method_declaration_throws? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_MULTIPLE_FIELD_DECLARATIONS, this.insert_space_after_comma_in_multiple_field_declarations? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_MULTIPLE_LOCAL_DECLARATIONS, this.insert_space_after_comma_in_multiple_local_declarations? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_SUPERINTERFACES, this.insert_space_after_comma_in_superinterfaces? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACKET_IN_ARRAY_ALLOCATION_EXPRESSION, this.insert_space_after_opening_bracket_in_array_allocation_expression? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACKET_IN_ARRAY_REFERENCE, this.insert_space_after_opening_bracket_in_array_reference? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_BRACE_IN_ARRAY_INITIALIZER, this.insert_space_after_opening_brace_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_CAST, this.insert_space_after_opening_paren_in_cast? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_CATCH, this.insert_space_after_opening_paren_in_catch? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_CONSTRUCTOR_DECLARATION, this.insert_space_after_opening_paren_in_constructor_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_FOR, this.insert_space_after_opening_paren_in_for? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_IF, this.insert_space_after_opening_paren_in_if? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_DECLARATION, this.insert_space_after_opening_paren_in_method_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_METHOD_INVOCATION, this.insert_space_after_opening_paren_in_method_invocation? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_PARENTHESIZED_EXPRESSION, this.insert_space_after_opening_paren_in_parenthesized_expression? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_SWITCH, this.insert_space_after_opening_paren_in_switch? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_SYNCHRONIZED, this.insert_space_after_opening_paren_in_synchronized? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_PAREN_IN_WHILE, this.insert_space_after_opening_paren_in_while? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_POSTFIX_OPERATOR, this.insert_space_after_postfix_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_PREFIX_OPERATOR, this.insert_space_after_prefix_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_QUESTION_IN_CONDITIONAL, this.insert_space_after_question_in_conditional? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_SEMICOLON_IN_FOR, this.insert_space_after_semicolon_in_for? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_UNARY_OPERATOR, this.insert_space_after_unary_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, this.insert_space_before_assignment_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_BINARY_OPERATOR, this.insert_space_before_binary_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACE_IN_ARRAY_INITIALIZER, this.insert_space_before_closing_brace_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACKET_IN_ARRAY_ALLOCATION_EXPRESSION, this.insert_space_before_closing_bracket_in_array_allocation_expression? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_BRACKET_IN_ARRAY_REFERENCE, this.insert_space_before_closing_bracket_in_array_reference? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_CAST, this.insert_space_before_closing_paren_in_cast? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_CATCH, this.insert_space_before_closing_paren_in_catch? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_CONSTRUCTOR_DECLARATION, this.insert_space_before_closing_paren_in_constructor_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_FOR, this.insert_space_before_closing_paren_in_for? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_IF, this.insert_space_before_closing_paren_in_if? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_DECLARATION, this.insert_space_before_closing_paren_in_method_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_METHOD_INVOCATION, this.insert_space_before_closing_paren_in_method_invocation? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_PARENTHESIZED_EXPRESSION, this.insert_space_before_closing_paren_in_parenthesized_expression? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_SWITCH, this.insert_space_before_closing_paren_in_switch? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_SYNCHRONIZED, this.insert_space_before_closing_paren_in_synchronized? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_PAREN_IN_WHILE, this.insert_space_before_closing_paren_in_while? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_ASSERT, this.insert_space_before_colon_in_assert? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_CASE, this.insert_space_before_colon_in_case? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_CONDITIONAL, this.insert_space_before_colon_in_conditional? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_DEFAULT, this.insert_space_before_colon_in_default? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_LABELED_STATEMENT, this.insert_space_before_colon_in_labeled_statement? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_ALLOCATION_EXPRESSION, this.insert_space_before_comma_in_allocation_expression? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_ARRAY_INITIALIZER, this.insert_space_before_comma_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_CONSTRUCTOR_DECLARATION_PARAMETERS, this.insert_space_before_comma_in_constructor_declaration_parameters? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_CONSTRUCTOR_DECLARATION_THROWS, this.insert_space_before_comma_in_constructor_declaration_throws? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_EXPLICIT_CONSTRUCTOR_CALL_ARGUMENTS, this.insert_space_before_comma_in_explicit_constructor_call_arguments? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_FOR_INCREMENTS, this.insert_space_before_comma_in_for_increments? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_FOR_INITS, this.insert_space_before_comma_in_for_inits? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_METHOD_INVOCATION_ARGUMENTS, this.insert_space_before_comma_in_method_invocation_arguments? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_METHOD_DECLARATION_PARAMETERS, this.insert_space_before_comma_in_method_declaration_parameters? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_METHOD_DECLARATION_THROWS, this.insert_space_before_comma_in_method_declaration_throws? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_MULTIPLE_FIELD_DECLARATIONS, this.insert_space_before_comma_in_multiple_field_declarations? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_MULTIPLE_LOCAL_DECLARATIONS, this.insert_space_before_comma_in_multiple_local_declarations? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_SUPERINTERFACES, this.insert_space_before_comma_in_superinterfaces? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_ANONYMOUS_TYPE_DECLARATION, this.insert_space_before_opening_brace_in_anonymous_type_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_ARRAY_INITIALIZER, this.insert_space_before_opening_brace_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_BLOCK, this.insert_space_before_opening_brace_in_block? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_CONSTRUCTOR_DECLARATION, this.insert_space_before_opening_brace_in_constructor_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_METHOD_DECLARATION, this.insert_space_before_opening_brace_in_method_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_TYPE_DECLARATION, this.insert_space_before_opening_brace_in_type_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACKET_IN_ARRAY_ALLOCATION_EXPRESSION, this.insert_space_before_opening_bracket_in_array_allocation_expression ? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACKET_IN_ARRAY_REFERENCE, this.insert_space_before_opening_bracket_in_array_reference? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACKET_IN_ARRAY_TYPE_REFERENCE, this.insert_space_before_opening_bracket_in_array_type_reference? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_CATCH, this.insert_space_before_opening_paren_in_catch? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_CONSTRUCTOR_DECLARATION, this.insert_space_before_opening_paren_in_constructor_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_FOR, this.insert_space_before_opening_paren_in_for? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_IF, this.insert_space_before_opening_paren_in_if? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_METHOD_INVOCATION, this.insert_space_before_opening_paren_in_method_invocation? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_METHOD_DECLARATION, this.insert_space_before_opening_paren_in_method_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_SWITCH, this.insert_space_before_opening_paren_in_switch? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_BRACE_IN_SWITCH, this.insert_space_before_opening_brace_in_switch? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_SYNCHRONIZED, this.insert_space_before_opening_paren_in_synchronized? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_PARENTHESIZED_EXPRESSION, this.insert_space_before_opening_paren_in_parenthesized_expression? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_PAREN_IN_WHILE, this.insert_space_before_opening_paren_in_while? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_POSTFIX_OPERATOR, this.insert_space_before_postfix_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_PREFIX_OPERATOR, this.insert_space_before_prefix_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_QUESTION_IN_CONDITIONAL, this.insert_space_before_question_in_conditional? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_SEMICOLON, this.insert_space_before_semicolon? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_SEMICOLON_IN_FOR, this.insert_space_before_semicolon_in_for? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_UNARY_OPERATOR, this.insert_space_before_unary_operator? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_BRACKETS_IN_ARRAY_TYPE_REFERENCE, this.insert_space_between_brackets_in_array_type_reference? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACES_IN_ARRAY_INITIALIZER, this.insert_space_between_empty_braces_in_array_initializer? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_BRACKETS_IN_ARRAY_ALLOCATION_EXPRESSION, this.insert_space_between_empty_brackets_in_array_allocation_expression? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_CONSTRUCTOR_DECLARATION, this.insert_space_between_empty_parens_in_constructor_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_DECLARATION, this.insert_space_between_empty_parens_in_method_declaration? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BETWEEN_EMPTY_PARENS_IN_METHOD_INVOCATION, this.insert_space_between_empty_parens_in_method_invocation? JavaCore.INSERT : JavaCore.DO_NOT_INSERT);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_COMPACT_ELSE_IF, this.compact_else_if ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_GUARDIAN_CLAUSE_ON_ONE_LINE, this.keep_guardian_clause_on_one_line ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_ELSE_STATEMENT_ON_SAME_LINE, this.keep_else_statement_on_same_line ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_EMPTY_ARRAY_INITIALIZER_ON_ONE_LINE, this.keep_empty_array_initializer_on_one_line ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_SIMPLE_IF_ON_ONE_LINE, this.keep_simple_if_on_one_line ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_KEEP_THEN_STATEMENT_ON_SAME_LINE, this.keep_then_statement_on_same_line ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, Integer.toString(this.number_of_empty_lines_to_preserve));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_PUT_EMPTY_STATEMENT_ON_NEW_LINE, this.put_empty_statement_on_new_line ? DefaultCodeFormatterConstants.TRUE : DefaultCodeFormatterConstants.FALSE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, Integer.toString(this.page_width));
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, this.use_tab ? JavaCore.TAB: JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, Integer.toString(this.tab_size));
-		return options;
-	}
-
-	private void setDefaultSettings() {
-		this.alignment_for_arguments_in_allocation_expression = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_arguments_in_explicit_constructor_call = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_arguments_in_method_invocation = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_arguments_in_qualified_allocation_expression = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_binary_expression = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_compact_if = Alignment.M_ONE_PER_LINE_SPLIT | Alignment.M_INDENT_BY_ONE;
-		this.alignment_for_conditional_expression = Alignment.M_ONE_PER_LINE_SPLIT;
-		this.alignment_for_expressions_in_array_initializer = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_multiple_fields = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_parameters_in_constructor_declaration = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_parameters_in_method_declaration = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_selector_in_method_invocation = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_superclass_in_type_declaration = Alignment.M_NEXT_SHIFTED_SPLIT;
-		this.alignment_for_superinterfaces_in_type_declaration = Alignment.M_NEXT_SHIFTED_SPLIT;
-		this.alignment_for_throws_clause_in_constructor_declaration = Alignment.M_COMPACT_SPLIT;
-		this.alignment_for_throws_clause_in_method_declaration = Alignment.M_COMPACT_SPLIT;
-		this.align_type_members_on_columns = false;
-		this.brace_position_for_anonymous_type_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		this.brace_position_for_array_initializer = DefaultCodeFormatterConstants.END_OF_LINE;
-		this.brace_position_for_block = DefaultCodeFormatterConstants.END_OF_LINE;
-		this.brace_position_for_block_in_case = DefaultCodeFormatterConstants.END_OF_LINE;
-		this.brace_position_for_constructor_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		this.brace_position_for_method_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		this.brace_position_for_type_declaration = DefaultCodeFormatterConstants.END_OF_LINE;
-		this.brace_position_for_switch = DefaultCodeFormatterConstants.END_OF_LINE;
-		this.continuation_indentation = 2;
-		this.continuation_indentation_for_array_initializer = 2;
-		this.blank_lines_after_imports = 0;
-		this.blank_lines_after_package = 0;
-		this.blank_lines_before_field = 0;
-		this.blank_lines_before_first_class_body_declaration = 0;
-		this.blank_lines_before_imports = 0;
-		this.blank_lines_before_member_type = 0;
-		this.blank_lines_before_method = 0;
-		this.blank_lines_before_new_chunk = 0;
-		this.blank_lines_before_package = 0;
-		this.blank_lines_between_type_declarations = 0;
-		this.blank_lines_at_beginning_of_method_body = 0;
-		this.indent_statements_compare_to_block = true;
-		this.indent_statements_compare_to_body = true;
-		this.indent_body_declarations_compare_to_type_header = true;
-		this.indent_breaks_compare_to_cases = true;
-		this.indent_switchstatements_compare_to_cases = true;
-		this.indent_switchstatements_compare_to_switch = true;
-		this.insert_new_line_after_opening_brace_in_array_initializer = false;
-		this.insert_new_line_before_catch_in_try_statement = false;
-		this.insert_new_line_before_closing_brace_in_array_initializer = false;
-		this.insert_new_line_before_else_in_if_statement = false;
-		this.insert_new_line_before_finally_in_try_statement = false;
-		this.insert_new_line_before_while_in_do_statement = false;
-		this.insert_new_line_in_empty_anonymous_type_declaration = true;
-		this.insert_new_line_in_empty_block = true;
-		this.insert_new_line_in_empty_method_body = true;
-		this.insert_new_line_in_empty_type_declaration = true;
-		this.insert_space_after_assignment_operator = true;
-		this.insert_space_after_binary_operator = true;
-		this.insert_space_after_closing_paren_in_cast = true;
-		this.insert_space_after_closing_brace_in_block = true;
-		this.insert_space_after_colon_in_assert = true;
-		this.insert_space_after_colon_in_case = true;
-		this.insert_space_after_colon_in_conditional = true;
-		this.insert_space_after_colon_in_labeled_statement = true;
-		this.insert_space_after_comma_in_allocation_expression = true;
-		this.insert_space_after_comma_in_array_initializer = true;
-		this.insert_space_after_comma_in_constructor_declaration_parameters = true;
-		this.insert_space_after_comma_in_constructor_declaration_throws = true;
-		this.insert_space_after_comma_in_explicit_constructor_call_arguments = true;
-		this.insert_space_after_comma_in_for_increments = true;
-		this.insert_space_after_comma_in_for_inits = true;
-		this.insert_space_after_comma_in_method_invocation_arguments = true;
-		this.insert_space_after_comma_in_method_declaration_parameters = true;
-		this.insert_space_after_comma_in_method_declaration_throws = true;
-		this.insert_space_after_comma_in_multiple_field_declarations = true;
-		this.insert_space_after_comma_in_multiple_local_declarations = true;
-		this.insert_space_after_comma_in_superinterfaces = true;
-		this.insert_space_after_opening_bracket_in_array_allocation_expression = false;
-		this.insert_space_after_opening_bracket_in_array_reference = false;
-		this.insert_space_after_opening_brace_in_array_initializer = false;
-		this.insert_space_after_opening_paren_in_cast = false;
-		this.insert_space_after_opening_paren_in_catch = false;
-		this.insert_space_after_opening_paren_in_constructor_declaration = false;
-		this.insert_space_after_opening_paren_in_for = false;
-		this.insert_space_after_opening_paren_in_if = false;
-		this.insert_space_after_opening_paren_in_method_declaration = false;
-		this.insert_space_after_opening_paren_in_method_invocation = false;
-		this.insert_space_after_opening_paren_in_parenthesized_expression = false;
-		this.insert_space_after_opening_paren_in_switch = false;
-		this.insert_space_after_opening_paren_in_synchronized = false;
-		this.insert_space_after_opening_paren_in_while = false;
-		this.insert_space_after_postfix_operator = false;
-		this.insert_space_after_prefix_operator = false;
-		this.insert_space_after_question_in_conditional = true;
-		this.insert_space_after_semicolon_in_for = true;
-		this.insert_space_after_unary_operator = false;
-		this.insert_space_before_assignment_operator = true;
-		this.insert_space_before_binary_operator = true;
-		this.insert_space_before_closing_brace_in_array_initializer = false;
-		this.insert_space_before_closing_bracket_in_array_allocation_expression = false;
-		this.insert_space_before_closing_bracket_in_array_reference = false;
-		this.insert_space_before_closing_paren_in_cast = false;
-		this.insert_space_before_closing_paren_in_catch = false;
-		this.insert_space_before_closing_paren_in_constructor_declaration = false;
-		this.insert_space_before_closing_paren_in_for = false;
-		this.insert_space_before_closing_paren_in_if = false;
-		this.insert_space_before_closing_paren_in_method_declaration = false;
-		this.insert_space_before_closing_paren_in_method_invocation = false;
-		this.insert_space_before_closing_paren_in_parenthesized_expression = false;
-		this.insert_space_before_closing_paren_in_switch = false;
-		this.insert_space_before_closing_paren_in_synchronized = false;
-		this.insert_space_before_closing_paren_in_while = false;
-		this.insert_space_before_colon_in_assert = true;
-		this.insert_space_before_colon_in_case = true;
-		this.insert_space_before_colon_in_conditional = true;
-		this.insert_space_before_colon_in_default = true;
-		this.insert_space_before_colon_in_labeled_statement = true;
-		this.insert_space_before_comma_in_allocation_expression = false;
-		this.insert_space_before_comma_in_array_initializer = false;
-		this.insert_space_before_comma_in_constructor_declaration_parameters = false;
-		this.insert_space_before_comma_in_constructor_declaration_throws = false;
-		this.insert_space_before_comma_in_explicit_constructor_call_arguments = false;
-		this.insert_space_before_comma_in_for_increments = false;
-		this.insert_space_before_comma_in_for_inits = false;
-		this.insert_space_before_comma_in_method_invocation_arguments = false;
-		this.insert_space_before_comma_in_method_declaration_parameters = false;
-		this.insert_space_before_comma_in_method_declaration_throws = false;
-		this.insert_space_before_comma_in_multiple_field_declarations = false;
-		this.insert_space_before_comma_in_multiple_local_declarations = false;
-		this.insert_space_before_comma_in_superinterfaces = false;
-		this.insert_space_before_opening_brace_in_anonymous_type_declaration = true;
-		this.insert_space_before_opening_brace_in_array_initializer = false;
-		this.insert_space_before_opening_brace_in_block = true;
-		this.insert_space_before_opening_brace_in_constructor_declaration = true;
-		this.insert_space_before_opening_brace_in_method_declaration = true;
-		this.insert_space_before_opening_brace_in_switch = true;
-		this.insert_space_before_opening_brace_in_type_declaration = true;
-		this.insert_space_before_opening_bracket_in_array_allocation_expression = false;
-		this.insert_space_before_opening_bracket_in_array_reference = false;
-		this.insert_space_before_opening_bracket_in_array_type_reference = false;
-		this.insert_space_before_opening_paren_in_catch = true;
-		this.insert_space_before_opening_paren_in_constructor_declaration = false;
-		this.insert_space_before_opening_paren_in_for = true;
-		this.insert_space_before_opening_paren_in_if = true;
-		this.insert_space_before_opening_paren_in_method_invocation = false;
-		this.insert_space_before_opening_paren_in_method_declaration = false;
-		this.insert_space_before_opening_paren_in_switch = true;
-		this.insert_space_before_opening_paren_in_synchronized = true;
-		this.insert_space_before_opening_paren_in_parenthesized_expression = false;
-		this.insert_space_before_opening_paren_in_while = true;
-		this.insert_space_before_postfix_operator = false;
-		this.insert_space_before_prefix_operator = false;
-		this.insert_space_before_question_in_conditional = true;
-		this.insert_space_before_semicolon = false;
-		this.insert_space_before_semicolon_in_for = false;
-		this.insert_space_before_unary_operator = false;
-		this.insert_space_between_brackets_in_array_type_reference = false;
-		this.insert_space_between_empty_braces_in_array_initializer = false;
-		this.insert_space_between_empty_brackets_in_array_allocation_expression = false;
-		this.insert_space_between_empty_parens_in_constructor_declaration = false;
-		this.insert_space_between_empty_parens_in_method_declaration = false;
-		this.insert_space_between_empty_parens_in_method_invocation = false;
-		this.compact_else_if = true;
-		this.keep_guardian_clause_on_one_line = false;
-		this.keep_else_statement_on_same_line = false;
-		this.keep_empty_array_initializer_on_one_line = false;
-		this.keep_simple_if_on_one_line = false;
-		this.keep_then_statement_on_same_line = false;
-		this.number_of_empty_lines_to_preserve = 1;
-		this.put_empty_statement_on_new_line = false;
-		this.tab_size = 4;
-		this.page_width = 80;
-		this.use_tab = true; // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=49081
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/TestOptionsSetup.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/TestOptionsSetup.java
deleted file mode 100644
index 8403bd3..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/TestOptionsSetup.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-public class TestOptionsSetup extends TestSetup {
-
-	public TestOptionsSetup(Test test) {
-		super(test);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		JavaCore.setOptions(TestOptions.getFormatterOptions());
-		TestOptions.initializeCodeGenerationOptions();
-		// Use load since restore doesn't really restore the defaults.
-		JavaPlugin.getDefault().getCodeTemplateStore().load();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/test/HelloWorld.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/test/HelloWorld.java
deleted file mode 100644
index c1e7ec1..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/test/HelloWorld.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-
-public class HelloWorld extends TestCase {
-	
-	private IJavaProject fJProject;
-	
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite();
-		suite.addTest(new HelloWorld("test1"));
-		return suite;
-	}		
-	
-	public HelloWorld(String name) {
-		super(name);
-	}
-	
-	protected void setUp() throws Exception {
-			fJProject= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fJProject);
-	}	
-		
-	public void test1() throws Exception {
-		if (JavaProjectHelper.addRTJar(fJProject) == null) {
-			assertTrue("jdk not found", false);
-			return;
-		}
-		
-		String name= "java/util/Vector.java";
-		IClassFile classfile= (IClassFile) fJProject.findElement(new Path(name));
-		assertTrue("classfile not found", classfile != null);
-		
-		IType type= classfile.getType();
-		System.out.println("methods of Vector");
-		IMethod[] methods= type.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			System.out.println(methods[i].getElementName());
-		}
-	}		
-
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/test/JavaTestCase.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/test/JavaTestCase.java
deleted file mode 100644
index 8df77c8..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/test/JavaTestCase.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-
-public class JavaTestCase extends TestCase {
-	
-	private IJavaProject fJavaProject;
-
-	public JavaTestCase(String name) {
-		super(name);
-	}
-			
-	public static Test suite() {
-		TestSuite suite= new TestSuite();
-		suite.addTest(new JavaTestCase("doTest1"));
-		return suite;
-	}
-	
-	/**
-	 * Creates a new test Java project.
-	 */	
-	protected void setUp() throws Exception {
-		fJavaProject= JavaProjectHelper.createJavaProject("HelloWorldProject", "bin");
-
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		IPackageFragment pack= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= pack.getCompilationUnit("A.java");
-		IType type= cu.createType("public class A {\n}\n", null, true, null);
-		type.createMethod("public void a() {}\n", null, true, null);
-		type.createMethod("public void b(java.util.Vector v) {}\n", null, true, null);
-	}
-
-	/**
-	 * Removes the test java project.
-	 */	
-	protected void tearDown () throws Exception {
-		JavaProjectHelper.delete(fJavaProject);
-	}
-				
-	/*
-	 * Basic test: Checks for created methods.
-	 */
-	public void doTest1() throws Exception {
-		
-		String name= "ibm/util/A.java";
-		ICompilationUnit cu= (ICompilationUnit) fJavaProject.findElement(new Path(name));
-		assertTrue("A.java must exist", cu != null);
-		IType type= cu.getType("A");
-		assertTrue("Type A must exist", type != null);
-		
-		System.out.println("methods of A");
-		IMethod[] methods= type.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			System.out.println(methods[i].getElementName());
-		}
-		assertTrue("Should contain 2 methods", methods.length == 2);
-	}	
-	
-
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/AccessibilityTestPass.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/AccessibilityTestPass.java
deleted file mode 100644
index 5692915..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/AccessibilityTestPass.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.util;
-
-
-import java.util.ArrayList;
-
-
-public class AccessibilityTestPass implements IDialogTestPass {
-	private static final int CHECKLIST_SIZE = 5;
-	
-	/**
-	 * @see IDialogTestPass#title()
-	 */
-	public String title() {
-		return "Test Pass: Accessibility";
-	}
-	/**
-	 * @see IDialogTestPass#description()
-	 */
-	public String description() {
-		return "Verify the accessibility of the dialogs.";
-	}
-	/**
-	 * @see IDialogTestPass#label()
-	 */
-	public String label() {
-		return "&Accessibility";
-	}	
-	/**
-	 * @see IDialogTestPass#checkListTexts()
-	 */
-	public ArrayList checkListTexts() {
-		ArrayList list = new ArrayList(CHECKLIST_SIZE);
-		list.add("&1) all widgets are accessible by tabbing.");
-		list.add("&2) forwards and backwards tabbing is in a logical order");
-		list.add("&3) all the widgets with labels have an appropriate mnemonic.");
-		list.add("&4) there are no duplicate mnemonics.");
-		list.add("&5) selectable widgets can be selected using the spacebar.");
-		return list;
-	}
-	/**
-	 * @see IDialogTestPass#failureTexts()
-	 * Size of the return array must be the same size as the checkListTexts'
-	 * ArrayList.
-	 */
-	public String[] failureTexts() {
-		String[] failureText = new String[CHECKLIST_SIZE];
-		failureText[0] = "Some widgets aren't accessible by tabbing.";
-		failureText[1] = "Tabbing order is illogical.";
-		failureText[2] = "Missing or inappropriate mnemonics.";
-		failureText[3] = "Duplicate mnemonics.";
-		failureText[4] = "Some widgets cannot be selected using the spacebar.";
-		return failureText;
-	}
-	/**
-	 * @see IDialogTestPass#queryText()
-	 */
-	public String queryText() {
-		return "Is the accessibility of the dialog acceptable?";
-	}
-	/**
-	 * @see IDialogTestPass#getID()
-	 */
-	public int getID() {
-		return VerifyDialog.TEST_ACCESS;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/DialogCheck.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/DialogCheck.java
deleted file mode 100644
index ce60bee..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/DialogCheck.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.util;
-
-
-
-
-import junit.framework.Assert;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A <code>DialogCheck</code> is used test a dialog in
- * various ways. 
- * <p>
- * For interactive tests use <code>assertDialog</code>.
- * For automated tests use <code>assert DialogTexts</code>.
- * </p> 
- */
-public class DialogCheck {
-	private DialogCheck() {
-	}
-	private static VerifyDialog _verifyDialog;
-
-
-	/**
-	 * Asserts that a given dialog is not null and that it passes
-	 * certain visual tests.  These tests will be verified manually
-	 * by the tester using an input dialog.  Use this assert method
-	 * to verify a dialog's sizing, initial focus, or accessiblity.
-	 * To ensure that both the input dialog and the test dialog are
-	 * accessible by the tester, the getShell() method should be used
-	 * when creating the test dialog.
-	 * 
-	 * Example usage:
-	 * <code>Dialog dialog = new AboutDialog( DialogCheck.getShell() );
-	 * DialogCheck.assertDialog(dialog, this);</code>
-	 * 
-	 * @param dialog the test dialog to be verified.
-	 */
-	public static void assertDialog(Dialog dialog) {
-		Assert.assertNotNull(dialog);
-		if (_verifyDialog.getShell() == null) {
-			//force the creation of the verify dialog
-			getShell();
-		}
-		if (_verifyDialog.open(dialog) == IDialogConstants.NO_ID) {
-			Assert.assertTrue(_verifyDialog.getFailureText(), false);
-		}
-	}
-
-
-	/**
-	 * Automated test that checks all the labels and buttons of a dialog
-	 * to make sure there is enough room to display all the text.  Any
-	 * text that wraps is only approximated and is currently not accurate.
-	 * 
-	 * @param dialog the test dialog to be verified.
-	 */
-	public static void assertDialogTexts(Dialog dialog) {
-		Assert.assertNotNull(dialog);
-		dialog.setBlockOnOpen(false);
-		dialog.open();
-		Shell shell = dialog.getShell();
-		verifyCompositeText(shell);
-		dialog.close();
-	}
-
-
-	/**
-	 * This method should be called when creating dialogs to test.  This
-	 * ensures that the dialog's parent shell will be that of the
-	 * verification dialog.
-	 * 
-	 * @return Shell The shell of the verification dialog to be used as
-	 * the parent shell of the test dialog.
-	 */
-	public static Shell getShell() {
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		_verifyDialog = new VerifyDialog(shell);
-		_verifyDialog.create();
-		return _verifyDialog.getShell();
-	}
-
-
-	/*
-	 * Looks at all the child widgets of a given composite and
-	 * verifies the text on all labels and widgets.
-	 * @param composite The composite to look through
-	 */
-	private static void verifyCompositeText(Composite composite) {
-		Control children[] = composite.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			try {
-				//verify the text if the child is a button
-				verifyButtonText((Button) children[i]);
-			} catch (ClassCastException exNotButton) {
-				try {
-					//child is not a button, maybe a label
-					verifyLabelText((Label) children[i]);
-				} catch (ClassCastException exNotLabel) {
-					try {
-						//child is not a label, make a recursive call if it is a composite
-						verifyCompositeText((Composite) children[i]);
-					} catch (ClassCastException exNotComposite) {
-						//the child is not a button, label, or composite - ignore it.
-					}
-				}
-			}
-		}
-	}
-	
-	/*
-	 * Verifies that a given button is large enough to display its text.
-	 * @param button The button to verify,
-	 */
-	private static void verifyButtonText(Button button) {
-		String widget = button.toString();
-		Point size = button.getSize();
-
-
-		//compute the size with no line wrapping
-		Point preferred = button.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		//if (size.y/preferred.y) == X, then label spans X lines, so divide
-		//the calculated value of preferred.x by X
-		if (preferred.y * size.y > 0) {
-			preferred.y /= countLines(button.getText()); //check for '\n\'
-			if (size.y / preferred.y > 1) {
-				preferred.x /= (size.y / preferred.y);
-			}
-		}
-
-
-		String message =
-			new StringBuffer("Warning: ")
-				.append(widget)
-				.append("\n\tActual Width -> ")
-				.append(size.x)
-				.append("\n\tRecommended Width -> ")
-				.append(preferred.x)
-				.toString();
-		if (preferred.x > size.x) {
-			//close the dialog
-			button.getShell().dispose();
-			Assert.assertTrue(message.toString(), false);
-		}
-	}
-	
-	/*
-	 * Verifies that a given label is large enough to display its text.
-	 * @param label The label to verify,
-	 */
-	private static void verifyLabelText(Label label) {
-		String widget = label.toString();
-		Point size = label.getSize();
-
-
-		//compute the size with no line wrapping
-		Point preferred = label.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		//if (size.y/preferred.y) == X, then label spans X lines, so divide
-		//the calculated value of preferred.x by X
-		if (preferred.y * size.y > 0) {
-			preferred.y /= countLines(label.getText());
-			if (size.y / preferred.y > 1) {
-				preferred.x /= (size.y / preferred.y);
-			}
-		}
-		String message =
-			new StringBuffer("Warning: ")
-				.append(widget)
-				.append("\n\tActual Width -> ")
-				.append(size.x)
-				.append("\n\tRecommended Width -> ")
-				.append(preferred.x)
-				.toString();
-		if (preferred.x > size.x) {
-			//close the dialog
-			label.getShell().dispose();
-			Assert.assertTrue(message.toString(), false);
-		}
-	}
-	
-	/*
-	 * Counts the number of lines in a given String.
-	 * For example, if a string contains one (1) newline character,
-	 * a value of two (2) would be returned.
-	 * @param text The string to look through.
-	 * @return int the number of lines in text.
-	 */
-	private static int countLines(String text) {
-		int newLines = 1;
-		for (int i = 0; i < text.length(); i++) {
-			if (text.charAt(i) == '\n') {
-				newLines++;
-			}
-		}
-		return newLines;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/FailureDialog.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/FailureDialog.java
deleted file mode 100644
index a5b264a..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/FailureDialog.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.util;
-
-
- 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-
-
-/*
- * A dialog for collecting notes from the tester regarding
- * the failure of a test.
- */
-public class FailureDialog extends Dialog {
-	private Text _text;
-	private String _log;
-	private int SIZING_TEXT_WIDTH = 400;
-	private int SIZING_TEXT_HEIGHT = 200;
-	
-	/**
-	 * Constructor for FailureDialog
-	 */
-	public FailureDialog(Shell parentShell) {
-		super(parentShell);
-	}
-	/* (non-Javadoc)
-	 * Method declared on Window.
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText("Dialog Test Failed");
-	}
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, "&OK", true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected Control createDialogArea(Composite parent) {
-		// page group
-		Composite composite = (Composite)super.createDialogArea(parent);
-		composite.setSize( composite.computeSize(SWT.DEFAULT, SWT.DEFAULT) );
-		
-		Label label = new Label(composite, SWT.WRAP);
-		label.setText("&Enter a note regarding the failure:");
-		
-		_text = new Text(composite, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		_text.setFont( JFaceResources.getFontRegistry().get(JFaceResources.TEXT_FONT) );
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = SIZING_TEXT_WIDTH;
-		data.heightHint = SIZING_TEXT_HEIGHT;
-		_text.setLayoutData(data);
-		
-		return composite;
-	}
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected void okPressed() {		
-		_log = _text.getText();
-		super.okPressed();
-	}
-	/*
-	 * @return String the text contained in the input area of
-	 * the dialog.
-	 */
-	String getText() {
-		if (_log == null) {
-			return "Empty entry.";
-		} else {
-			return _log;
-		}
-	}
-	/*
-	 * Sets the text of the input area.  This should only be
-	 * called to set the initial text so only call before invoking
-	 * open().
-	 */
-	void setText(String text) {
-		_text.setText(text);
-	}
-	/*
-	 * Returns a string representation of this class which
-	 * the text contained in the input area of the dialog.
-	 */
-	public String toString() {
-		return getText();
-	}
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/FocusTestPass.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/FocusTestPass.java
deleted file mode 100644
index c4f4339..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/FocusTestPass.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.util;
-
-
- 
-import java.util.ArrayList;
-
-
-/*
- * This test pass verifies the initial focus of a dialog
- * when it is given focus.
- */
-public class FocusTestPass implements IDialogTestPass {
-	private static final int CHECKLIST_SIZE = 1;
-
-
-	/**
-	 * @see IDialogTestPass#title()
-	 */
-	public String title() {
-		return "Test Pass: Initial Focus";
-	}
-	/**
-	 * @see IDialogTestPass#description()
-	 */
-	public String description() {
-		return "Verify the initial focus of the dialogs.";
-	}
-	/**
-	 * @see IDialogTestPass#label()
-	 */
-	public String label() {
-		return "&Initial Focus";
-	}	
-	/**
-	 * @see IDialogTestPass#checkListTexts()
-	 */
-	public ArrayList checkListTexts() {
-		ArrayList list = new ArrayList(CHECKLIST_SIZE);
-		list.add("&1) the initial focus is appropriate.");
-		return list;
-	}
-	/**
-	 * @see IDialogTestPass#failureTexts()
-	 * Size of the return array must be the same size as the checkListTexts'
-	 * ArrayList.
-	 */
-	public String[] failureTexts() {
-		String[] failureText = new String[CHECKLIST_SIZE];
-		failureText[0] = "The initial focus is inappropriate.";
-		return failureText;
-	}
-	/**
-	 * @see IDialogTestPass#queryText()
-	 */
-	public String queryText() {
-		return "Is the initial focus of the dialog correct?";
-	}
-	/**
-	 * @see IDialogTestPass#getID()
-	 */
-	public int getID() {
-		return VerifyDialog.TEST_FOCUS;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/IDialogTestPass.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/IDialogTestPass.java
deleted file mode 100644
index 097d2db..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/IDialogTestPass.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.util;
-
-
-import java.util.ArrayList;
-
-
-/*
- * Interface to describe a visual test pass for a dialog test.
- */
-public interface IDialogTestPass {
-	/*
-	 * @return String The title of the test pass.
-	 */
-	public String title();
-	/*
-	 * @return String The description of the test pass.
-	 */
-	public String description();
-	/*
-	 * @return String The label of the test pass to be used
-	 * in a selection list.  The return includes an '&'
-	 * if a mnemonic is desired.
-	 */
-	public String label();
-	/*
-	 * @return ArrayList A list of items to appear in a checklist.
-	 * The items in the list must be Strings and should include an
-	 * '&' if a mnemonic is desired.
-	 */
-	public ArrayList checkListTexts();
-	/*
-	 * @return String[] Associated failure messages that correspond
-	 * to the checklist items.  The size of this array should be the
-	 * same size as the checklist.
-	 */
-	public String[] failureTexts();
-	/*
-	 * @return String The test that corresponds to the test pass to
-	 * which the tester will respond with a 'yes' or 'no'.
-	 */
-	public String queryText();
-	/*
-	 * @return int A unique number that identifies the test pass.
-	 */
-	public int getID();
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/SizingTestPass.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/SizingTestPass.java
deleted file mode 100644
index 44c15ae..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/SizingTestPass.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.util;
-
-
- 
-import java.util.ArrayList;
-
-
-/*
- * This test pass verifies visually the sizing of the dialog and its
- * widgets.
- */
-class SizingTestPass implements IDialogTestPass {
-	private static final int CHECKLIST_SIZE = 5;
-
-
-	/**
-	 * @see IDialogTestPass#title()
-	 */
-	public String title() {
-		return "Test Pass: Sizing and Display";
-	}
-	/**
-	 * @see IDialogTestPass#description()
-	 */
-	public String description() {
-		return "Verify the sizing and display of the dialogs and widgets.";
-	}
-	/**
-	 * @see IDialogTestPass#label()
-	 */
-	public String label() {
-		return "&Sizing and Display";
-	}	
-	/**
-	 * @see IDialogTestPass#checkListTexts()
-	 */
-	public ArrayList checkListTexts() {
-		ArrayList list = new ArrayList(CHECKLIST_SIZE);
-		list.add("&1) the correct dialog displays.");
-		list.add("&2) the dialog is an appropriate size for the required resolution (1024x768).");
-		list.add("&3) the texts are correct and not cut off.");
-		list.add("&4) all strings have been externalized properly.");
-		list.add("&5) all the widgets are viewable and not cut off.");
-		return list;
-	}
-	/**
-	 * @see IDialogTestPass#failureTexts()
-	 * Size of the return array must be the same size as the checkListTexts'
-	 * ArrayList.
-	 */
-	public String[] failureTexts() {
-		String[] failureText = new String[CHECKLIST_SIZE];
-		failureText[0] = "The wrong dialog displayed.";
-		failureText[1] = "The dialog is too large for the required resolution.";
-		failureText[2] = "Text labels are wrong or cut off.";
-		failureText[3] = "Some strings have not been externalized properly.";
-		failureText[4] = "Some widgets are cut off.";
-		return failureText;
-	}
-	/**
-	 * @see IDialogTestPass#queryText()
-	 */
-	public String queryText() {
-		return "Is the sizing and display of the dialog correct?";
-	}
-	/**
-	 * @see IDialogTestPass#getID()
-	 */
-	public int getID() {
-		return VerifyDialog.TEST_SIZING;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/VerifyDialog.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/VerifyDialog.java
deleted file mode 100644
index 75556b1..0000000
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/VerifyDialog.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.testplugin.util;
-
-
-import java.util.Iterator;
-
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-
-/*
- * This dialog is intended to verify a dialogs in a testing
- * environment.  The tester can test for sizing, initial focus,
- * or accessibility.
- */
-public class VerifyDialog extends TitleAreaDialog {
-	private int SIZING_WIDTH = 400;
-	
-	private static int      TEST_TYPE;
-	public static final int TEST_SIZING = 0;
-	public static final int TEST_FOCUS  = 1;
-	public static final int TEST_ACCESS = 2;
-	private IDialogTestPass _dialogTests[] = new IDialogTestPass[3];
-
-
-	private Dialog _testDialog; //the dialog to test
-	private Point  _testDialogSize;
-	
-	private Label  _queryLabel;
-	private Button _yesButton;
-	private Button _checkList[];
-	private String _failureText;
-	
-	/*
-	 * Create an instance of the verification dialog.
-	 */
-	public VerifyDialog(Shell parent) {
-		super(parent);
-		if ( !(TEST_TYPE <= 2) && !(TEST_TYPE >= 0) ) {
-			TEST_TYPE = TEST_SIZING;
-		}
-		_failureText = "";
-		_dialogTests[0] = new SizingTestPass();
-		_dialogTests[1] = new FocusTestPass();
-		_dialogTests[2] = new AccessibilityTestPass();
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on Window.
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText("Dialog Verification");
-		setShellStyle(SWT.NONE);
-	}
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		_yesButton = createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true);
-		createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, false);
-	}
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected void buttonPressed(int buttonId) {
-		if (IDialogConstants.YES_ID == buttonId) {
-			setReturnCode(IDialogConstants.YES_ID);
-			if (_testDialog.getShell() != null) {
-				_testDialog.close();
-			}
-			close();
-		} else if (IDialogConstants.NO_ID == buttonId) {
-			handleFailure();
-		}
-	}
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected Control createDialogArea(Composite parent) {
-		// top level composite
-		Composite parentComposite = (Composite)super.createDialogArea(parent);
-
-
-		// create a composite with standard margins and spacing
-		Composite composite = new Composite(parentComposite, SWT.NONE);
-		composite.setSize(SIZING_WIDTH, SWT.DEFAULT);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-
-		createTestSelectionGroup(composite);
-		createCheckListGroup(composite);
-
-
-		_queryLabel = new Label(composite, SWT.NONE);
-		_queryLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		initializeTest();
-		return composite;
-	}
-	/*
-	 * Group for selecting type of test.
-	 */
-	private void createTestSelectionGroup(Composite parent) {
-		Group group = new Group(parent, SWT.SHADOW_NONE);
-		group.setText("Testing:");
-		group.setLayout( new GridLayout() );
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		group.setLayoutData(data);
-		
-		for (int i = 0; i < _dialogTests.length; i++) {
-			Button radio = new Button(group, SWT.RADIO);
-			radio.setText( _dialogTests[i].label() );
-			final int testID = _dialogTests[i].getID();
-			radio.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					TEST_TYPE = testID;
-					initializeTest();
-					_yesButton.setEnabled(true);
-				}
-			});
-			if ( TEST_TYPE == _dialogTests[i].getID() ) {
-				radio.setSelection(true);
-			}
-		}
-	}
-	/*
-	 * Initializes the checklist with empty checks.
-	 */
-	private void createCheckListGroup(Composite parent) {
-		Group group = new Group(parent, SWT.SHADOW_NONE);
-		group.setText("Verify that:");
-		group.setLayout( new GridLayout() );
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		group.setLayoutData(data);
-		
-		int checkListSize = 0;
-		for (int i = 0; i < _dialogTests.length; i++) {
-			int size = _dialogTests[i].checkListTexts().size();
-			if (size > checkListSize) {
-				checkListSize = size;
-			}
-		}
-		_checkList = new Button[checkListSize];
-		SelectionAdapter selectionAdapter = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				checkYesEnable();
-			}
-		};
-		for (int i = 0; i < checkListSize; i++) {
-			_checkList[i] = new Button(group, SWT.CHECK);
-			_checkList[i].addSelectionListener(selectionAdapter);
-			data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-			data.grabExcessHorizontalSpace = true;
-			_checkList[i].setLayoutData(data);
-		}		
-	}
-	/*
-	 * Disables the yes button if any of the items in the checklist
-	 * are unchecked.  Enables the yes button otherwise.
-	 */
-	private void checkYesEnable() {
-		boolean enable = true;
-		for (int i = 0; i < _checkList.length; i++) {
-			if ( !_checkList[i].getSelection() ) {
-				enable = false;
-			}			
-		}
-		_yesButton.setEnabled(enable);
-	}
-	/*
-	 * Initializes the checklist, banner texts, and query label
-	 */
-	private void initializeTest() {
-		IDialogTestPass test = _dialogTests[TEST_TYPE];
-		setTitle( test.title() );
-		setMessage( test.description() );
-		Iterator iterator = test.checkListTexts().iterator();
-		for (int i = 0; i < _checkList.length; i++) {
-			if ( iterator.hasNext() ) {
-				_checkList[i].setText( iterator.next().toString() );
-				_checkList[i].setVisible(true);
-				_checkList[i].update();
-			} else {
-				_checkList[i].setVisible(false);
-				_checkList[i].update();
-			}
-			_checkList[i].setSelection(true);
-		}
-		_queryLabel.setText( test.queryText() );
-	}
-	public String getFailureText() {
-		return _failureText;
-	}
-	/*
-	 * Can't open the verification dialog without a specified
-	 * test dialog, this simply returns a failure and prevents
-	 * opening.  Should use open(Dialog) instead.
-	 * 
-	 */
-	public int open() {
-		_failureText = "Testing dialog is required, use VerifyDialog::open(Dialog)";
-		return IDialogConstants.NO_ID;
-	}
-	/*
-	 * Opens the verification dialog to test the specified dialog.
-	 */
-	public int open(Dialog testDialog) {
-		if (getShell() == null) {
-			create();
-		}
-		getShell().setLocation(0, 0);
-		getShell().setSize(Math.max(SIZING_WIDTH, getShell().getSize().x), getShell().getSize().y);
-		_testDialog = testDialog;
-		if (_testDialog.getShell() == null) {
-			_testDialog.create();
-		}
-		_testDialogSize = _testDialog.getShell().getSize();
-		openNewTestDialog();
-		
-		return super.open();
-	}
-	/*
-	 * Opens the dialog to be verified.
-	 */
-	private void openNewTestDialog() {
-		if (_testDialog.getShell() == null) {
-			_testDialog.create();
-		}
-		_testDialog.setBlockOnOpen(false);
-		_testDialog.getShell().setLocation(getShell().getSize().x + 1, 0);
-		_testDialog.getShell().setSize(_testDialogSize);
-		_testDialog.getShell().addShellListener(new ShellAdapter() {
-			public void shellClosed(ShellEvent e) {				
-				e.doit = false;
-			}
-		
-		});		
-		_testDialog.open();
-	}
-	/*
-	 * The test dialog failed, open the failure dialog.
-	 */
-	private void handleFailure() {
-		IDialogTestPass test = _dialogTests[TEST_TYPE];
-		StringBuffer text = new StringBuffer();
-		String label = test.label();
-		label = label.substring(0, label.indexOf("&")) +
-		        label.substring(label.indexOf("&") + 1);
-		text.append(label).
-		     append(" failed on the ").
-		     append(SWT.getPlatform()).
-		     append(" platform:\n");
-		
-		String failureMessages[] = test.failureTexts();
-		for (int i = 0; i < test.checkListTexts().size(); i++) {
-			if ( !_checkList[i].getSelection() ) {
-				text.append("- ").append(failureMessages[i]).append("\n");
-			}
-		}
-		FailureDialog dialog = new FailureDialog( getShell() );
-		dialog.create();
-		dialog.setText( text.toString() );
-		if (dialog.open() == IDialogConstants.OK_ID) {
-			_failureText = dialog.toString();
-			setReturnCode(IDialogConstants.NO_ID);
-			if (_testDialog.getShell() != null) {
-				_testDialog.close();
-			}
-			close();
-		}
-	}
-	/*
-	 * In case the shell was closed by a means other than
-	 * the NO button.
-	 */
-	protected void handleShellCloseEvent() {
-		handleFailure();
-	}
-}
-
-

diff --git a/org.eclipse.jdt.ui.tests/test.xml b/org.eclipse.jdt.ui.tests/test.xml
deleted file mode 100644
index e9c2cec..0000000
--- a/org.eclipse.jdt.ui.tests/test.xml
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-  <property name="org.eclipse.jdt.ui.tests" value="org.eclipse.jdt.ui.tests_3.1.0"/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jdt.ui.tests"/>
-  <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
-    <delete dir="${jdt-folder}" quiet="true"/>
-   	<condition property="os.isWindows">
-    	<os family="windows"/>
-  	</condition>
-
-  	
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.ui.tests.AutomatedSuite"/>
-    </ant>
-    
-  </target>
-  
-    <!-- leak test target -->
-  <target name="leaksuite" depends="checkOS" if="os.isWindows">
-    <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
-
-    <delete dir="${jdt-folder}" quiet="true"/>
-  	
-    <copy file="${eclipse-home}/plugins/${org.eclipse.jdt.ui.tests}/leaks/ProfileNatives.dll" todir="${java.home}/bin" />	
-    
-		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="vmargs" value="-Xint -XrunProfileNatives"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.ui.tests.LeakTestSuite"/>
-    </ant>
-    
-  </target>
-
-  <!-- performance test target -->
-  <target name="performance-suite">
-    <property name="jdt-ui-performance-folder" value="${eclipse-home}/jdt_ui_performance_folder"/>
-    <delete dir="${jdt-ui-performance-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-ui-performance-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jdt.ui.tests.performance.PerformanceTestSuite"/>
-    </ant>
-  </target>
-  
-  <target name="checkOS">
-   	<condition property="os.isWindows">
-    	<os family="windows"/>
-  	</condition>
-  </target>
-  
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,leaksuite,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-
-  </target>
-
-  <!-- This target runs the performance test suites. -->
-  <target name="performance" depends="init,performance-suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>		
-
-</project>

diff --git a/org.eclipse.jdt.ui.tests/testresources/compoundtest.jar b/org.eclipse.jdt.ui.tests/testresources/compoundtest.jar
deleted file mode 100644
index ae5ea24..0000000
--- a/org.eclipse.jdt.ui.tests/testresources/compoundtest.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests/testresources/junit37-noUI-src.zip b/org.eclipse.jdt.ui.tests/testresources/junit37-noUI-src.zip
deleted file mode 100644
index 4f95d30..0000000
--- a/org.eclipse.jdt.ui.tests/testresources/junit37-noUI-src.zip
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests/testresources/myinternallib.jar b/org.eclipse.jdt.ui.tests/testresources/myinternallib.jar
deleted file mode 100644
index 22228df..0000000
--- a/org.eclipse.jdt.ui.tests/testresources/myinternallib.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests/testresources/mylib.jar b/org.eclipse.jdt.ui.tests/testresources/mylib.jar
deleted file mode 100644
index 140e3c6..0000000
--- a/org.eclipse.jdt.ui.tests/testresources/mylib.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests/testresources/org.eclipse.swt-R3_0.zip b/org.eclipse.jdt.ui.tests/testresources/org.eclipse.swt-R3_0.zip
deleted file mode 100644
index 3fe5680..0000000
--- a/org.eclipse.jdt.ui.tests/testresources/org.eclipse.swt-R3_0.zip
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests/testresources/rtstubs.jar b/org.eclipse.jdt.ui.tests/testresources/rtstubs.jar
deleted file mode 100644
index cf3edc3..0000000
--- a/org.eclipse.jdt.ui.tests/testresources/rtstubs.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/AutomatedSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/AutomatedSuite.java
deleted file mode 100644
index c023e4e..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/AutomatedSuite.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.TestOptionsSetup;
-
-import org.eclipse.jdt.ui.tests.astrewrite.ASTRewritingTest;
-import org.eclipse.jdt.ui.tests.browsing.PackagesViewContentProviderTests;
-import org.eclipse.jdt.ui.tests.browsing.PackagesViewDeltaTests;
-import org.eclipse.jdt.ui.tests.callhierarchy.CallHierarchyContentProviderTest;
-import org.eclipse.jdt.ui.tests.core.CoreTests;
-import org.eclipse.jdt.ui.tests.packageview.PackageExplorerContentProviderTests;
-import org.eclipse.jdt.ui.tests.quickfix.QuickFixTest;
-import org.eclipse.jdt.ui.tests.search.SearchTest;
-import org.eclipse.jdt.ui.tests.wizardapi.NewJavaProjectWizardTest;
-
-
-/**
- * Test all areas of the UI.
- */
-public class AutomatedSuite extends TestSuite {
-
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new TestOptionsSetup(new AutomatedSuite());
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public AutomatedSuite() {
-		addTest(CoreTests.suite());
-		addTest(ASTRewritingTest.suite());
-		addTest(QuickFixTest.suite());
-		
-		addTest(NewJavaProjectWizardTest.suite());
-		
-		addTest(PackageExplorerContentProviderTests.suite());
-		
-		addTest(PackagesViewContentProviderTests.suite());
-		addTest(PackagesViewDeltaTests.suite());
-		
-		addTest(CallHierarchyContentProviderTest.suite());
-		
-		addTest(SearchTest.suite()); 
-	}
-}
-

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/LeakTestSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/LeakTestSuite.java
deleted file mode 100644
index 2709b98..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/LeakTestSuite.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Test for leaks
- */
-public class LeakTestSuite extends TestSuite {
-
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new LeakTestSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public LeakTestSuite() {
-		//addTest(JavaLeakTest.suite());
-	}
-	
-}
-

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/UIInteractiveSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/UIInteractiveSuite.java
deleted file mode 100644
index c5edad5..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/UIInteractiveSuite.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.ui.tests.dialogs.DialogsTest;
-import org.eclipse.jdt.ui.tests.dialogs.PreferencesTest;
-import org.eclipse.jdt.ui.tests.dialogs.WizardsTest;
-
-/**
- * Test all areas of the UI.
- */
-public class UIInteractiveSuite extends TestSuite {
-
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new UIInteractiveSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public UIInteractiveSuite() {
-		addTest(PreferencesTest.suite());
-		addTest(WizardsTest.suite());
-		addTest(DialogsTest.suite());
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/astrewrite/ASTRewritingCollapseTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/astrewrite/ASTRewritingCollapseTest.java
deleted file mode 100644
index fbf9a3a..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/astrewrite/ASTRewritingCollapseTest.java
+++ /dev/null

@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.astrewrite;
-
-import java.util.Hashtable;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Block;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ExpressionStatement;
-import org.eclipse.jdt.core.dom.IfStatement;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.MethodInvocation;
-import org.eclipse.jdt.core.dom.ReturnStatement;
-import org.eclipse.jdt.core.dom.Statement;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.dom.NodeFinder;
-import org.eclipse.jdt.internal.corext.dom.OldASTRewrite;
-
-public class ASTRewritingCollapseTest extends ASTRewritingTest {
-	
-	private static final Class THIS= ASTRewritingCollapseTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public ASTRewritingCollapseTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ASTRewritingCollapseTest("testCollapsedTargetNodes2"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-	
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);			
-		
-		fJProject1= ProjectTestSetup.getProject();
-		
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-	
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-	
-// tests for collapse	
-	
-	
-	public void testCollapsedTargetNodes() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= createAST(cu);
-		AST ast= astRoot.getAST();
-		OldASTRewrite rewrite= new OldASTRewrite(astRoot);
-		
-		String str= "return;";
-		ReturnStatement returnStatement= (ReturnStatement) NodeFinder.perform(astRoot, buf.indexOf(str), str.length());
-		
-		MethodInvocation newMethodInv1= ast.newMethodInvocation();
-		newMethodInv1.setName(ast.newSimpleName("foo1"));
-		ExpressionStatement st1= ast.newExpressionStatement(newMethodInv1);
-		
-		MethodInvocation newMethodInv2= ast.newMethodInvocation();
-		newMethodInv2.setName(ast.newSimpleName("foo2"));
-		ExpressionStatement st2= ast.newExpressionStatement(newMethodInv2);
-		
-		Block placeholder= rewrite.getCollapseTargetPlaceholder(new Statement[] { st1, st2 });
-		rewrite.replace(returnStatement, placeholder, null);
-			
-		String preview= evaluateRewrite(cu, rewrite); 
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        foo1();\n");
-		buf.append("        foo2();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();		
-
-		assertEqualString(preview, expected);
-	}
-	
-	public void testCollapsedTargetNodes2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        {\n");
-		buf.append("            return;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= createAST(cu);
-		AST ast= astRoot.getAST();
-		OldASTRewrite rewrite= new OldASTRewrite(astRoot);
-		
-		String str= "return;";
-		ReturnStatement returnStatement= (ReturnStatement) NodeFinder.perform(astRoot, buf.indexOf(str), str.length());
-		
-		MethodInvocation newMethodInv1= ast.newMethodInvocation();
-		newMethodInv1.setName(ast.newSimpleName("foo1"));
-		ExpressionStatement st1= ast.newExpressionStatement(newMethodInv1);
-		
-		MethodInvocation newMethodInv2= ast.newMethodInvocation();
-		newMethodInv2.setName(ast.newSimpleName("foo2"));
-		ExpressionStatement st2= ast.newExpressionStatement(newMethodInv2);
-		
-		ReturnStatement st3= (ReturnStatement) rewrite.createCopyTarget(returnStatement);
-		
-		Block placeholder= rewrite.getCollapseTargetPlaceholder(new Statement[] { st1, st2, st3 });
-		rewrite.replace(returnStatement.getParent(), placeholder, null);
-		
-		String preview= evaluateRewrite(cu, rewrite);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        foo1();\n");
-		buf.append("        foo2();\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();		
-
-		assertEqualString(preview, expected);
-	}
-	
-	
-	public void testMoveCollapsedCD() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        if (i == 0) {\n");
-		buf.append("            foo();\n");
-		buf.append("            i++; // comment\n");
-		buf.append("            i++;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= createAST(cu);
-		OldASTRewrite rewrite= new OldASTRewrite(astRoot);
-		assertTrue("Code has errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
-		
-		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
-		MethodDeclaration methodDecl= findMethodDeclaration(type, "foo");
-		{
-			List statements= methodDecl.getBody().statements();
-			IfStatement ifStatement= (IfStatement) statements.get(0);
-			List ifStatementBody= ((Block) ifStatement.getThenStatement()).statements();
-			ASTNode collapsed= rewrite.collapseNodes(ifStatementBody, 0, ifStatementBody.size());
-			
-			ASTNode placeholder= rewrite.createCopyTarget(collapsed);
-			rewrite.remove(collapsed, null);
-			
-			rewrite.getListRewrite(methodDecl.getBody(), Block.STATEMENTS_PROPERTY).insertLast(placeholder, null);
-		}	
-					
-		String preview= evaluateRewrite(cu, rewrite);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        if (i == 0) {\n");
-		buf.append("        }\n");
-		buf.append("        foo();\n");
-		buf.append("        i++; // comment\n");
-		buf.append("        i++;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-
-	}
-	
-	public void testMoveCollapsed() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        if (i == 0) {\n");
-		buf.append("            foo();\n");
-		buf.append("            i++; // comment\n");
-		buf.append("            i++;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= createAST(cu);
-		OldASTRewrite rewrite= new OldASTRewrite(astRoot);
-		assertTrue("Code has errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
-		
-		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
-		MethodDeclaration methodDecl= findMethodDeclaration(type, "foo");
-		{
-			List statements= methodDecl.getBody().statements();
-			IfStatement ifStatement= (IfStatement) statements.get(0);
-			List ifStatementBody= ((Block) ifStatement.getThenStatement()).statements();
-			ASTNode collapsed= rewrite.collapseNodes(ifStatementBody, 0, ifStatementBody.size());
-			
-			ASTNode placeholder= rewrite.createMoveTarget(collapsed);
-			rewrite.getListRewrite(methodDecl.getBody(), Block.STATEMENTS_PROPERTY).insertLast(placeholder, null);
-		}	
-					
-		String preview= evaluateRewrite(cu, rewrite);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        if (i == 0) {\n");
-		buf.append("        }\n");
-		buf.append("        foo();\n");
-		buf.append("        i++; // comment\n");
-		buf.append("        i++;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-
-	}		
-	
-	public void testReplaceCollapsed() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        if (i == 0) {\n");
-		buf.append("            foo();\n");
-		buf.append("            i++; // comment\n");
-		buf.append("            i++;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= createAST(cu);
-		AST ast= astRoot.getAST();
-		OldASTRewrite rewrite= new OldASTRewrite(astRoot);
-		assertTrue("Code has errors", (astRoot.getFlags() & ASTNode.MALFORMED) == 0);
-		
-		TypeDeclaration type= findTypeDeclaration(astRoot, "E");
-		MethodDeclaration methodDecl= findMethodDeclaration(type, "foo");
-		{
-			List statements= methodDecl.getBody().statements();
-			IfStatement ifStatement= (IfStatement) statements.get(0);
-			List ifStatementBody= ((Block) ifStatement.getThenStatement()).statements();
-			ASTNode collapsed= rewrite.collapseNodes(ifStatementBody, 0, ifStatementBody.size());
-			
-			ASTNode newStatement= ast.newReturnStatement();
-			rewrite.replace(collapsed, newStatement, null);
-		}	
-					
-		String preview= evaluateRewrite(cu, rewrite);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        if (i == 0) {\n");
-		buf.append("            return;\n");		
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-
-	}	
-
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/astrewrite/ASTRewritingTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/astrewrite/ASTRewritingTest.java
deleted file mode 100644
index 39b3f09..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/astrewrite/ASTRewritingTest.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.astrewrite;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.StringAsserts;
-import org.eclipse.text.edits.TextEdit;
-
-import org.eclipse.jface.text.Document;
-
-import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.PrimitiveType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-/**
-  */
-public class ASTRewritingTest extends TestCase {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite();
-		suite.addTest(ASTRewritingCollapseTest.allTests());
-		return new ProjectTestSetup(suite);
-	}
-
-	
-	public ASTRewritingTest(String name) {
-		super(name);
-	}
-	
-	protected CompilationUnit createAST(ICompilationUnit cu) {
-		ASTParser parser= ASTParser.newParser(AST.JLS3);
-		parser.setSource(cu);
-		parser.setResolveBindings(false);
-		return (CompilationUnit) parser.createAST(null);
-	}
-	
-	/**
-	 * Returns the result of a rewrite.
-	 */
-	protected String evaluateRewrite(ICompilationUnit cu, ASTRewrite rewrite) throws Exception {
-		Document document= new Document(cu.getSource());
-		TextEdit res= rewrite.rewriteAST(document, cu.getJavaProject().getOptions(true));
-		
-		res.apply(document);
-		return document.get();
-	}
-	
-	
-	public static void assertEqualString(String actual, String expected) {
-		StringAsserts.assertEqualString(actual, expected);
-	}
-	
-	public static TypeDeclaration findTypeDeclaration(CompilationUnit astRoot, String simpleTypeName) {
-		List types= astRoot.types();
-		for (int i= 0; i < types.size(); i++) {
-			TypeDeclaration elem= (TypeDeclaration) types.get(i);
-			if (simpleTypeName.equals(elem.getName().getIdentifier())) {
-				return elem;
-			}
-		}
-		return null;
-	}
-	
-	public static MethodDeclaration findMethodDeclaration(TypeDeclaration typeDecl, String methodName) {
-		MethodDeclaration[] methods= typeDecl.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			if (methodName.equals(methods[i].getName().getIdentifier())) {
-				return methods[i];
-			}
-		}
-		return null;
-	}
-	
-	public static SingleVariableDeclaration createNewParam(AST ast, String name) {
-		SingleVariableDeclaration newParam= ast.newSingleVariableDeclaration();
-		newParam.setType(ast.newPrimitiveType(PrimitiveType.FLOAT));
-		newParam.setName(ast.newSimpleName(name));
-		return newParam;
-	}
-	
-	protected FieldDeclaration createNewField(AST ast, String name) {
-		VariableDeclarationFragment frag= ast.newVariableDeclarationFragment();
-		frag.setName(ast.newSimpleName(name));
-		FieldDeclaration newFieldDecl= ast.newFieldDeclaration(frag);
-		newFieldDecl.modifiers().addAll(ASTNodeFactory.newModifiers(ast, Modifier.PRIVATE));
-		newFieldDecl.setType(ast.newPrimitiveType(PrimitiveType.DOUBLE));
-		return newFieldDecl;
-	}
-	
-	protected MethodDeclaration createNewMethod(AST ast, String name, boolean isAbstract) {
-		MethodDeclaration decl= ast.newMethodDeclaration();
-		decl.setName(ast.newSimpleName(name));
-		decl.setReturnType2(ast.newPrimitiveType(PrimitiveType.VOID));
-		decl.modifiers().addAll(ASTNodeFactory.newModifiers(ast, (isAbstract ? (Modifier.ABSTRACT | Modifier.PRIVATE) : Modifier.PRIVATE)));
-		SingleVariableDeclaration param= ast.newSingleVariableDeclaration();
-		param.setName(ast.newSimpleName("str"));
-		param.setType(ast.newSimpleType(ast.newSimpleName("String")));
-		decl.parameters().add(param);
-		decl.setBody(isAbstract ? null : ast.newBlock());
-		return decl;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/MockPluginView.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/MockPluginView.java
deleted file mode 100644
index 0d81cc1..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/MockPluginView.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.browsing;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.jdt.internal.ui.browsing.PackagesView;
-import org.eclipse.jdt.internal.ui.viewsupport.ProblemTableViewer;
-import org.eclipse.jdt.internal.ui.viewsupport.ProblemTreeViewer;
-
-
-public class MockPluginView extends PackagesView {
-
-	StructuredViewer fViewer;
-	private IContentProvider fContentProvider;
-	private boolean fRefreshHappened;
-	private boolean fRemoveHappened;
-	private boolean fAddHappened;
-	
-	private List fRemovedObject;
-	private List fAddedObject;
-	private List fAddedParentObject;
-	private List fRefreshedObject;
-
-	private boolean fListState;
-	
-	public MockPluginView() {
-		super();
-		fRefreshedObject= new ArrayList();
-		fAddedObject= new ArrayList();
-		fRemovedObject= new ArrayList();
-		fAddedParentObject= new ArrayList();
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-
-		//create viewer
-		//super.createViewer(parent);
-		fViewer= createViewer(parent);
-
-		//create my contentProvider
-		fContentProvider= super.createContentProvider();
-		fContentProvider.inputChanged(fViewer, null, null);
-
-		//set content provider
-		fViewer.setContentProvider(fContentProvider);
-
-	}
-	
-	/* Override so that tests can set layout state.
-	 * 
-	 * (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.ui.browsing.PackagesView#isInListState()
-	 */
-	protected boolean isInListState(){
-		return fListState;	
-	}
-	
-	/**
-	 * Set the view is in flat or hierarchical state.
-	 * @param state
-	 */
-	void setListState(boolean state){
-		fListState= state;	
-	}
-	
-	public void clear() {
-		fAddedObject.clear();
-		fRefreshedObject.clear();
-		fAddedParentObject.clear();
-		fRemovedObject.clear();
-	}
-
-	
-	protected StructuredViewer createViewer(Composite parent){
-		if(isInListState())
-			return new TestProblemTableViewer(parent, SWT.MULTI);
-		else
-			return new TestProblemTreeViewer(parent, SWT.MULTI);
-	}
-
-	public void dispose() {
-		if (fViewer != null) {
-			IContentProvider p = fViewer.getContentProvider();
-			if(p!=null)	
-				p.dispose();
-		}
-		
-		super.dispose();
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-	}
-	
-	public StructuredViewer getTreeViewer(){
-		return fViewer;
-	}
-	
-	/*
-	 * @see org.eclipse.jdt.internal.ui.browsing.JavaBrowsingPart#findElementToSelect(org.eclipse.jdt.core.IJavaElement)
-	 */
-	protected IJavaElement findElementToSelect(IJavaElement je) {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.jdt.internal.ui.browsing.JavaBrowsingPart#getHelpContextId()
-	 */
-	protected String getHelpContextId() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.jdt.internal.ui.browsing.JavaBrowsingPart#isValidInput(java.lang.Object)
-	 */
-	protected boolean isValidInput(Object element) {
-		return false;
-	}
-	
-	
-	/**
-	 * Returns a list of objects refreshed in the viewer.
-	 * @return List
-	 */
-	public List getRefreshedObject() {
-		return fRefreshedObject;
-	}
-
-	/**
-	 * Returns true if a refresh action happened
-	 * @return boolean
-	 */
-	public boolean hasRefreshHappened() {
-		return fRefreshHappened;
-	}
-
-	/**
-	 * Returns a list of the parents of added objects
-	 * @return List
-	 */
-	public List getAddedParentObject() {
-		return fAddedParentObject;
-	}
-
-	/**
-	 * Returns a list of objects removed from the viewer
-	 * @return List
-	 */
-	public List getRemovedObject() {
-		return fRemovedObject;
-	}
-
-	/**
-	 * Returns true if a remove action happened
-     * @return boolean
-	 */
-	public boolean hasRemoveHappened() {
-		return fRemoveHappened;
-	}
-	
-	/**
-	 * Returns the object added to the viewer
-	 * @return List
-	 */
-	public List getAddedObject() {
-		return fAddedObject;
-	}
-	
-	/**
-	 * Returns true if an add action happened on the viewer
-	 * @return boolean
-	 */
-	public boolean hasAddHappened() {
-		return fAddHappened;
-	}
-
-
-	private class TestProblemTreeViewer extends ProblemTreeViewer {
-
-		public TestProblemTreeViewer(Composite parent, int flag) {
-			super(parent, flag);
-			super.setUseHashlookup(true);
-		}
-
-		public void refresh(Object object) {
-			fRefreshHappened= true;
-			fRefreshedObject.add(object);
-		}
-
-		public void remove(Object object) {
-			fRemoveHappened= true;
-			fRemovedObject.add(object);
-		}
-
-		public void add(Object parentObject, Object object) {
-			fAddHappened= true;
-			fAddedObject.add(object);
-			fAddedParentObject.add(parentObject);
-		}
-
-	}
-	
-	private class TestProblemTableViewer extends ProblemTableViewer {
-
-		public TestProblemTableViewer(Composite parent, int flag) {
-			super(parent, flag);
-			super.setUseHashlookup(true);
-		}
-
-		public void refresh(Object object) {
-			fRefreshHappened= true;
-			fRefreshedObject.add(object);
-			super.refresh(object);
-		}
-
-		public void remove(Object object) {
-			fRemoveHappened= true;
-			fRemovedObject.add(object);
-			super.remove(object);
-		}
-
-		public void add(Object object) {
-			fAddHappened= true;
-			fAddedObject.add(object);
-			super.add(object);
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewContentProviderTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewContentProviderTests.java
deleted file mode 100644
index 51feba9..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewContentProviderTests.java
+++ /dev/null

@@ -1,554 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.browsing;
-
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.internal.ui.browsing.LogicalPackage;
-
-
-public class PackagesViewContentProviderTests extends TestCase {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("org.eclipse.jdt.ui.tests.PackagesViewContentProviderTests"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTestSuite(PackagesViewContentProviderTests.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-	private IJavaProject fJProject1;
-	private IJavaProject fJProject2;
-	
-	private IPackageFragmentRoot fRoot1;
-	private IWorkspace fWorkspace;
-	private IWorkbench fWorkbench;
-	private MockPluginView fMyPart;
-	
-	private ITreeContentProvider fProvider;
-	private IPackageFragmentRoot fArchiveFragmentRoot;
-	private IPackageFragment fPackJunit;
-	private IPackageFragment fPackJunitSamples;
-	private IPackageFragment fPackJunitSamplesMoney;
-
-	private IWorkbenchPage page;
-	private IPackageFragmentRoot fRoot2;
-	private IPackageFragment fPack12;
-	private IPackageFragment fPack32;
-	private IPackageFragment fPack42;
-	private IPackageFragment fPack52;
-	private IPackageFragment fPack62;
-	private IPackageFragment fPack21;
-	private IPackageFragment fPack61;
-	private IPackageFragment fPack51;
-	private IPackageFragment fPack41;
-	private IPackageFragment fPack31;
-	private IPackageFragment fPackDefault1;
-	private IPackageFragment fPackDefault2;
-	private IPackageFragment fPack17;
-	private IPackageFragment fPack81;
-	private IPackageFragment fPack91;
-	private IPackageFragmentRoot fInternalJarRoot;
-	private IPackageFragment fInternalPackDefault;
-	private IPackageFragment fInternalPack3;
-	private IPackageFragment fInternalPack4;
-	private IPackageFragment fInternalPack5;
-	private IPackageFragment fInternalPack10;
-	private IPackageFragment fInternalPackMetaInf;
-	private boolean fEnableAutoBuildAfterTesting;
-	
-	public PackagesViewContentProviderTests(String name) {
-		super(name);
-	}
-	
-	//---------Test for getChildren-------------------
-
-	public void testGetChildrenProjectWithSourceFolders() throws Exception{
-		
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp= new LogicalPackage(fPack31);
-		cp.add(fPack32);
-		cp.add(fInternalPack3);	
-	
-		//create a logical package for default package
-		LogicalPackage defaultCp= new LogicalPackage(fPackDefault1);
-		defaultCp.add(fPackDefault2);
-		defaultCp.add(fInternalPackDefault);
-		
-		Object[] expectedChildren= new Object[]{fPack21, fPack12, cp, defaultCp, fInternalPackMetaInf};
-		Object[] children= fProvider.getChildren(fJProject2);
-		assertTrue("Wrong children found for project", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	
-	public void testGetChildrentMidLevelFragmentNotLogicalPackage() throws Exception{
-		//initialise map
-		fProvider.getChildren(fJProject2);
-		
-		Object[] expectedChildren= new Object[]{fPack17};
-		Object[] children= fProvider.getChildren(fPack12);
-		assertTrue("Wrong children found for PackageFragment",compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{};
-		Object[] children= fProvider.getChildren(fPack21);
-		assertTrue("Wrong children found for PackageFragment",compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenLogicalPackage() throws Exception{
-		
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp= new LogicalPackage(fPack31);
-		cp.add(fPack32);
-		cp.add(fInternalPack3);
-		
-		//create a logical package for packages with name "pack3.pack4"
-		LogicalPackage ChildCp1= new LogicalPackage(fPack41);
-		ChildCp1.add(fPack42);
-		ChildCp1.add(fInternalPack4);
-		
-		//create a logical package for packages with name "pack3.pack5"
-		LogicalPackage ChildCp2= new LogicalPackage(fPack51);
-		ChildCp2.add(fPack52);
-		ChildCp2.add(fInternalPack5);
-
-		//initialize Map
-		fProvider.getChildren(fJProject2);	
-		
-		Object[] expectedChildren= new Object[]{fPack81, ChildCp1, ChildCp2};
-		Object[] children= fProvider.getChildren(cp);
-		assertTrue("Wrong children found for project", compareArrays(children, expectedChildren)); //$NON-NLS-1$  
-
-	}
-	
-	public void testGetChildrenLogicalPackage2() throws Exception{
-		
-		//create a logical package for packages with name "pack3.pack4"
-		LogicalPackage cp= new LogicalPackage(fPack41);
-		cp.add(fPack42);
-		cp.add(fInternalPack4);
-		
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);		
-		
-		fProvider.getChildren(fJProject2);
-		fProvider.getChildren(cp3);
-	
-		Object[] expectedChildren= new Object[]{fPack91, fInternalPack10};
-		Object[] children= fProvider.getChildren(cp);
-		assertTrue("Wrong children found for project", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	
-
-	public void testGetChildrenMidLevelFragmentInArchive() throws Exception{
-		//initialise map
-		fProvider.getChildren(fArchiveFragmentRoot);
-		fProvider.getChildren(fPackJunit);
-		
-		Object[] expectedChildren= new Object[]{fPackJunitSamplesMoney};
-		Object[] children= fProvider.getChildren(fPackJunitSamples);
-		assertTrue("wrong children found for a NON bottom PackageFragment in PackageFragmentRoot Archive", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-
-	public void testGetChildrenBottomLevelFragmentInArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{};
-		Object[] children= fProvider.getChildren(fPackJunitSamplesMoney);
-		assertTrue("wrong children found for a bottom PackageFragment in PackageFragmentRoot Archive", compareArrays(children, expectedChildren));	//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenSourceFolder() throws Exception {
-		Object[] expectedChildren = new Object[] {fPack21, fPack31, fPackDefault1};
-		Object[] children = fProvider.getChildren(fRoot1);
-		assertTrue("Wrong children found for PackageFragmentRoot", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenArchive(){
-		Object[] expectedChildren= new Object[]{fPackJunit, fArchiveFragmentRoot.getPackageFragment("")};//$NON-NLS-1$
-		Object[] children= fProvider.getChildren(fArchiveFragmentRoot);
-		assertTrue("Wrong child found for PackageFragmentRoot Archive", compareArrays(children,expectedChildren));//$NON-NLS-1$
-	}
-	
-	//---------------Get Parent Tests-----------------------------
-	
-	public void testGetParentArchive() throws Exception{
-		Object parent= fProvider.getParent(fArchiveFragmentRoot);
-		assertTrue("Wrong parent found for PackageFragmentRoot Archive", parent==null);//$NON-NLS-1$
-	}
-
-	public void testGetParentMidLevelFragmentInArchive() throws Exception{
-		
-		//initialise Map
-		fProvider.getChildren(fArchiveFragmentRoot);
-		fProvider.getChildren(fPackJunit);
-		fProvider.getChildren(fPackJunitSamples);
-		
-		Object expectedParent= fPackJunitSamples;
-		Object parent= fProvider.getParent(fPackJunitSamplesMoney);
-		assertTrue("Wrong parent found for a NON top level PackageFragment in an Archive", expectedParent.equals(parent));//$NON-NLS-1$
-	}	
-	
-	public void testGetParentTopLevelFragmentInArchive() throws Exception{
-		Object expectedParent= fPackJunit;
-		Object parent= fProvider.getParent(fPackJunitSamples);
-		assertTrue("Wrong parent found for a top level PackageFragment in an Archive", expectedParent.equals(parent));	//$NON-NLS-1$
-	}
-
-	public void testGetParentTopLevelLogicalPackage() throws Exception{
-	
-		LogicalPackage cp= new LogicalPackage(fPack31);
-		cp.add(fPack32);
-		cp.add(fInternalPack3);
-		
-		Object parent= fProvider.getParent(cp);
-		assertTrue("Wrong parent found for a top level LogicalPackage", fJProject2.equals(parent));//$NON-NLS-1$
-	}
-	
-	public void testGetParentPackageFragmentWithLogicalPackageParent() throws Exception{
-		
-		LogicalPackage cp= new LogicalPackage(fPack31);
-		cp.add(fPack32);
-		cp.add(fInternalPack3);
-		
-		//initialize map
-		fProvider.getChildren(fJProject2);
-		
-		Object parent= fProvider.getParent(fPack81);
-		assertTrue("Wrong parent found for a top level LogicalPackage", cp.equals(parent));//$NON-NLS-1$
-	}
-	
-	public void testGetParentOfLogicalPackagetWithLogicalPackageParent() throws Exception{
-		
-		LogicalPackage cp= new LogicalPackage(fPack41);
-		cp.add(fPack42);
-		cp.add(fInternalPack4);
-		
-		LogicalPackage parentCp= new LogicalPackage(fPack31);
-		parentCp.add(fPack32);
-		parentCp.add(fInternalPack3);
-		
-		//initialize map
-		fProvider.getChildren(fJProject2);
-		
-		Object parent= fProvider.getParent(cp);
-		assertTrue("Wrong parent found for a top level LogicalPackage", parentCp.equals(parent));//$NON-NLS-1$
-	}
-	
-//	public void testGetParentWithPFRootFocus(){
-//		//set up map
-//		Object[] children= fProvider.getChildren(fRoot1);
-//		for (int i= 0; i < children.length; i++) {
-//			Object object= children[i];
-//			fProvider.getChildren(object);
-//		}
-//		
-//		Object parent= fProvider.getParent(fPack41);	
-//		Object expectedParent= fPack31;
-//		assertTrue("Wrong parent found for a mid level Fragment with Root Focus", expectedParent.equals(parent));		//$NON-NLS-1$
-//	}
-	
-	public void testGetParentPFwithProjectFocus(){
-		Object[] children= fProvider.getChildren(fJProject2);
-		for (int i= 0; i < children.length; i++) {
-			Object object= children[i];
-			fProvider.getChildren(object);
-		}
-		
-		LogicalPackage cp= new LogicalPackage(fPack31);
-		cp.add(fPack32);
-		cp.add(fInternalPack3);	
-		
-		Object parent= fProvider.getParent(fPack41);	
-		assertTrue("Wrong parent found for a mid level Fragment with Root Focus", cp.equals(parent));		//$NON-NLS-1$
-	}
-	
-	public void testGetParentWithRootFocusAfterProjectFocus(){
-		//set up map with project focus
-		Object[] children= fProvider.getChildren(fJProject2);
-		for (int i= 0; i < children.length; i++) {
-			Object object= children[i];
-			fProvider.getChildren(object);
-		}
-		
-		LogicalPackage cp= new LogicalPackage(fPack31);
-		cp.add(fPack32);
-		cp.add(fInternalPack3);	
-	
-		//create a logical package for default package
-		LogicalPackage defaultCp= new LogicalPackage(fPackDefault1);
-		defaultCp.add(fPackDefault2);
-		defaultCp.add(fInternalPackDefault);
-		
-		Object[] expectedChildren= new Object[]{fPack21, fPack12, cp, defaultCp, fInternalPackMetaInf};
-		
-		assertTrue("expected children of project with focus", compareArrays(children, expectedChildren));//$NON-NLS-1$
-		
-		//set up map with root focus
-		children= fProvider.getChildren(fRoot1);
-		for (int i= 0; i < children.length; i++) {
-			Object object= children[i];
-			fProvider.getChildren(object);
-		}
-		
-//		Object parent= fProvider.getParent(fPack41);
-//		Object expectedParent= fPack31;	
-//		assertTrue("Wrong parent found for a mid level Fragment with Project Focus", expectedParent.equals(parent));//$NON-NLS-1$
-	}
-
-	public void testGetParentTopLevelFragment() throws Exception{
-		Object parent= fProvider.getParent(fPack21);
-		Object expectedParent= fRoot1;
-		assertTrue("Wrong parent found for a top level PackageFragment", expectedParent.equals(parent)); //$NON-NLS-1$  
-
-	}
-	
-	public void testGetParentMidLevelFragment() throws Exception{
-		Object expectedParent= fPack12;
-		Object parent= fProvider.getParent(fPack17);
-		assertTrue("Wrong parent found for a NON top level PackageFragment", expectedParent.equals(parent)); //$NON-NLS-1$  
-
-	}
-	
-
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		fWorkspace= ResourcesPlugin.getWorkspace();
-		assertNotNull(fWorkspace);	
-		
-		IWorkspaceDescription workspaceDesc= fWorkspace.getDescription();
-		fEnableAutoBuildAfterTesting= workspaceDesc.isAutoBuilding();
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(false);
-		
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		fJProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		
-		assertNotNull("project1 null", fJProject1);//$NON-NLS-1$
-		assertNotNull("project2 null", fJProject2);//$NON-NLS-1$
-		
-		
-		//------------set up project #1 : External Jar and zip file-------
-		
-		IPackageFragmentRoot jdk= JavaProjectHelper.addVariableRTJar(fJProject1, "JRE_LIB_TEST", null, null);//$NON-NLS-1$
-		assertTrue("jdk not found", jdk != null);//$NON-NLS-1$
-
-		
-		//---Create zip file-------------------
-
-		java.io.File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);		
-		
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());//$NON-NLS-1$
-
-		fArchiveFragmentRoot= JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);//$NON-NLS-1$
-		
-		fPackJunit= fArchiveFragmentRoot.getPackageFragment("junit");//$NON-NLS-1$
-		fPackJunitSamples= fArchiveFragmentRoot.getPackageFragment("junit.samples");//$NON-NLS-1$
-		fPackJunitSamplesMoney= fArchiveFragmentRoot.getPackageFragment("junit.samples.money");//$NON-NLS-1$
-		
-		assertNotNull("creating fPackJunit", fPackJunit);//$NON-NLS-1$
-		assertNotNull("creating fPackJunitSamples", fPackJunitSamples);//$NON-NLS-1$
-		assertNotNull("creating fPackJunitSamplesMoney",fPackJunitSamplesMoney);//$NON-NLS-1$
-		
-		fPackJunitSamplesMoney.getCompilationUnit("IMoney.java");//$NON-NLS-1$
-		fPackJunitSamplesMoney.getCompilationUnit("Money.java");//$NON-NLS-1$
-		fPackJunitSamplesMoney.getCompilationUnit("MoneyBag.java");//$NON-NLS-1$
-		fPackJunitSamplesMoney.getCompilationUnit("MoneyTest.java");//$NON-NLS-1$
-		
-		//java.io.File mylibJar= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-		//assertTrue("lib not found", mylibJar != null && mylibJar.exists());//$NON-NLS-1$
-		//JavaProjectHelper.addLibraryWithImport(fJProject1, new Path(mylibJar.getPath()), null, null);
-
-		//----------------Set up internal jar----------------------------
-		File myInternalJar= JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/compoundtest.jar"));//$NON-NLS-1$
-		assertTrue("lib not found", myInternalJar != null && myInternalJar.exists());//$NON-NLS-1$
-		
-		fInternalJarRoot= JavaProjectHelper.addLibraryWithImport(fJProject2, new Path(myInternalJar.getPath()), null, null); //$NON-NLS-1$
-		
-		fInternalPackDefault= fInternalJarRoot.getPackageFragment("");//$NON-NLS-1$
-		fInternalPack3= fInternalJarRoot.getPackageFragment("pack3");//$NON-NLS-1$
-		fInternalPack4= fInternalJarRoot.getPackageFragment("pack3.pack4");//$NON-NLS-1$
-		fInternalPack5= fInternalJarRoot.getPackageFragment("pack3.pack5");//$NON-NLS-1$
-		 fInternalJarRoot.getPackageFragment("pack3.pack5.pack6");//$NON-NLS-1$
-		fInternalPack10= fInternalJarRoot.getPackageFragment("pack3.pack4.pack10");//$NON-NLS-1$
-		fInternalPackMetaInf= fInternalJarRoot.getPackageFragment("META-INF");//$NON-NLS-1$
-		
-		//-----------------Set up source folder--------------------------
-
-		fRoot2= JavaProjectHelper.addSourceContainer(fJProject2, "src2");//$NON-NLS-1$
-		fPackDefault2= fRoot2.createPackageFragment("",true,null);//$NON-NLS-1$
-		fPack12= fRoot2.createPackageFragment("pack1", true, null);//$NON-NLS-1$
-		fPack17= fRoot2.createPackageFragment("pack1.pack7",true,null);//$NON-NLS-1$
-		fPack32= fRoot2.createPackageFragment("pack3",true,null);//$NON-NLS-1$
-		fPack42= fRoot2.createPackageFragment("pack3.pack4", true,null);//$NON-NLS-1$
-		fPack52= fRoot2.createPackageFragment("pack3.pack5",true,null);//$NON-NLS-1$
-		fPack62= fRoot2.createPackageFragment("pack3.pack5.pack6", true, null);//$NON-NLS-1$
-		
-		fPack12.createCompilationUnit("Object.java", "", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fPack62.createCompilationUnit("Object.java","", true, null);//$NON-NLS-1$//$NON-NLS-2$
-
-
-		//set up project #2: file system structure with in a source folder
-
-	//	JavaProjectHelper.addVariableEntry(fJProject2, new Path("JRE_LIB_TEST"), null, null);
-
-		//----------------Set up source folder--------------------------
-
-		fRoot1= JavaProjectHelper.addSourceContainer(fJProject2, "src1"); //$NON-NLS-1$  
-		fPackDefault1= fRoot1.createPackageFragment("",true,null); //$NON-NLS-1$  
-		fPack21= fRoot1.createPackageFragment("pack2", true, null);//$NON-NLS-1$
-		fPack31= fRoot1.createPackageFragment("pack3",true,null);//$NON-NLS-1$
-		fPack41= fRoot1.createPackageFragment("pack3.pack4", true,null);//$NON-NLS-1$
-		fPack91= fRoot1.createPackageFragment("pack3.pack4.pack9",true,null);//$NON-NLS-1$
-		fPack51= fRoot1.createPackageFragment("pack3.pack5",true,null);//$NON-NLS-1$
-		fPack61= fRoot1.createPackageFragment("pack3.pack5.pack6", true, null);//$NON-NLS-1$
-		fPack81= fRoot1.createPackageFragment("pack3.pack8", true, null);//$NON-NLS-1$
-		
-		fPack21.createCompilationUnit("Object.java", "", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fPack61.createCompilationUnit("Object.java","", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		
-		//set up the mock view
-		setUpMockView();
-	}
-	
-	public void setUpMockView() throws Exception{
-		
-		fWorkbench= PlatformUI.getWorkbench();
-		assertNotNull(fWorkbench);
-		
-		page= fWorkbench.getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(page);
-		
-		//just testing to make sure my part can be created
-		IViewPart myPart= new MockPluginView();
-		((MockPluginView)myPart).setListState(false);
-		assertNotNull(myPart);
-		
-		myPart= page.showView("org.eclipse.jdt.ui.tests.browsing.MockPluginView");//$NON-NLS-1$
-		if (myPart instanceof MockPluginView) {
-			fMyPart= (MockPluginView) myPart;
-			fProvider= (ITreeContentProvider)fMyPart.getTreeViewer().getContentProvider();
-			//create map and set listener	
-			fProvider.inputChanged(null,null,fJProject2);
-		}else assertTrue("Unable to get view",false);//$NON-NLS-1$
-	
-		assertNotNull(fProvider);		
-	}
-
-	/*
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		
-		JavaProjectHelper.delete(fJProject1);
-		JavaProjectHelper.delete(fJProject2);
-		fProvider.inputChanged(null, null, null);
-		page.hideView(fMyPart);
-		fMyPart.dispose();
-		
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-
-		
-		super.tearDown();
-	}
-	
-	private boolean compareArrays(Object[] children, Object[] expectedChildren) {
-		if(children.length!=expectedChildren.length)
-			return false;
-		for (int i= 0; i < children.length; i++) {
-			Object child= children[i];
-			if (child instanceof IJavaElement) {
-				IJavaElement el= (IJavaElement) child;
-				if(!contains(el, expectedChildren))
-					return false;
-			} else if(child instanceof IResource){
-				IResource res = (IResource) child;	
-				if(!contains(res, expectedChildren)){
-					return false;	
-				}
-			} else if (child instanceof LogicalPackage){
-				if(!contains((LogicalPackage)child, expectedChildren))
-					return false;	
-			}
-		}
-		return true;
-	}
-	
-	private boolean contains(IResource res, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IResource) {
-				IResource expres= (IResource) object;
-				if(expres.equals(res))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	private boolean contains(IJavaElement fragment, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IJavaElement) {
-				IJavaElement expfrag= (IJavaElement) object;
-				if(expfrag.equals(fragment))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	private boolean contains(LogicalPackage lp, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof LogicalPackage) {
-				LogicalPackage explp= (LogicalPackage) object;
-				if (explp.equals(lp))
-					return true;
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewContentProviderTests2.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewContentProviderTests2.java
deleted file mode 100644
index d38fd03..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewContentProviderTests2.java
+++ /dev/null

@@ -1,541 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.browsing;
-
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.ui.browsing.LogicalPackage;
-
-
-public class PackagesViewContentProviderTests2 extends TestCase {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("org.eclipse.jdt.ui.tests.PackagesViewContentProviderTests2"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTestSuite(PackagesViewContentProviderTests2.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-	private IJavaProject fJProject1;
-	private IJavaProject fJProject2;
-	
-	private IPackageFragmentRoot fRoot1;
-	private IWorkspace fWorkspace;
-	private IWorkbench fWorkbench;
-	private MockPluginView fMyPart;
-	
-	private IStructuredContentProvider fProvider;
-	private IPackageFragmentRoot fArchiveFragmentRoot;
-	private IPackageFragment fPackJunit;
-	private IPackageFragment fPackJunitSamples;
-	private IPackageFragment fPackJunitSamplesMoney;
-
-	private IWorkbenchPage fPage;
-	private IPackageFragmentRoot fRoot2;
-	private IPackageFragment fPack12;
-	private IPackageFragment fPack32;
-	private IPackageFragment fPack42;
-	private IPackageFragment fPack52;
-	private IPackageFragment fPack62;
-	private IPackageFragment fPack21;
-	private IPackageFragment fPack61;
-	private IPackageFragment fPack51;
-	private IPackageFragment fPack41;
-	private IPackageFragment fPack31;
-	private IPackageFragment fPackDefault1;
-	private IPackageFragment fPackDefault2;
-	private IPackageFragment fPack17;
-	private IPackageFragment fPack81;
-	private IPackageFragment fPack91;
-	private IPackageFragmentRoot fInternalJarRoot;
-	private IPackageFragment fInternalPackDefault;
-	private IPackageFragment fInternalPack3;
-	private IPackageFragment fInternalPack4;
-	private IPackageFragment fInternalPack5;
-	private IPackageFragment fInternalPack10;
-	private IPackageFragment fInternalPack6;
-	private IPackageFragment fInternalPackMetaInf;
-	private boolean fEnableAutoBuildAfterTesting;
-	private IPackageFragment fPack102;
-	
-	public PackagesViewContentProviderTests2(String name) {
-		super(name);
-	}
-	
-	//----------- getElement in flat view ------------------------------
-
-	public void testGetElementsPackageFragmentRoot() throws Exception {
-		Object[] children= fProvider.getElements(fRoot1);
-		Object[] expectedChildren= new Object[] { fPack21, fPack31, fPack41, fPack51, fPack61, fPack81, fPack91, fPackDefault1 };
-		assertTrue("Wrong children found for PackageFragment", compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-
-	public void testGetElementsProject() throws Exception {
-
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		LogicalPackage defaultCp= new LogicalPackage(fPackDefault1);
-		defaultCp.add(fPackDefault2);
-		defaultCp.add(fInternalPackDefault);
-
-		LogicalPackage cp4= new LogicalPackage(fPack41);
-		cp4.add(fPack42);
-		cp4.add(fInternalPack4);
-
-		LogicalPackage cp5= new LogicalPackage(fPack51);
-		cp5.add(fPack52);
-		cp5.add(fInternalPack5);
-
-		LogicalPackage cp6= new LogicalPackage(fPack61);
-		cp6.add(fPack62);
-		cp6.add(fInternalPack6);
-		
-		LogicalPackage cp10= new LogicalPackage(fPack102);
-		cp10.add(fInternalPack10);
-
-		Object[] children= fProvider.getElements(fJProject2);
-		Object[] expectedChildren= new Object[] { defaultCp, cp3, cp4, cp5, cp6, cp10, fInternalPackMetaInf, fPack21, fPack12, fPack91, fPack81, fPack17 };
-		assertTrue("Wrong children founf for PackageFragment", compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-
-	//---------------Delta Tests-----------------------------
-	public void testRemovePackageNotLogicalPackage() throws Exception {
-		//initialise Map
-		fProvider.getElements(fJProject2);
-
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.REMOVED, fPack12);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-
-		assertTrue("Remove happened", fMyPart.hasRemoveHappened()); //$NON-NLS-1$
-		assertTrue("Correct package removed", fMyPart.getRemovedObject().contains(fPack12)); //$NON-NLS-1$
-	}
-	
-	public void testRemovePackageInTwoPackageLogicalPackage() throws Exception {
-
-		//initialise map
-		fProvider.getElements(fJProject2);
-
-		//create CompoundElement containning
-		LogicalPackage cp10= new LogicalPackage(fInternalPack10);
-
-		fMyPart.clear();
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.REMOVED, fPack102);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		//assert remove happened (delta worked)
-		assertTrue("Refresh happened", fMyPart.hasRemoveHappened() && fMyPart.hasAddHappened()); //$NON-NLS-1$
-		Object addedObject= fMyPart.getAddedObject().get(0);
-		Object removedObject= fMyPart.getRemovedObject().get(0);
-		assertTrue("Correct guy removed", canFindEqualCompoundElement(cp10, new Object[] { removedObject })); //$NON-NLS-1$
-		assertTrue("Correct guy added", fInternalPack10.equals(addedObject)); //$NON-NLS-1$
-	}
-	
-	public void testRemovePackageFromLogicalPackage() throws Exception {
-
-		//initialise map
-		fProvider.getElements(fJProject2);
-
-		fMyPart.clear();
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.REMOVED, fPack62);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		//assert remove happened (delta worked)
-		assertTrue("Refresh did not happened", !fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-	}
-	
-	public void testRemoveCUFromPackageNotLogicalPackage() throws Exception {
-
-		//initialise Map
-		ICompilationUnit cu= fPack81.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-
-		//make sure parent is visible
-		fMyPart.fViewer.setInput(fJProject2);
-	
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[] { cu }, fPack81, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Refresh happened", fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-		assertTrue("Correct package refreshed", fMyPart.getRefreshedObject().contains(fPack81)); //$NON-NLS-1$
-		assertEquals("Correct number of refreshes", 1, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-	
-	public void testAddCUFromPackageNotLogicalPackage() throws Exception {
-
-		ICompilationUnit cu= fPack81.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject2);
-
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[] { cu }, fPack81, IJavaElementDelta.ADDED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Refresh happened", fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-		assertTrue("Correct package refreshed", fMyPart.getRefreshedObject().contains(fPack81)); //$NON-NLS-1$
-		assertEquals("Correct number of refreshes", 1, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-
-	public void testAddFragmentToLogicalPackage() throws Exception {
-	
-		//create package fragment to be added
-		IPackageFragment pack101= fRoot1.createPackageFragment("pack3.pack4.pack10", true, null);//$NON-NLS-1$
-	
-		//initialise map
-		fProvider.getElements(fJProject2);
-		
-		fMyPart.clear();
-	
-		//send delta
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.ADDED, pack101);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		//make sure no refresh happened
-		assertTrue("Refresh did not happened", !fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-	}
-
-	public void testAddPackageNotLogicalPackage() throws Exception {
-
-		//initialise Map
-		fProvider.getElements(fJProject2);
-
-		fMyPart.clear();
-
-		IPackageFragment test= fRoot1.createPackageFragment("pack3.test", true, null); //$NON-NLS-1$
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.ADDED, test);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Add happened", fMyPart.hasAddHappened()); //$NON-NLS-1$
-		assertTrue("Correct package added", fMyPart.getAddedObject().contains(test)); //$NON-NLS-1$
-	}
-
-	public void testAddPackageToCreateLogicalPackage() throws Exception {
-		//initialise map
-		fProvider.getElements(fJProject2);
-		
-		//create new package
-    	IPackageFragment pack11= fRoot1.createPackageFragment("pack1", true, null);//$NON-NLS-1$
-
-		//create a logical package for testing
-		LogicalPackage lp1= new LogicalPackage(fPack12);
-		lp1.add(pack11);
-
-		fMyPart.clear();
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.ADDED, pack11);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		//assert remove and add happened (delta worked)
-		assertTrue("Remove and add happened", fMyPart.hasRemoveHappened() && fMyPart.hasAddHappened()); //$NON-NLS-1$
-		Object addedObject= fMyPart.getAddedObject().get(0);
-		Object removedObject= fMyPart.getRemovedObject().get(0);
-		assertTrue("Correct guy removed", fPack12.equals(removedObject)); //$NON-NLS-1$
-		assertTrue("Correct guy added", lp1.equals(addedObject) ); //$NON-NLS-1$
-	}
-	
-
-
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		fWorkspace= ResourcesPlugin.getWorkspace();
-		assertNotNull(fWorkspace);	
-		
-		IWorkspaceDescription workspaceDesc= fWorkspace.getDescription();
-		fEnableAutoBuildAfterTesting= workspaceDesc.isAutoBuilding();
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(false);
-		
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		fJProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		
-		assertNotNull("project1 null", fJProject1);//$NON-NLS-1$
-		assertNotNull("project2 null", fJProject2);//$NON-NLS-1$
-		
-		
-		//------------set up project #1 : External Jar and zip file-------
-		
-		IPackageFragmentRoot jdk= JavaProjectHelper.addVariableRTJar(fJProject1, "JRE_LIB_TEST", null, null);//$NON-NLS-1$
-		assertTrue("jdk not found", jdk != null);//$NON-NLS-1$
-
-		
-		//---Create zip file-------------------
-
-		java.io.File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);		
-		
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());//$NON-NLS-1$
-
-		fArchiveFragmentRoot= JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);//$NON-NLS-1$
-		
-		fPackJunit= fArchiveFragmentRoot.getPackageFragment("junit");//$NON-NLS-1$
-		fPackJunitSamples= fArchiveFragmentRoot.getPackageFragment("junit.samples");//$NON-NLS-1$
-		fPackJunitSamplesMoney= fArchiveFragmentRoot.getPackageFragment("junit.samples.money");//$NON-NLS-1$
-		
-		assertNotNull("creating fPackJunit", fPackJunit);//$NON-NLS-1$
-		assertNotNull("creating fPackJunitSamples", fPackJunitSamples);//$NON-NLS-1$
-		assertNotNull("creating fPackJunitSamplesMoney",fPackJunitSamplesMoney);//$NON-NLS-1$
-		
-		fPackJunitSamplesMoney.getCompilationUnit("IMoney.java");//$NON-NLS-1$
-		fPackJunitSamplesMoney.getCompilationUnit("Money.java");//$NON-NLS-1$
-		fPackJunitSamplesMoney.getCompilationUnit("MoneyBag.java");//$NON-NLS-1$
-		fPackJunitSamplesMoney.getCompilationUnit("MoneyTest.java");//$NON-NLS-1$
-		
-		//java.io.File mylibJar= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-		//assertTrue("lib not found", mylibJar != null && mylibJar.exists());//$NON-NLS-1$
-		//JavaProjectHelper.addLibraryWithImport(fJProject1, new Path(mylibJar.getPath()), null, null);
-
-		//----------------Set up internal jar----------------------------
-		File myInternalJar= JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/compoundtest.jar"));//$NON-NLS-1$
-		assertTrue("lib not found", myInternalJar != null && myInternalJar.exists());//$NON-NLS-1$
-		
-		fInternalJarRoot= JavaProjectHelper.addLibraryWithImport(fJProject2, new Path(myInternalJar.getPath()), null, null); //$NON-NLS-1$
-		
-		fInternalPackDefault= fInternalJarRoot.getPackageFragment("");//$NON-NLS-1$
-		fInternalPack3= fInternalJarRoot.getPackageFragment("pack3");//$NON-NLS-1$
-		fInternalPack4= fInternalJarRoot.getPackageFragment("pack3.pack4");//$NON-NLS-1$
-		fInternalPack5= fInternalJarRoot.getPackageFragment("pack3.pack5");//$NON-NLS-1$
-		fInternalPack6= fInternalJarRoot.getPackageFragment("pack3.pack5.pack6");//$NON-NLS-1$
-		fInternalPack10= fInternalJarRoot.getPackageFragment("pack3.pack4.pack10");//$NON-NLS-1$
-		fInternalPackMetaInf= fInternalJarRoot.getPackageFragment("META-INF");//$NON-NLS-1$
-		
-		//-----------------Set up source folder--------------------------
-
-		fRoot2= JavaProjectHelper.addSourceContainer(fJProject2, "src2");//$NON-NLS-1$
-		fPackDefault2= fRoot2.createPackageFragment("",true,null);//$NON-NLS-1$
-		fPack12= fRoot2.createPackageFragment("pack1", true, null);//$NON-NLS-1$
-		fPack17= fRoot2.createPackageFragment("pack1.pack7",true,null);//$NON-NLS-1$
-		fPack32= fRoot2.createPackageFragment("pack3",true,null);//$NON-NLS-1$
-		fPack42= fRoot2.createPackageFragment("pack3.pack4", true,null);//$NON-NLS-1$
-		fPack52= fRoot2.createPackageFragment("pack3.pack5",true,null);//$NON-NLS-1$
-		fPack62= fRoot2.createPackageFragment("pack3.pack5.pack6", true, null);//$NON-NLS-1$
-		fPack102=fRoot2.createPackageFragment("pack3.pack4.pack10", true, null);//$NON-NLS-1$
-		
-		fPack12.createCompilationUnit("Object.java", "", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fPack62.createCompilationUnit("Object.java","", true, null);//$NON-NLS-1$//$NON-NLS-2$
-
-
-		//set up project #2: file system structure with in a source folder
-
-	//	JavaProjectHelper.addVariableEntry(fJProject2, new Path("JRE_LIB_TEST"), null, null);
-
-		//----------------Set up source folder--------------------------
-
-		fRoot1= JavaProjectHelper.addSourceContainer(fJProject2, "src1"); //$NON-NLS-1$  
-		fPackDefault1= fRoot1.createPackageFragment("",true,null); //$NON-NLS-1$  
-		fPack21= fRoot1.createPackageFragment("pack2", true, null);//$NON-NLS-1$
-		fPack31= fRoot1.createPackageFragment("pack3",true,null);//$NON-NLS-1$
-		fPack41= fRoot1.createPackageFragment("pack3.pack4", true,null);//$NON-NLS-1$
-		fPack91= fRoot1.createPackageFragment("pack3.pack4.pack9",true,null);//$NON-NLS-1$
-		fPack51= fRoot1.createPackageFragment("pack3.pack5",true,null);//$NON-NLS-1$
-		fPack61= fRoot1.createPackageFragment("pack3.pack5.pack6", true, null);//$NON-NLS-1$
-		fPack81= fRoot1.createPackageFragment("pack3.pack8", true, null);//$NON-NLS-1$
-		
-		fPack21.createCompilationUnit("Object.java", "", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fPack61.createCompilationUnit("Object.java","", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		
-		//set up the mock view
-		setUpMockView();
-	}
-	
-	public void setUpMockView() throws Exception{
-		
-		fWorkbench= PlatformUI.getWorkbench();
-		assertNotNull(fWorkbench);
-		
-		fPage= fWorkbench.getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(fPage);
-		
-		//just testing to make sure my part can be created
-		IViewPart myPart= new MockPluginView();
-		((MockPluginView)myPart).setListState(true);
-
-		myPart= fPage.showView("org.eclipse.jdt.ui.tests.browsing.MockPluginView");//$NON-NLS-1$
-		if (myPart instanceof MockPluginView) {
-			fMyPart= (MockPluginView) myPart;
-			
-			fProvider= (IStructuredContentProvider)fMyPart.getTreeViewer().getContentProvider();
-			//create map and set listener	
-			fProvider.inputChanged(null,null,fJProject2);
-			JavaCore.removeElementChangedListener((IElementChangedListener) fProvider);
-		} else assertTrue("Unable to get view",false);//$NON-NLS-1$
-	
-		assertNotNull(fProvider);		
-	}
-
-	/*
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		
-		JavaProjectHelper.delete(fJProject1);
-		JavaProjectHelper.delete(fJProject2);
-		fProvider.inputChanged(null, null, null);
-		fPage.hideView(fMyPart);
-		fMyPart.dispose();
-		
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-
-		
-		super.tearDown();
-	}
-	
-	private boolean compareArrays(Object[] children, Object[] expectedChildren) {
-		if(children.length!=expectedChildren.length)
-			return false;
-		for (int i= 0; i < children.length; i++) {
-			Object child= children[i];
-			if (child instanceof IJavaElement) {
-				IJavaElement el= (IJavaElement) child;
-				if(!contains(el, expectedChildren))
-					return false;
-			} else if(child instanceof IResource){
-				IResource res = (IResource) child;	
-				if(!contains(res, expectedChildren)){
-					return false;	
-				}
-			} else if (child instanceof LogicalPackage){
-				if(!canFindEqualCompoundElement((LogicalPackage)child, expectedChildren))
-					return false;	
-			}
-		}
-		return true;
-	}
-	
-	private boolean canFindEqualCompoundElement(LogicalPackage compoundElement, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if(object instanceof LogicalPackage){
-				LogicalPackage el= (LogicalPackage) object;
-				if(el.getElementName().equals(compoundElement.getElementName()) && (el.getJavaProject().equals(compoundElement.getJavaProject()))){
-					if(compareArrays(el.getFragments(), compoundElement.getFragments()))
-						return true;	
-				}
-			}
-		}
-		return false;
-	}
-	
-	private boolean contains(IResource res, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IResource) {
-				IResource expres= (IResource) object;
-				if(expres.equals(res))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	private boolean contains(IJavaElement fragment, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IJavaElement) {
-				IJavaElement expfrag= (IJavaElement) object;
-				if(expfrag.equals(fragment))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private void pushDisplay() {
-		boolean moreToDispatch= true;
-		while (moreToDispatch) {
-			Control ctrl= fMyPart.getTreeViewer().getControl();
-			if (ctrl != null && !ctrl.isDisposed()) {
-				moreToDispatch= fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch();
-			} else
-				moreToDispatch= false;
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewDeltaTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewDeltaTests.java
deleted file mode 100644
index 6496297..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/PackagesViewDeltaTests.java
+++ /dev/null

@@ -1,639 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.browsing;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.ui.browsing.LogicalPackage;
-
-/**
- * @author jthorsley
- */
-public class PackagesViewDeltaTests extends TestCase {
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite("org.eclipse.jdt.ui.tests.PackagesViewDeltaTests");//$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTestSuite(PackagesViewDeltaTests.class);
-		//$JUnit-END$
-		return suite;
-	}
-	
-	private IJavaProject fJProject;
-	
-	private IPackageFragmentRoot fRoot1;
-	private IWorkspace fWorkspace;
-	private IWorkbench fWorkbench;
-	private MockPluginView fMyPart;
-	
-	private ITreeContentProvider fProvider;
-
-	private IWorkbenchPage fPage;
-	private IPackageFragmentRoot fRoot2;
-	private IPackageFragment fPack12;
-	private IPackageFragment fPack32;
-	private IPackageFragment fPack42;
-	private IPackageFragment fPack52;
-	private IPackageFragment fPack62;
-	private IPackageFragment fPack21;
-	private IPackageFragment fPack61;
-	private IPackageFragment fPack51;
-	private IPackageFragment fPack41;
-	private IPackageFragment fPack31;
-	private IPackageFragment fPack81;
-	private IPackageFragment fPack91;
-	private IPackageFragmentRoot fInternalJarRoot;
-	private IPackageFragment fInternalPack3;
-	private IPackageFragment fInternalPack4;
-	private IPackageFragment fInternalPack5;
-	private IPackageFragment fInternalPack10;
-	private IPackageFragment fInternalPack6;
-	private IPackageFragment fPack102;
-	private boolean fEnableAutoBuildAfterTesting;
-	
-	public PackagesViewDeltaTests(String name) {
-		super(name);
-	}
-	
-	//-----------------Remove delta test cases------------------
-	
-	public void testRemoveTopLevelFragmentNotLogicalPackage() throws Exception {
-
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject);
-		fProvider.getChildren(cp3);
-
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.REMOVED, fPack12);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-
-		assertTrue("Remove happened", fMyPart.hasRemoveHappened()); //$NON-NLS-1$
-		assertTrue("Correct package removed", fMyPart.getRemovedObject().contains(fPack12)); //$NON-NLS-1$
-	}
-
-	public void testRemoveBottomLevelFragmentNotLogicalPackage() throws Exception {
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject);
-
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.REMOVED, fPack42);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("No remove happened, in Logical Package", !fMyPart.hasRemoveHappened()); //$NON-NLS-1$
-	}
-
-	//This is a bogus test because this situation could never occure
-	//while fPack42 exists you cannot remove fPack32 still it tests 
-	//correct delta handeling.
-	public void testRemoveFragmentInMultiFragmentLogicalPackage() throws Exception {
-
-		//initialise the map
-		fMyPart.fViewer.setInput(fJProject);
-		Object[] children= fProvider.getChildren(fJProject);
-		for (int i= 0; i < children.length; i++) {
-			Object object= children[i];
-			fProvider.getChildren(object);
-		}
-
-		//create a logical package with name "pack3"
-		LogicalPackage expectedParent= new LogicalPackage(fPack31);
-		expectedParent.add(fInternalPack3);
-
-		//create a logical package with name "pack3.pack4"
-		LogicalPackage ChildCp1= new LogicalPackage(fPack41);
-		ChildCp1.add(fPack42);
-		ChildCp1.add(fInternalPack4);
-
-		fMyPart.clear();
-
-		//delete a fragment
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.REMOVED, fPack32);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		//assert remove happened
-		assertTrue("Refresh happened", !fMyPart.hasRemoveHappened() && !fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-
-		//test life cycle of Logical Package
-		Object parent= fProvider.getParent(ChildCp1);
-		if (!(parent instanceof LogicalPackage)) {
-			assertTrue("wrong parent found for logical package after remove", false); //$NON-NLS-1$
-		}
-
-		LogicalPackage lp= (LogicalPackage) parent;
-		assertTrue("PackageFragment removed from logical package", lp.equals(expectedParent)); //$NON-NLS-1$
-
-	}
-
-	public void testRemoveBottomLevelFragmentInMultiFragmentLogicalPackage() throws Exception {
-
-		//delete a fragment
-		fPack62.delete(true, null);
-
-		//create a logical package child of cp with name "pack3.pack5.pack6"
-		LogicalPackage expectedChild= new LogicalPackage(fPack61);
-		expectedChild.add(fInternalPack6);
-
-		//create a logical package child of cp with name "pack3.pack5"
-		LogicalPackage ParentCp5= new LogicalPackage(fPack51);
-		ParentCp5.add(fPack52);
-		ParentCp5.add(fInternalPack5);
-
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		//initialise map
-		fProvider.getChildren(fJProject);
-		fProvider.getChildren(cp3);
-		fProvider.getChildren(ParentCp5);
-
-		fMyPart.clear();
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.REMOVED, fPack62);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		//assert delta correct (no remove or refresh, only change to logicalpackage)
-		assertTrue("Refresh happened", !fMyPart.hasRefreshHappened() && !fMyPart.hasRemoveHappened()); //$NON-NLS-1$
-
-		//test life cycle of LogicalPackage
-		Object[] child= fProvider.getChildren(ParentCp5);
-		
-		if ((child.length != 1) || (!(child[0] instanceof LogicalPackage))) {
-			assertTrue("wrong parent found for logical package after remove", false); //$NON-NLS-1$
-		}
-
-		LogicalPackage lp= (LogicalPackage) child[0];
-		assertTrue("PackageFragment removed from logical package", lp.equals(expectedChild)); //$NON-NLS-1$
-	}
-
-	public void testRemoveFragmentInTwoFragmentLogicalPackage() throws Exception {
-
-		//create a logical package child of cp
-		LogicalPackage ParentCp4= new LogicalPackage(fPack41);
-		ParentCp4.add(fPack42);
-		ParentCp4.add(fInternalPack4);
-
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		//initialise map
-		fProvider.getChildren(fJProject);
-		fProvider.getChildren(cp3);
-		fProvider.getChildren(ParentCp4);
-
-		//create logical package with name "pack3.pack4.pack10"
-		LogicalPackage cp10= new LogicalPackage(fInternalPack10);
-
-		//delete fragment
-		fPack102.delete(true, null);
-
-		fMyPart.clear();
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.REMOVED, fPack102);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		pushDisplay();
-
-		//assert remove happened (delta worked)
-		assertTrue("Refresh happened", fMyPart.hasRemoveHappened() && fMyPart.hasAddHappened()); //$NON-NLS-1$
-		Object addedObject= fMyPart.getAddedObject().get(0);
-		Object removedObject= fMyPart.getRemovedObject().get(0);
-		assertTrue("Correct guy removed", cp10.equals(removedObject)); //$NON-NLS-1$
-		assertTrue("Correct guy added", fInternalPack10.equals(addedObject)); //$NON-NLS-1$
-
-		//assert correct children gotten
-		Object[] children= fProvider.getChildren(ParentCp4);
-		assertTrue("PackageFragment removed from logial package", compareArrays(children, new Object[] { fPack91, fInternalPack10 })); //$NON-NLS-1$
-	}
-
-	//-----------------------Add delta test cases----------------------------------
-	public void testAddTopLevelFragmentNotLogicalPackage() throws Exception {
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject);
-
-		fMyPart.clear();
-
-		IPackageFragment test= fRoot1.createPackageFragment("pack3.test", true, null); //$NON-NLS-1$
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.ADDED, test);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Add happened", fMyPart.hasAddHappened()); //$NON-NLS-1$
-		assertTrue("Correct package added", fMyPart.getAddedObject().contains(test)); //$NON-NLS-1$
-	}
-	
-	public void testAddFragmentToLogicalPackage() throws Exception {
-
-		//create a logical package with name "pack3.pack4"
-		LogicalPackage cp4= new LogicalPackage(fPack41);
-		cp4.add(fPack42);
-		cp4.add(fInternalPack4);
-		  
-		//initialise Map  
-		fProvider.getChildren(cp4);
-
-		//send delta
-		IPackageFragment pack101= fRoot1.createPackageFragment("pack3.pack4.pack10", true, null); //$NON-NLS-1$
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.ADDED, pack101);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-		
-		//force events from display
-		pushDisplay();
-		
-		//make sure no refresh happened
-		assertTrue("Refresh did not happened", !fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-	}
-
-	public void testAddCUFromFragmentNotLogicalPackageVisible() throws Exception {
-
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		ICompilationUnit cu= fPack81.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject);
-		fProvider.getChildren(cp3);
-
-		fMyPart.fViewer.reveal(fPack81);
-
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[] { cu }, fPack81, IJavaElementDelta.ADDED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Refresh happened", fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-		assertTrue("Correct package refreshed", fMyPart.getRefreshedObject().contains(fPack81)); //$NON-NLS-1$
-		assertEquals("Correct number of refreshes", 1, fMyPart.getRefreshedObject().size());//$NON-NLS-1$
-	}
-	
-	public void testAddCUFromFragmentNotLogicalPackageNotVisible() throws Exception {
-
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		ICompilationUnit cu= fPack81.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject);
-		fProvider.getChildren(cp3);
-
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[] { cu }, fPack81, IJavaElementDelta.ADDED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Refresh happened", fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-		assertTrue("Correct package refreshed", fMyPart.getRefreshedObject().contains(cp3)); //$NON-NLS-1$
-		assertEquals("Correct number of refreshes", 1, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-	
-	public void testRemoveCUFromFragmentNotLogicalPackage() throws Exception {
-
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject);
-		fProvider.getChildren(cp3);
-
-		ICompilationUnit cu= fPack81.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-
-		//make sure parent is visible
-		fMyPart.fViewer.setInput(fJProject);
-		fMyPart.fViewer.reveal(fPack81);		
-		
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[] { cu }, fPack81, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Refresh happened", fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-		assertTrue("Correct package refreshed", fMyPart.getRefreshedObject().contains(fPack81)); //$NON-NLS-1$
-		assertEquals("Correct number of refreshes", 1, fMyPart.getRefreshedObject().size());//$NON-NLS-1$
-	}
-	
-	public void testRemoveCUFromFragmentNotLogicalPackageWithParentNotVisible() throws Exception {
-
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject);
-		fProvider.getChildren(cp3);
-
-		ICompilationUnit cu= fPack81.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-
-		fMyPart.clear();
-
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[] { cu }, fPack81, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Refresh happened", fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-		assertTrue("Correct package refreshed", fMyPart.getRefreshedObject().contains(cp3)); //$NON-NLS-1$
-		assertEquals("Correct number of refreshes", 1, fMyPart.getRefreshedObject().size());//$NON-NLS-1$
-	}
-	
-	public void testAddBottomLevelFragmentNotLogicalPackage() throws Exception {
-
-		//create a logical package for packages with name "pack3"
-		LogicalPackage cp3= new LogicalPackage(fPack31);
-		cp3.add(fPack32);
-		cp3.add(fInternalPack3);
-
-		//initialise Map
-		fMyPart.fViewer.setInput(fJProject);
-		fProvider.getChildren(cp3);
-
-		fMyPart.clear();
-
-		IPackageFragment test= fRoot1.createPackageFragment("pack3.pack5.test", true, null); //$NON-NLS-1$
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= new TestDelta(IJavaElementDelta.ADDED, test);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		pushDisplay();
-		
-		assertTrue("Add happened", fMyPart.hasAddHappened()); //$NON-NLS-1$
-		assertTrue("Corrent package added", fMyPart.getAddedObject().contains(test)); //$NON-NLS-1$
-	}
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		fWorkspace= ResourcesPlugin.getWorkspace();
-		assertNotNull(fWorkspace);
-		
-		IWorkspaceDescription workspaceDesc= fWorkspace.getDescription();
-		fEnableAutoBuildAfterTesting= workspaceDesc.isAutoBuilding();
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(false);
-
-		//------------set up project ------------------------------
-		fJProject= JavaProjectHelper.createJavaProject("TestProject2", "bin"); //$NON-NLS-1$//$NON-NLS-2$
-		assertNotNull("project null", fJProject); //$NON-NLS-1$
-
-		//----------------Set up internal jar----------------------------
-		File myInternalJar= JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/compoundtest.jar")); //$NON-NLS-1$
-		assertTrue("lib not found", myInternalJar != null && myInternalJar.exists()); //$NON-NLS-1$
-		fInternalJarRoot= JavaProjectHelper.addLibraryWithImport(fJProject, new Path(myInternalJar.getPath()), null, null);
-		fInternalJarRoot.getPackageFragment(""); //$NON-NLS-1$
-		fInternalPack3= fInternalJarRoot.getPackageFragment("pack3"); //$NON-NLS-1$
-		fInternalPack4= fInternalJarRoot.getPackageFragment("pack3.pack4"); //$NON-NLS-1$
-		fInternalPack5= fInternalJarRoot.getPackageFragment("pack3.pack5"); //$NON-NLS-1$
-		fInternalPack6= fInternalJarRoot.getPackageFragment("pack3.pack5.pack6"); //$NON-NLS-1$
-		fInternalPack10= fInternalJarRoot.getPackageFragment("pack3.pack4.pack10"); //$NON-NLS-1$
-		fInternalJarRoot.getPackageFragment("meta-inf"); //$NON-NLS-1$
-
-		//-----------------Set up source folder--------------------------
-
-		fRoot2= JavaProjectHelper.addSourceContainer(fJProject, "src2"); //$NON-NLS-1$
-		fRoot2.createPackageFragment("", true, null); //$NON-NLS-1$
-		fPack12= fRoot2.createPackageFragment("pack1", true, null); //$NON-NLS-1$
-		fRoot2.createPackageFragment("pack1.pack7", true, null); //$NON-NLS-1$
-		fPack32= fRoot2.createPackageFragment("pack3", true, null); //$NON-NLS-1$
-		fPack42= fRoot2.createPackageFragment("pack3.pack4", true, null); //$NON-NLS-1$
-		fPack52= fRoot2.createPackageFragment("pack3.pack5", true, null); //$NON-NLS-1$
-		fPack62= fRoot2.createPackageFragment("pack3.pack5.pack6", true, null); //$NON-NLS-1$
-		fPack102= fRoot2.createPackageFragment("pack3.pack4.pack10", true, null); //$NON-NLS-1$
-
-		fPack12.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-		fPack62.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-		//so that fPack52 won't get deleted when we delete fPack62 in certain tests
-		fPack52.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-		//so that fPack42 won't get deleted when we delete fPack102 in certain tests
-		fPack42.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-
-		//set up project #2: file system structure with in a source folder
-
-		//	JavaProjectHelper.addVariableEntry(fJProject2, new Path("JRE_LIB_TEST"), null, null);
-
-		//----------------Set up source folder--------------------------
-
-		fRoot1= JavaProjectHelper.addSourceContainer(fJProject, "src1"); //$NON-NLS-1$
-		fRoot1.createPackageFragment("", true, null); //$NON-NLS-1$
-		fPack21= fRoot1.createPackageFragment("pack2", true, null); //$NON-NLS-1$
-		fPack31= fRoot1.createPackageFragment("pack3", true, null); //$NON-NLS-1$
-		fPack41= fRoot1.createPackageFragment("pack3.pack4", true, null); //$NON-NLS-1$
-		fPack91= fRoot1.createPackageFragment("pack3.pack4.pack9", true, null); //$NON-NLS-1$
-		fPack51= fRoot1.createPackageFragment("pack3.pack5", true, null); //$NON-NLS-1$
-		fPack61= fRoot1.createPackageFragment("pack3.pack5.pack6", true, null); //$NON-NLS-1$
-		fPack81= fRoot1.createPackageFragment("pack3.pack8", true, null); //$NON-NLS-1$
-
-		fPack21.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-		fPack61.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$//$NON-NLS-2$
-
-		//set up the mock view
-		setUpMockView();
-	}
-	public void setUpMockView() throws Exception {
-
-		fWorkbench= PlatformUI.getWorkbench();
-		assertNotNull(fWorkbench);
-
-		fPage= fWorkbench.getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(fPage);
-
-		//just testing to make sure my part can be created
-		IViewPart myPart= new MockPluginView();
-		assertNotNull(myPart);
-
-		myPart= fPage.showView("org.eclipse.jdt.ui.tests.browsing.MockPluginView"); //$NON-NLS-1$
-		if (myPart instanceof MockPluginView) {
-			fMyPart= (MockPluginView) myPart;
-			fProvider= (ITreeContentProvider) fMyPart.getTreeViewer().getContentProvider();
-			JavaCore.removeElementChangedListener((IElementChangedListener) fProvider);
-		} else
-			assertTrue("Unable to get view", false); //$NON-NLS-1$
-
-		assertNotNull(fProvider);
-	}
-
-	/*
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-
-		JavaProjectHelper.delete(fJProject);
-		fProvider.inputChanged(null, null, null);
-		fPage.hideView(fMyPart);
-		fMyPart.dispose();
-
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-
-		super.tearDown();
-	}
-		
-	/**
-	 * Method compareArrays. Both arrays must be of IPackageFragments or compare will fail.
-	 * @param children 
-	 * @param expectedChildren
-	 * @return boolean returns true if the arrays contain the same elements
-	 */
-	private boolean compareArrays(Object[] children, Object[] expectedChildren) {
-		if (children.length != expectedChildren.length)
-			return false;
-		for (int i= 0; i < children.length; i++) {
-			Object child= children[i];
-			if (child instanceof IJavaElement) {
-				IJavaElement el= (IJavaElement) child;
-				if (!contains(el, expectedChildren))
-					return false;
-			} else if (child instanceof IResource) {
-				IResource res= (IResource) child;
-				if (!contains(res, expectedChildren)) {
-					return false;
-				}
-			} else if (child instanceof LogicalPackage) {
-				if (!contains((LogicalPackage) child, expectedChildren))
-					return false;
-			}
-		}
-		return true;
-	}
-
-	private boolean contains(IResource res, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IResource) {
-				IResource expres= (IResource) object;
-				if (expres.equals(res))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private boolean contains(IJavaElement fragment, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IJavaElement) {
-				IJavaElement expfrag= (IJavaElement) object;
-				if (expfrag.equals(fragment))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	private boolean contains(LogicalPackage lp, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof LogicalPackage) {
-				LogicalPackage explp= (LogicalPackage) object;
-				if (explp.equals(lp))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	private void pushDisplay() {
-		Control ctrl= fMyPart.getTreeViewer().getControl();
-		while (ctrl != null && !ctrl.isDisposed() && fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch())
-			ctrl= fMyPart.getTreeViewer().getControl();
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/TestDelta.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/TestDelta.java
deleted file mode 100644
index 171fe2c..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/browsing/TestDelta.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.browsing;
-
-import org.eclipse.core.resources.IResourceDelta;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-
-/**
- * A faux  delta for testing
- */
-public class TestDelta implements IJavaElementDelta {
-
-	private int fKind;
-	private IJavaElement fElement;
-
-	private IJavaElementDelta[] fAffectedChildren;
-
-	public TestDelta(int kind, IJavaElement element) {
-		fKind= kind;
-		fElement= element;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getAddedChildren()
-	 */
-	public IJavaElementDelta[] getAddedChildren() {
-		return null;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getAffectedChildren()
-	 */
-	public IJavaElementDelta[] getAffectedChildren() {
-		if (fAffectedChildren == null)
-			return new IJavaElementDelta[0];
-		else
-			return fAffectedChildren;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getChangedChildren()
-	 */
-	public IJavaElementDelta[] getChangedChildren() {
-		return null;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getElement()
-	 */
-	public IJavaElement getElement() {
-		return fElement;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getFlags()
-	 */
-	public int getFlags() {
-		return 0;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getKind()
-	 */
-	public int getKind() {
-		return fKind;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getMovedFromElement()
-	 */
-	public IJavaElement getMovedFromElement() {
-		return null;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getMovedToElement()
-	 */
-	public IJavaElement getMovedToElement() {
-		return null;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getRemovedChildren()
-	 */
-	public IJavaElementDelta[] getRemovedChildren() {
-		return null;
-	}
-	/*
-	 * @see org.eclipse.jdt.core.IJavaElementDelta#getResourceDeltas()
-	 */
-	public IResourceDelta[] getResourceDeltas() {
-		return null;
-	}
-
-	/**
-	 * Set the affected children of this Delta.
-	 * @param children
-	 */
-	public void setAffectedChildren(IJavaElementDelta[] children) {
-		fAffectedChildren= children;
-	}
-
-	/**
-	 * Create the parent deltas for an IPackageFragment.
-	 * 
-	 * @param frag
-	 * @param delta
-	 * @return TestDelta
-	 */
-	public static TestDelta createParentDeltas(IPackageFragment frag, TestDelta delta) {
-		IJavaElement root= frag.getParent();
-		TestDelta rootDelta= new TestDelta(IJavaElementDelta.CHANGED, root);
-
-		IJavaProject proj= root.getJavaProject();
-		TestDelta projectDelta= new TestDelta(IJavaElementDelta.CHANGED, proj);
-
-		IJavaModel model= proj.getJavaModel();
-		TestDelta modelDelta= new TestDelta(IJavaElementDelta.CHANGED, model);
-
-		//set affected children
-		modelDelta.setAffectedChildren(new IJavaElementDelta[] { projectDelta });
-		projectDelta.setAffectedChildren(new IJavaElementDelta[] { rootDelta });
-		rootDelta.setAffectedChildren(new IJavaElementDelta[] { delta });
-		return modelDelta;
-	}
-
-	/**
-	 * Create a delta for a list of ICompilationUnits, all the parent deltas
-	 * from the JavaModel down are created as well.
-	 * 
-	 * @param cu
-	 * @param parent
-	 * @param action
-	 * @return IJavaElementDelta
-	 */
-	public static IJavaElementDelta createCUDelta(ICompilationUnit[] cu, IPackageFragment parent, int action) {
-		TestDelta fragmentDelta= new TestDelta(IJavaElementDelta.CHANGED, parent);
-
-		TestDelta[] deltas= new TestDelta[cu.length];
-		for (int i= 0; i < cu.length; i++) {
-			deltas[i]= new TestDelta(action, cu[i]);
-		}
-
-		fragmentDelta.setAffectedChildren(deltas);
-		return createParentDeltas(parent, fragmentDelta);
-	}
-
-	/**
-	 * Creates a delta for a PackageFragment from the JavaModel down.
-	 * 
-	 * @param frag
-	 * @param action
-	 * @return IJavaElementDelta
-	 */
-	public static IJavaElementDelta createDelta(IPackageFragment frag, int action) {
-		TestDelta delta= new TestDelta(action, frag);
-		return createParentDeltas(frag, delta);
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/callhierarchy/CallHierarchyContentProviderTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/callhierarchy/CallHierarchyContentProviderTest.java
deleted file mode 100644
index a7ee2f2..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/callhierarchy/CallHierarchyContentProviderTest.java
+++ /dev/null

@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *   Jesper Kamstrup Linnet (eclipse@kamstrup-linnet.dk) - initial API and implementation
- *             (report 36180: Callers/Callees view)
- ******************************************************************************/
-package org.eclipse.jdt.ui.tests.callhierarchy;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.ui.callhierarchy.CallHierarchyContentProvider;
-import org.eclipse.jdt.internal.ui.callhierarchy.CallHierarchyUI;
-import org.eclipse.jdt.internal.ui.callhierarchy.TreeRoot;
-
-import org.eclipse.jdt.internal.corext.callhierarchy.CallHierarchy;
-import org.eclipse.jdt.internal.corext.callhierarchy.MethodWrapper;
-
-public class CallHierarchyContentProviderTest extends TestCase {
-    private static final int DEFAULT_MAX_DEPTH= 10;
-
-    private static final Class THIS= CallHierarchyContentProviderTest.class;
-
-    private CallHierarchyTestHelper helper;
-
-    private CallHierarchyContentProvider fProvider;
-    public CallHierarchyContentProviderTest(String name) {
-        super(name);
-    }
-
-    public static Test suite() {
-        if (true) {
-            return new TestSuite(THIS);
-        } else {
-            TestSuite suite= new TestSuite();
-            suite.addTest(new CallHierarchyContentProviderTest("test1"));
-
-            return suite;
-        }
-    }
-
-    protected void setUp() throws Exception {
-        helper= new CallHierarchyTestHelper();
-        helper.setUp();
-
-        fProvider= new CallHierarchyContentProvider(null);
-
-        CallHierarchyUI.getDefault().setMaxCallDepth(DEFAULT_MAX_DEPTH);
-    }
-
-    protected void tearDown() throws Exception {
-        helper.tearDown();
-        helper= null;
-
-        CallHierarchyUI.getDefault().setMaxCallDepth(DEFAULT_MAX_DEPTH);
-    }
-
-    /**
-     * Tests getChildren and hasChildren on an "ordinary" callee tree.
-     * 
-     * @throws JavaModelException
-     * @throws CoreException
-     */
-    public void testGetChildrenOfCalleeRoot() throws JavaModelException, CoreException {
-        helper.createSimpleClasses();
-
-        TreeRoot root= wrapCalleeRoot(helper.getMethod4());
-        Object[] children= fProvider.getChildren(root);
-        assertEquals("Wrong number of children", 1, children.length);
-        helper.assertCalls(new IMember[] { helper.getMethod4()}, children);
-        assertEquals("Wrong method", helper.getMethod4(), ((MethodWrapper) children[0]).getMember());
-        assertEquals("root's hasChildren", true, fProvider.hasChildren(root));
-
-        Object[] secondLevelChildren= fProvider.getChildren(children[0]);
-        helper.assertCalls(new IMember[] { helper.getMethod3()}, secondLevelChildren);
-        assertCalleeMethodWrapperChildren(secondLevelChildren);
-        assertEquals("second level hasChildren", true, fProvider.hasChildren(children[0]));
-
-        Object[] thirdLevelChildren= fProvider.getChildren(secondLevelChildren[0]);
-        helper.assertCalls(new IMember[] { helper.getMethod1(), helper.getMethod2()}, thirdLevelChildren);
-        assertCalleeMethodWrapperChildren(thirdLevelChildren);
-        assertEquals("third level hasChildren", true, fProvider.hasChildren(secondLevelChildren[0]));
-
-        MethodWrapper fourthLevelMethodWrapper= helper.findMethodWrapper(helper.getMethod1(), thirdLevelChildren);
-        assertNotNull("method1 not found", fourthLevelMethodWrapper);
-        assertEquals(
-            "Wrong number of fourth level children",
-            0,
-            fProvider.getChildren(fourthLevelMethodWrapper).length);
-        // hasChildren should be true even if the node doesn't have children (for performance reasons)
-        assertEquals("fourth level hasChildren", true, fProvider.hasChildren(fourthLevelMethodWrapper));
-    }
-
-    /**
-     * Tests getChildren and hasChildren on an "ordinary" callers tree.
-     * 
-     * @throws JavaModelException
-     * @throws CoreException
-     */
-    public void testGetChildrenOfCallerRoot() throws JavaModelException, CoreException {
-        helper.createSimpleClasses();
-
-        TreeRoot root= wrapCallerRoot(helper.getMethod1());
-        Object[] children= fProvider.getChildren(root);
-        helper.assertCalls(new IMember[] { helper.getMethod1()}, children);
-        assertEquals("root's hasChildren", true, fProvider.hasChildren(root));
-
-        Object[] secondLevelChildren= fProvider.getChildren(children[0]);
-        helper.assertCalls(new IMember[] { helper.getMethod2(), helper.getMethod3()}, secondLevelChildren);
-        assertCallerMethodWrapperChildren(secondLevelChildren);
-        assertEquals("second level hasChildren", true, fProvider.hasChildren(children[0]));
-
-        MethodWrapper thirdLevelMethodWrapper= helper.findMethodWrapper(helper.getMethod3(), secondLevelChildren);
-        assertNotNull("method3() not found", thirdLevelMethodWrapper);
-        Object[] thirdLevelChildren= fProvider.getChildren(thirdLevelMethodWrapper);
-        helper.assertCalls(new IMember[] { helper.getMethod4()}, thirdLevelChildren);
-        assertCallerMethodWrapperChildren(thirdLevelChildren);
-        assertEquals("third level hasChildren", true, fProvider.hasChildren(thirdLevelMethodWrapper));
-
-        assertEquals("Wrong number of fourth level children", 0, fProvider.getChildren(thirdLevelChildren[0]).length);
-        // hasChildren should be true even if the node doesn't have children (for performance reasons)
-        assertEquals("fourth level hasChildren", true, fProvider.hasChildren(thirdLevelChildren[0]));
-    }
-
-    /**
-     * Tests getChildren and hasChildren on an callers tree which exceeds the max call depth.
-     * 
-     * @throws JavaModelException
-     * @throws CoreException
-     */
-    public void testGetChildrenOfCallerMaxDepth() throws JavaModelException, CoreException {
-        helper.createSimpleClasses();
-
-        CallHierarchyUI.getDefault().setMaxCallDepth(2);
-
-        TreeRoot root= wrapCallerRoot(helper.getMethod1());
-        Object[] children= fProvider.getChildren(root);
-        helper.assertCalls(new IMember[] { helper.getMethod1()}, children);
-        assertEquals("root's hasChildren", true, fProvider.hasChildren(root));
-
-        Object[] secondLevelChildren= fProvider.getChildren(children[0]);
-        helper.assertCalls(new IMember[] { helper.getMethod2(), helper.getMethod3()}, secondLevelChildren);
-        assertCallerMethodWrapperChildren(secondLevelChildren);
-        assertEquals("second level hasChildren", true, fProvider.hasChildren(children[0]));
-
-        MethodWrapper thirdLevelMethodWrapper= helper.findMethodWrapper(helper.getMethod3(), secondLevelChildren);
-        assertNotNull("method3() not found", thirdLevelMethodWrapper);
-        Object[] thirdLevelChildren= fProvider.getChildren(thirdLevelMethodWrapper);
-        helper.assertCalls(new IMember[] { helper.getMethod4()}, thirdLevelChildren);
-        assertCallerMethodWrapperChildren(thirdLevelChildren);
-        assertEquals("third level hasChildren", true, fProvider.hasChildren(thirdLevelMethodWrapper));
-
-        assertEquals("Wrong number of fourth level children", 0, fProvider.getChildren(thirdLevelChildren[0]).length);
-        // hasChildren should be false since the maximum depth has been reached
-        assertEquals("fourth level hasChildren", false, fProvider.hasChildren(thirdLevelChildren[0]));
-    }
-
-    /**
-     * Tests getChildren and hasChildren on an callee tree which exceeds the max call depth.
-     * 
-     * @throws JavaModelException
-     * @throws CoreException
-     */
-    public void testGetChildrenOfCalleeMaxDepth() throws JavaModelException, CoreException {
-        helper.createSimpleClasses();
-
-        CallHierarchyUI.getDefault().setMaxCallDepth(2);
-
-        TreeRoot root= wrapCalleeRoot(helper.getMethod4());
-        Object[] children= fProvider.getChildren(root);
-        assertEquals("Wrong number of children", 1, children.length);
-        helper.assertCalls(new IMember[] { helper.getMethod4()}, children);
-        assertEquals("Wrong method", helper.getMethod4(), ((MethodWrapper) children[0]).getMember());
-        assertEquals("root's hasChildren", true, fProvider.hasChildren(root));
-
-        Object[] secondLevelChildren= fProvider.getChildren(children[0]);
-        helper.assertCalls(new IMember[] { helper.getMethod3()}, secondLevelChildren);
-        assertCalleeMethodWrapperChildren(secondLevelChildren);
-        assertEquals("second level hasChildren", true, fProvider.hasChildren(children[0]));
-
-        Object[] thirdLevelChildren= fProvider.getChildren(secondLevelChildren[0]);
-        helper.assertCalls(new IMember[] { helper.getMethod1(), helper.getMethod2()}, thirdLevelChildren);
-        assertCalleeMethodWrapperChildren(thirdLevelChildren);
-        assertEquals("third level hasChildren", true, fProvider.hasChildren(secondLevelChildren[0]));
-
-        MethodWrapper fourthLevelMethodWrapper= helper.findMethodWrapper(helper.getMethod1(), thirdLevelChildren);
-        assertNotNull("method1 not found", fourthLevelMethodWrapper);
-        assertEquals(
-            "Wrong number of fourth level children",
-            0,
-            fProvider.getChildren(fourthLevelMethodWrapper).length);
-        // hasChildren should be false since the maximum depth has been reached
-        assertEquals("fourth level hasChildren", false, fProvider.hasChildren(thirdLevelChildren[0]));
-    }
-
-    /**
-    * Tests getChildren and hasChildren on an callers tree with recursion.
-    * 
-    * @throws JavaModelException
-    * @throws CoreException
-    */
-    public void testGetChildrenOfCalleeRecursive() throws JavaModelException, CoreException {
-        helper.createSimpleClasses();
-
-        TreeRoot root= wrapCalleeRoot(helper.getRecursiveMethod1());
-        Object[] children= fProvider.getChildren(root);
-        helper.assertCalls(new IMember[] { helper.getRecursiveMethod1()}, children);
-        assertEquals("root's hasChildren", true, fProvider.hasChildren(root));
-
-        Object[] secondLevelChildren= fProvider.getChildren(children[0]);
-        helper.assertCalls(new IMember[] { helper.getRecursiveMethod2()}, secondLevelChildren);
-        assertCalleeMethodWrapperChildren(secondLevelChildren);
-        assertEquals("second level hasChildren", true, fProvider.hasChildren(children[0]));
-
-        MethodWrapper thirdLevelMethodWrapper= (MethodWrapper) secondLevelChildren[0];
-        Object[] thirdLevelChildren= fProvider.getChildren(thirdLevelMethodWrapper);
-        helper.assertCalls(new IMember[] { helper.getRecursiveMethod1()}, thirdLevelChildren);
-        assertCalleeMethodWrapperChildren(thirdLevelChildren);
-
-        // A recursion should have occurred, resulting in hasChildren = false 
-        assertEquals("third level hasChildren", false, fProvider.hasChildren(thirdLevelChildren[0]));
-    }
-
-    /**
-     * Tests getChildren and hasChildren on an callees tree with recursion.
-     * 
-     * @throws JavaModelException
-     * @throws CoreException
-     */
-    public void testGetChildrenOfCallerRecursive() throws JavaModelException, CoreException {
-        helper.createSimpleClasses();
-
-        TreeRoot root= wrapCallerRoot(helper.getRecursiveMethod1());
-        Object[] children= fProvider.getChildren(root);
-        helper.assertCalls(new IMember[] { helper.getRecursiveMethod1()}, children);
-        assertEquals("root's hasChildren", true, fProvider.hasChildren(root));
-
-        Object[] secondLevelChildren= fProvider.getChildren(children[0]);
-        helper.assertCalls(new IMember[] { helper.getRecursiveMethod2()}, secondLevelChildren);
-        assertCallerMethodWrapperChildren(secondLevelChildren);
-        assertEquals("second level hasChildren", true, fProvider.hasChildren(children[0]));
-
-        MethodWrapper thirdLevelMethodWrapper= (MethodWrapper) secondLevelChildren[0];
-        Object[] thirdLevelChildren= fProvider.getChildren(thirdLevelMethodWrapper);
-        helper.assertCalls(new IMember[] { helper.getRecursiveMethod1()}, thirdLevelChildren);
-        assertCallerMethodWrapperChildren(thirdLevelChildren);
-
-        // A recursion should have occurred, resulting in hasChildren = false 
-        assertEquals("third level hasChildren", false, fProvider.hasChildren(thirdLevelChildren[0]));
-    }
-
-    private void assertCalleeMethodWrapperChildren(Object[] children) {
-        for (int i= 0; i < children.length; i++) {
-            assertTrue("Wrong class returned", children[i].getClass().getName().endsWith(".CalleeMethodWrapper"));
-        }
-    }
-
-    private void assertCallerMethodWrapperChildren(Object[] children) {
-        for (int i= 0; i < children.length; i++) {
-            assertTrue("Wrong class returned", children[i].getClass().getName().endsWith(".CallerMethodWrapper"));
-        }
-    }
-
-    private TreeRoot wrapCalleeRoot(IMethod method) {
-        return new TreeRoot(CallHierarchy.getDefault().getCalleeRoot(method));
-    }
-
-    private TreeRoot wrapCallerRoot(IMethod method) {
-        return new TreeRoot(CallHierarchy.getDefault().getCallerRoot(method));
-    }
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/callhierarchy/CallHierarchyTestHelper.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/callhierarchy/CallHierarchyTestHelper.java
deleted file mode 100644
index 3d3ba28..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/callhierarchy/CallHierarchyTestHelper.java
+++ /dev/null

@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *   Jesper Kamstrup Linnet (eclipse@kamstrup-linnet.dk) - initial API and implementation
- *             (report 36180: Callers/Callees view)
- ******************************************************************************/
-package org.eclipse.jdt.ui.tests.callhierarchy;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-
-import junit.framework.Assert;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.internal.corext.callhierarchy.MethodWrapper;
-
-public class CallHierarchyTestHelper {
-    private static final String[] EMPTY= new String[0];
-
-    private IJavaProject fJavaProject1;
-    private IJavaProject fJavaProject2;
-    private IType fType1;
-    private IType fType2;
-    private IPackageFragment fPack2;
-    private IPackageFragment fPack1;
-
-    private IMethod fMethod1;
-    private IMethod fMethod2;
-    private IMethod fMethod3;
-    private IMethod fMethod4;
-    private IMethod fRecursiveMethod1;
-    private IMethod fRecursiveMethod2;
-
-    public void setUp() throws Exception {
-        fJavaProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-        fJavaProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");
-        fType1= null;
-        fType2= null;
-        fPack1= null;
-        fPack2= null;
-    }
-
-    public void tearDown() throws Exception {
-        JavaProjectHelper.delete(fJavaProject1);
-        JavaProjectHelper.delete(fJavaProject2);
-    }
-
-
-    /**
-     * Creates two simple classes, A and B. Sets the instance fields fType1 and fType2.
-     */
-    public void createSimpleClasses() throws CoreException, JavaModelException {
-        createPackages();
-
-        
-        ICompilationUnit cu1= fPack1.getCompilationUnit("A.java");
-
-        fType1=
-            cu1.createType(
-                "public class A {\n" +
-                "public A() {\n" +
-                "}\n " +
-                "public void method1() {\n" +
-                "}\n " +
-                "public void method2() {\n" +
-                "  method1();\n" +
-                "}\n " +
-                "public void recursiveMethod1() {\n" +
-                "  recursiveMethod2();\n " +
-                "}\n " +
-                "public void recursiveMethod2() {\n" +
-                "  recursiveMethod1();\n " +
-                "}\n" +
-                "}\n",
-                null,
-                true,
-                null);
-
-        ICompilationUnit cu2= fPack2.getCompilationUnit("B.java");
-        fType2=
-            cu2.createType(
-                "public class B extends pack1.A {\npublic void method3() { method1(); method2(); }\n public void method4() { method3(); }\n}\n",
-                null,
-                true,
-                null);
-    }
-
-    /**
-     * Creates two simple classes, A and its subclass B, where B calls A's implicit constructor explicitly. Sets the instance fields fType1 and fType2.
-     */
-    public void createImplicitConstructorClasses() throws CoreException, JavaModelException {
-        createPackages();
-
-        ICompilationUnit cu1= fPack1.getCompilationUnit("A.java");
-        fType1=
-            cu1.createType(
-                "public class A {\n public void method1() { }\n public void method2() { method1(); }\n public void recursiveMethod1() { recursiveMethod2(); }\n public void recursiveMethod2() { recursiveMethod1(); }\n}\n",
-                null,
-                true,
-                null);
-
-        ICompilationUnit cu2= fPack2.getCompilationUnit("B.java");
-        fType2=
-            cu2.createType(
-                "public class B extends pack1.A {\n public B(String name) { super(); }\n}\n",
-                null,
-                true,
-                null);
-    }
-
-    /**
-     * Creates an inner class and sets the class attribute fType1.
-     */
-    public void createInnerClass() throws Exception {
-        createPackages();
-        
-        ICompilationUnit cu1= fPack1.getCompilationUnit("Outer.java");
-        fType1=
-            cu1.createType(
-                "public class Outer {\n" +
-                "private Inner inner= new Inner();\n" +
-                "class Inner { public void innerMethod1() { outerMethod1(); }\n public void innerMethod2() { innerMethod1(); }\n }\n" +
-                "public void outerMethod1() { }\n public void outerMethod2() { inner.innerMethod2(); }\n" +
-                "}",
-                null,
-                true,
-                null);
-    }
-    
-    /**
-     * Creates an anonymous inner class and sets the class attribute fType1.
-     */
-    public void createAnonymousInnerClass() throws Exception {
-        createPackages();
-        
-        ICompilationUnit cu1= fPack1.getCompilationUnit("AnonymousInner.java");
-        fType1=
-            cu1.createType(
-                "public class AnonymousInner {\n" +
-                "  Object anonClass = new Object() {\n" +
-                "    void anotherMethod() {\n" +
-                "      someMethod();\n" +
-                "    }\n" +
-                "  };\n" +
-                "  void someMethod() {\n" +
-                "  }\n" +
-                "}\n",
-                null,
-                true,
-                null);
-                
-        ICompilationUnit cu2= fPack2.getCompilationUnit("Outer.java");
-        fType2=
-            cu2.createType(
-                "public class Outer {\n" +
-                "    interface Intf {\n" +
-                "         public void foo();\n" +
-                "    }\n" +
-                "    class Clazz {\n" +
-                "         public void foo() { };\n" +
-                "    }\n" +
-                "    public void anonymousOnInterface() {\n" +
-                "        new Intf() {\n"+
-                "            public void foo() {\n"+
-                "                someMethod();\n"+
-                "            }\n"+
-                "        };\n"+
-                "    }\n" +
-                "    public void anonymousOnClass() {\n" +
-                "        new Clazz() {\n"+
-                "            public void foo() {\n"+
-                "                someMethod();\n"+
-                "            }\n"+
-                "        };\n"+
-                "    }\n" +
-                "    public void someMethod() { }\n"+
-                "}\n",
-                null,
-                true,
-                null);
-                
-    }
-
-    /**
-     * Creates an anonymous inner class inside another method and sets the class attribute fType1.
-     */
-    public void createAnonymousInnerClassInsideMethod() throws Exception {
-        createPackages();
-        
-        ICompilationUnit cu1= fPack1.getCompilationUnit("AnonymousInnerInsideMethod.java");
-        fType1=
-            cu1.createType(
-                "public class AnonymousInnerInsideMethod {\n" +
-                "  void m() {\n" +
-                "    System.out.println(\"before\");\n"+
-                "    Runnable runnable = new Runnable() {\n"+
-                "      public void run() {\n"+
-                "        System.out.println(\"run\");\n"+
-                "      }\n"+
-                "    };\n"+
-                "    runnable.run();\n"+
-                "  }\n"+
-                "}\n",
-                null,
-                true,
-                null);
-                
-    }
-
-    /**
-     * Creates a class with a static initializer and sets the class attribute fType1.
-     */
-    public void createStaticInitializerClass() throws Exception {
-        createPackages();
-        
-        ICompilationUnit cu1= fPack1.getCompilationUnit("Initializer.java");
-        fType1=
-            cu1.createType(
-                "public class Initializer { static { someMethod(); }\n public static void someMethod() { }\n }\n",
-                null,
-                true,
-                null);
-    }
-    
-    /**
-     * Creates two packages (pack1 and pack2) in different projects. Sets the
-     * instance fields fPack1 and fPack2.
-     */
-    public void createPackages() throws CoreException, JavaModelException {
-        JavaProjectHelper.addRTJar(fJavaProject1);
-
-        IPackageFragmentRoot root1= JavaProjectHelper.addSourceContainer(fJavaProject1, "src");
-        fPack1= root1.createPackageFragment("pack1", true, null);
-
-        JavaProjectHelper.addRTJar(fJavaProject2);
-        JavaProjectHelper.addRequiredProject(fJavaProject2, fJavaProject1);
-
-        IPackageFragmentRoot root2= JavaProjectHelper.addSourceContainer(fJavaProject2, "src");
-        fPack2= root2.createPackageFragment("pack2", true, null);
-    }
-
-    /**
-     * Asserts that all the expected methods were found in the call results.
-     */
-    public void assertCalls(Collection expectedMembers, Collection calls) {
-        Collection foundMembers= new ArrayList();
-
-        for (Iterator iter= calls.iterator(); iter.hasNext();) {
-            MethodWrapper element= (MethodWrapper) iter.next();
-            foundMembers.add(element.getMember());
-        }
-
-        Assert.assertEquals("Wrong number of calls", expectedMembers.size(), calls.size());
-        Assert.assertTrue("One or more members not found", foundMembers.containsAll(expectedMembers));
-    }
-
-    /**
-     * Asserts that all the expected methods were found in the call results.
-     */
-    public void assertCalls(Collection expectedMembers, MethodWrapper[] callResults) {
-        assertCalls(expectedMembers, Arrays.asList(callResults));
-    }
-
-    /**
-     * Asserts that all the expected methods were found in the call results.
-     */
-    public void assertCalls(IMember[] expectedMembers, Object[] callResults) {
-        assertCalls(Arrays.asList(expectedMembers), Arrays.asList(callResults));
-    }
-
-    public MethodWrapper findMethodWrapper(IMethod method, Object[] methodWrappers) {
-        MethodWrapper thirdLevelMethodWrapper= null;
-        for (int i= 0; i < methodWrappers.length; i++) {
-            if (method.equals(((MethodWrapper) methodWrappers[i]).getMember())) {
-                thirdLevelMethodWrapper= (MethodWrapper) methodWrappers[i];
-                break;
-            }
-        }
-        return thirdLevelMethodWrapper;
-    }
-
-    /**
-     * @return
-     */
-    public IJavaProject getJavaProject2() {
-        return fJavaProject2;
-    }
-
-    /**
-     * @return
-     */
-    public IPackageFragment getPackage1() {
-        return fPack1;
-    }
-
-    /**
-     * @return
-     */
-    public IPackageFragment getPackage2() {
-        return fPack2;
-    }
-
-    /**
-     * @return
-     */
-    public IType getType1() {
-        return fType1;
-    }
-
-    /**
-     * @return
-     */
-    public IType getType2() {
-        return fType2;
-    }
-
-    public IMethod getMethod1() {
-        if (fMethod1 == null) {
-            fMethod1= getType1().getMethod("method1", EMPTY);
-        }
-        return fMethod1;
-    }
-
-    public IMethod getMethod2() {
-        if (fMethod2 == null) {
-            fMethod2= getType1().getMethod("method2", EMPTY);
-        }
-        return fMethod2;
-    }
-
-    public IMethod getMethod3() {
-        if (fMethod3 == null) {
-            fMethod3= getType2().getMethod("method3", EMPTY);
-        }
-        return fMethod3;
-    }
-
-    public IMethod getMethod4() {
-        if (fMethod4 == null) {
-            fMethod4= getType2().getMethod("method4", EMPTY);
-        }
-        return fMethod4;
-    }
-
-    public IMethod getRecursiveMethod1() {
-        if (fRecursiveMethod1 == null) {
-            fRecursiveMethod1= getType1().getMethod("recursiveMethod1", EMPTY);
-        }
-        return fRecursiveMethod1;
-    }
-
-    public IMethod getRecursiveMethod2() {
-        if (fRecursiveMethod2 == null) {
-            fRecursiveMethod2= getType1().getMethod("recursiveMethod2", EMPTY);
-        }
-        return fRecursiveMethod2;
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java
deleted file mode 100644
index 1df057a..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java
+++ /dev/null

@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.corext.codemanipulation.ImportsStructure;
-
-public class AddImportTest extends CoreTests {
-	
-	private static final Class THIS= AddImportTest.class;
-	
-	private IJavaProject fJProject1;
-
-	public AddImportTest(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new AddImportTest("testRemoveImports1"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-
-	protected void setUp() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		JavaProjectHelper.addRequiredProject(fJProject1, ProjectTestSetup.getProject());
-		
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, String.valueOf(99));
-		JavaCore.setOptions(options);
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fJProject1);
-	}
-	
-	public void testAddImports1() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("import pack.List2;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		String[] order= new String[] { "java", "com", "pack" };
-		
-		ImportsStructure imports= new ImportsStructure(cu, order, 2, true);
-		imports.addImport("java.net.Socket");
-		imports.addImport("p.A");
-		imports.addImport("com.something.Foo");
-		
-		imports.create(true, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.net.Socket;\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import com.something.Foo;\n");
-		buf.append("\n");
-		buf.append("import p.A;\n");
-		buf.append("\n");		
-		buf.append("import pack.List;\n");
-		buf.append("import pack.List2;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-
-	public void testAddImports2() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		String[] order= new String[] { "java", "java.util", "com", "pack" };
-
-		ImportsStructure imports= new ImportsStructure(cu, order, 2, true);
-		imports.addImport("java.x.Socket");
-
-		imports.create(true, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.x.Socket;\n");
-		buf.append("\n");		
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testRemoveImports1() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("import pack.List2;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		String[] order= new String[] { "java", "com", "pack" };
-		
-		ImportsStructure imports= new ImportsStructure(cu, order, 2, true);
-		imports.removeImport("java.util.Set");
-		imports.removeImport("pack.List");
-		
-		imports.create(true, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import pack.List2;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-
-	
-	public void testAddImports_bug23078() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import p.A.*;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		String[] order= new String[] { };
-
-		ImportsStructure imports= new ImportsStructure(cu, order, 2, true);
-		imports.addImport("p.Inner");
-
-		imports.create(true, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import p.Inner;\n");
-		buf.append("import p.A.*;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testAddImports_bug25113() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.awt.Panel;\n");
-		buf.append("\n");
-		buf.append("import java.math.BigInteger;\n");
-		buf.append("\n");		
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		String[] order= new String[] { "java.awt", "java" };
-
-		ImportsStructure imports= new ImportsStructure(cu, order, 99, true);
-		imports.addImport("java.applet.Applet");
-
-		imports.create(true, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.awt.Panel;\n");
-		buf.append("\n");
-		buf.append("import java.applet.Applet;\n");
-		buf.append("import java.math.BigInteger;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testAddImports_bug42637() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.lang.System;\n");
-		buf.append("\n");		
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		String[] order= new String[] { "java" };
-
-		ImportsStructure imports= new ImportsStructure(cu, order, 99, true);
-		imports.addImport("java.io.Exception");
-
-		imports.create(true, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.io.Exception;\n");
-		buf.append("import java.lang.System;\n");
-		buf.append("\n");		
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}		
-
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddUnimplementedConstructorsTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddUnimplementedConstructorsTest.java
deleted file mode 100644
index 0b708cf..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddUnimplementedConstructorsTest.java
+++ /dev/null

@@ -1,1115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.io.IOException;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.Modifier;
-
-import org.eclipse.jdt.internal.corext.codemanipulation.AddUnimplementedConstructorsOperation;
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility;
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-
-
-public class AddUnimplementedConstructorsTest extends CoreTests {
-
-	private static final Class THIS= AddUnimplementedConstructorsTest.class;
-	
-	private IJavaProject fJavaProject;
-	private IPackageFragment fPackage;
-	private IType fClassA, fClassB, fClassC;
-	private boolean fOldFormatter;
-
-	private CodeGenerationSettings fSettings;
-
-	public AddUnimplementedConstructorsTest(String name) {
-		super(name);
-		fOldFormatter= false;
-	}
-	
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new AddUnimplementedConstructorsTest("testOneConstructorWithImportStatement"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-	/**
-	 * Creates a new test Java project.
-	 */	
-	protected void setUp() throws Exception {
-		initCodeTemplates();		
-	}	
-	
-	private void initCodeTemplates() {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "999");
-		JavaCore.setOptions(options);		
-
-		StringBuffer comment= new StringBuffer();
-		comment.append("/** Constructor Comment\n");
-		comment.append(" * ${tags}\n");
-		comment.append(" */");
-		
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CONSTRUCTORCOMMENT).setPattern(comment.toString());
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CONSTRUCTORSTUB).setPattern("${body_statement}\n// TODO");	
-		fSettings= JavaPreferencesSettings.getCodeGenerationSettings();
-		fSettings.createComments= true;
-	}
-
-	/**
-	 * Removes the test java project.
-	 */
-	protected void tearDown () throws Exception {
-		JavaProjectHelper.delete(fJavaProject);
-		fJavaProject= null;
-		fPackage= null;
-		fClassA= null;
-	}
-	
-	/*
-	 * basic test: test with one constructor
-	 */
-	public void testOneConstructorToOverride() throws Exception {
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= fPackage.createCompilationUnit("A.java", "package ibm.util;\n\n", true, null);
-		fClassA= cu.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java"); //$NON-NLS-1$
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null); //$NON-NLS-1$
-	
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] { "A" }, constructorMethods); //$NON-NLS-1$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(false);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] { "Test1" }, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		checkDefaultConstructorWithCommentWithSuper(createdMethods[0].getSource());
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * \n");
-		buf.append("     */\n");
-		buf.append("    public Test1() {\n");
-		buf.append("        super();\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-		compareSource(buf.toString(), testClass.getSource());
-	}
-	
-	/*
-	 * basic test: test with 2 constructors to override
-	 */
-	public void testTwoConstructorsToOverride() throws Exception {
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= fPackage.getCompilationUnit("A.java");
-		fClassA= cu.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		fClassA.createMethod("public A(int a) {super();}\n", null, true, null);
-		
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-	
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] { "A", "A" }, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(false);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] { "Test1", "Test1" }, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		checkDefaultConstructorWithCommentWithSuper(createdMethods[0].getSource());
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * \n");
-		buf.append("     */\n");
-		buf.append("    public Test1() {\n");
-		buf.append("        super();\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a) {\n");
-		buf.append("        super(a);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}
-	
-	/*
-	 * basic test: test with 3 constructors to override
-	 */
-	public void testThreeConstructorsToOverride() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= fPackage.getCompilationUnit("A.java");
-		fClassA= cu.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		fClassA.createMethod("public A(int a) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo) {super();}\n", null, true, null);
-		
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-	
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] { "A", "A", "A" }, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] { "Test1", "Test1", "Test1" }, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		checkDefaultConstructorWithCommentNoSuper(createdMethods[0].getSource());
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * \n");
-		buf.append("     */\n");
-		buf.append("    public Test1() {\n");
-		buf.append("\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a) {\n");
-		buf.append("        super(a);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo) {\n");
-		buf.append("        super(a, boo);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}
-	
-	/*
-	 * basic test: test with default constructor only
-	 */
-	public void testDefaultConstructorToOverride() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= fPackage.getCompilationUnit("A.java");
-		fClassA= cu.createType("public class A {\n}\n", null, true, null);	
-		
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-	
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] { "Object" }, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-				
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(false);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] { "Test1" }, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		checkDefaultConstructorWithCommentWithSuper(createdMethods[0].getSource());
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * \n");
-		buf.append("     */\n");
-		buf.append("    public Test1() {\n");
-		buf.append("        super();\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}	
-	
-	/*
-	 * basic test: test with nothing to override
-	 */
-	public void testNoConstructorsToOverrideAvailable() throws Exception {
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= fPackage.getCompilationUnit("A.java");
-		fClassA= cu.createType("public class A {\n}\n", null, true, null);		
-		
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-		testClass.createMethod("public Test1(){}\n", null, true, null);
-	
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] {}, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(false);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] existingMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1"}, existingMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("public Test1(){}\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}	
-	
-	/*
-	 * basic test: test an Interface to make sure no exception is thrown
-	 */
-	public void testNoConstructorsToOverrideWithInterface() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= fPackage.getCompilationUnit("A.java");
-		fClassA= cu.createType("public interface A {\n}\n", null, true, null);		
-		
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 implements A {\n}\n", null, true, null);
-		testClass.createMethod("public Test1(){}\n", null, true, null);
-		
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] {}, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(false);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] existingMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1"}, existingMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 implements A {\n");
-		buf.append("public Test1(){}\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}	
-	
-	/*
-	 * basic test: test with 8 constructors to override
-	 */
-	public void testEightConstructorsToOverride() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= fPackage.getCompilationUnit("A.java");
-		fClassA= cu.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		fClassA.createMethod("public A(int a) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf, char a) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf, char a, double c) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString) {super();}\n", null, true, null);
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-	
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] { "A", "A", "A", "A", "A", "A", "A", "A" }, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		fSettings.createComments= false;
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1", "Test1", "Test1", "Test1", "Test1", "Test1", "Test1", "Test1"}, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		checkDefaultConstructorNoCommentNoSuper(createdMethods[0].getSource());	
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("    public Test1() {\n");
-		buf.append("\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    public Test1(int a) {\n");
-		buf.append("        super(a);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString) {\n");
-		buf.append("        super(a, boo, fooString);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf) {\n");
-		buf.append("        super(a, boo, fooString, buf);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a) {\n");
-		buf.append("        super(a, boo, fooString, buf, a);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c, d);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c, d, secondString);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}
-	
-	/*
-	 * basic test: test with 4 constructors to override. Class B extends Class A.
-	 */
-	public void testFourConstructorsToOverride() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cuA= fPackage.getCompilationUnit("A.java");
-		fClassA= cuA.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		fClassA.createMethod("public A(int a) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf) {super();}\n", null, true, null);
-
-		ICompilationUnit cuB= fPackage.getCompilationUnit("B.java");
-		fClassB= cuB.createType("public class B extends A{\n}\n", null, true, null);		
-		fClassB.createMethod("public B(int a, boolean boo, String fooString, StringBuffer buf, char a) {super();}\n", null, true, null);
-		fClassB.createMethod("public B(int a, boolean boo, String fooString, StringBuffer buf, char a, double c) {super();}\n", null, true, null);
-		fClassB.createMethod("public B(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d) {super();}\n", null, true, null);
-		fClassB.createMethod("public B(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString) {super();}\n", null, true, null);
-
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends B {\n}\n", null, true, null);
-	
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] { "B", "B", "B", "B" }, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1", "Test1", "Test1", "Test1" }, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends B {\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a) {\n");
-		buf.append("        super(a, boo, fooString, buf, a);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param c\n");
-		buf.append("     * @param d\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c, d);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param c\n");
-		buf.append("     * @param d\n");
-		buf.append("     * @param secondString\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c, d, secondString);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-		compareSource(buf.toString(), testClass.getSource());
-	}
-	
-	/*
-	 * basic test: test with 5 constructors to override. Class C extends B extends Class A.
-	 */
-	public void testFiveConstructorsToOverrideWithTwoLevelsOfInheritance() throws Exception {
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cuA= fPackage.getCompilationUnit("A.java");
-		fClassA= cuA.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		fClassA.createMethod("public A(int a) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf) {super();}\n", null, true, null);
-
-		ICompilationUnit cuB= fPackage.getCompilationUnit("B.java");
-		fClassB= cuB.createType("public class B extends A{\n}\n", null, true, null);		
-		fClassB.createMethod("public B(int a, boolean boo, String fooString, StringBuffer buf, char a) {super();}\n", null, true, null);
-		fClassB.createMethod("public B(int a, boolean boo, String fooString, StringBuffer buf, char a, double c) {super();}\n", null, true, null);
-		fClassB.createMethod("public B(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d) {super();}\n", null, true, null);
-		fClassB.createMethod("public B(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString) {super();}\n", null, true, null);
-
-		ICompilationUnit cuC= fPackage.getCompilationUnit("C.java");
-		fClassC= cuC.createType("public class C extends B{\n}\n", null, true, null);		
-		fClassC.createMethod("public C(int a, boolean boo, String fooString, StringBuffer buf, char a) {super();}\n", null, true, null);
-		fClassC.createMethod("public C(int a, boolean boo, String fooString, StringBuffer buf, char a, double c) {super();}\n", null, true, null);
-		fClassC.createMethod("public C(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d) {super();}\n", null, true, null);
-		fClassC.createMethod("public C(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString) {super();}\n", null, true, null);
-		fClassC.createMethod("public C(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString, int xxx) {super();}\n", null, true, null);
-		
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends C {\n}\n", null, true, null);
-	
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] { "C", "C", "C", "C", "C" }, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1", "Test1", "Test1", "Test1", "Test1" }, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends C {\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a) {\n");
-		buf.append("        super(a, boo, fooString, buf, a);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param c\n");
-		buf.append("     * @param d\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c, d);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param c\n");
-		buf.append("     * @param d\n");
-		buf.append("     * @param secondString\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c, d, secondString);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param c\n");
-		buf.append("     * @param d\n");
-		buf.append("     * @param secondString\n");
-		buf.append("     * @param xxx\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf, char a, double c, float d, String secondString, int xxx) {\n");
-		buf.append("        super(a, boo, fooString, buf, a, c, d, secondString, xxx);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}
-
-	/*
-	 * nothing found with default constructor
-	 */
-	public void testNoConstructorsToOverrideWithOneExistingConstructors() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cuA= fPackage.getCompilationUnit("A.java");
-		fClassA= cuA.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-	
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-		testClass.createMethod("public Test1() {\nsuper();}\n", null, true, null);
-
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] {}, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1"}, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("public Test1() {\n");
-		buf.append("super();}\n");
-		buf.append("}\n");
-
-		
-		compareSource(buf.toString(), testClass.getSource());
-	}
-
-
-	/*
-	 * nothing found with 3 constructors
-	 */
-	public void testNoConstructorsToOverrideWithThreeExistingConstructors() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cuA= fPackage.getCompilationUnit("A.java");
-		fClassA= cuA.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		fClassA.createMethod("public A(int a) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-		testClass.createMethod("public Test1() {\nsuper();}\n", null, true, null);
-		testClass.createMethod("public Test1(int a) {super();}\n", null, true, null);
-		testClass.createMethod("public Test1(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] {}, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] existingMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1", "Test1", "Test1"}, existingMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("public Test1() {\n");
-		buf.append("super();}\n");
-		buf.append("public Test1(int a) {super();}\n");
-		buf.append("public Test1(int a, boolean boo, String fooString) {super();}\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}
-
-	/*
-	 * found 2 with 5 constructors, 3 already overriden
-	 */
-	public void testTwoConstructorsToOverrideWithThreeExistingConstructors() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cuA= fPackage.getCompilationUnit("A.java");
-		fClassA= cuA.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		fClassA.createMethod("public A(int a) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, int bologna) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf) {super();}\n", null, true, null);
-
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-		testClass.createMethod("public Test1(int a, boolean boo, String fooString, StringBuffer buf) {\nsuper();}\n", null, true, null);
-		testClass.createMethod("public Test1(int a) {super();}\n", null, true, null);
-		testClass.createMethod("public Test1(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] {"A", "A"}, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		fSettings.createComments= false;
-		op.setOmitSuper(false);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1", "Test1", "Test1", "Test1", "Test1" }, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-
-		checkDefaultConstructorNoCommentWithSuper(createdMethods[3].getSource());
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("public Test1(int a, boolean boo, String fooString, StringBuffer buf) {\n");
-		buf.append("super();}\n");
-		buf.append("public Test1(int a) {super();}\n");
-		buf.append("public Test1(int a, boolean boo, String fooString) {super();}\n");
-		buf.append("    public Test1() {\n");
-		buf.append("        super();\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, int bologna) {\n");
-		buf.append("        super(a, boo, fooString, bologna);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-
-
-
-		compareSource(buf.toString(), testClass.getSource());
-	}
-
-	/*
-	 * found 4 with 5 constructors, 1 already overriden
-	 */
-	public void testFourConstructorsToOverrideWithOneExistingConstructor() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cuA= fPackage.getCompilationUnit("A.java");
-		fClassA= cuA.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A() {\nsuper();}\n", null, true, null);
-		fClassA.createMethod("public A(int a) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, int bologna) {super();}\n", null, true, null);
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf) {super();}\n", null, true, null);
-
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-		testClass.createMethod("public Test1(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] {"A", "A", "A", "A"}, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		checkMethods(new String[] {"Test1", "Test1", "Test1", "Test1", "Test1" }, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("public Test1(int a, boolean boo, String fooString) {super();}\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * \n");
-		buf.append("     */\n");
-		buf.append("    public Test1() {\n");
-		buf.append("\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a) {\n");
-		buf.append("        super(a);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param bologna\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, int bologna) {\n");
-		buf.append("        super(a, boo, fooString, bologna);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf) {\n");
-		buf.append("        super(a, boo, fooString, buf);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-
-		compareSource(buf.toString(), testClass.getSource());
-	}
-
-	/*
-	 * found one with constructor which isn't default or the same as existing
-	 */
-	public void testOneConstructorToOverrideNotDefault() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cuA= fPackage.getCompilationUnit("A.java");
-		fClassA= cuA.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A(int a, boolean boo, String fooString, StringBuffer buf) {super();}\n", null, true, null);
-
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-		testClass.createMethod("public Test1(int a, boolean boo, String fooString) {super();}\n", null, true, null);
-		
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] {"A"}, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		
-		checkMethods(new String[] {"Test1", "Test1"}, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class Test1 extends A {\n");
-		buf.append("public Test1(int a, boolean boo, String fooString) {super();}\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param boo\n");
-		buf.append("     * @param fooString\n");
-		buf.append("     * @param buf\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(int a, boolean boo, String fooString, StringBuffer buf) {\n");
-		buf.append("        super(a, boo, fooString, buf);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-
-
-		compareSource(buf.toString(), testClass.getSource());
-	}
-
-	/*
-	 * found one with constructor needs import statement
-	 */
-	public void testOneConstructorWithImportStatement() throws Exception {	
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util.bogus", true, null);
-		
-		ICompilationUnit cuA= fPackage.getCompilationUnit("A.java");
-		fClassA= cuA.createType("public class A {\n}\n", null, true, null);		
-		fClassA.createMethod("public A(java.util.Vector v, int a) {super();}\n", null, true, null);
-
-		ICompilationUnit cu2= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu2.createType("public class Test1 extends A {\n}\n", null, true, null);
-		
-		IMethod[] constructorMethods= StubUtility.getOverridableConstructors(testClass);
-		
-		checkMethods(new String[] {"A"}, constructorMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-		
-		AddUnimplementedConstructorsOperation op= new AddUnimplementedConstructorsOperation(testClass, fSettings, constructorMethods, true, null);
-		
-		op.setOmitSuper(true);
-		op.setVisibility(Modifier.PUBLIC);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] createdMethods= testClass.getMethods();
-		String fullSource= testClass.getCompilationUnit().getSource();
-		
-		checkMethods(new String[] {"Test1"}, createdMethods);	 //$NON-NLS-1$ //$NON-NLS-2$
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("package ibm.util.bogus;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class Test1 extends A {\n");
-		buf.append("    /** Constructor Comment\n");
-		buf.append("     * @param v\n");
-		buf.append("     * @param a\n");
-		buf.append("     */\n");
-		buf.append("    public Test1(Vector v, int a) {\n");
-		buf.append("        super(v, a);\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		if (fOldFormatter) buf.append("\n");
-		buf.append("}\n");
-
-
-		compareSource(buf.toString(), fullSource);
-	}
-	
-	private void checkMethods(String[] expected, IMethod[] methods) {
-		int nMethods= methods.length;
-		int nExpected= expected.length;
-		assertTrue("" + nExpected + " methods expected, is " + nMethods, nMethods == nExpected);
-		for (int i= 0; i < nExpected; i++) {
-			String methName= expected[i];
-			assertTrue("method " + methName + " expected", nameContained(methName, methods));
-		}
-	}			
-		
-	private boolean nameContained(String methName, IJavaElement[] methods) {
-		for (int i= 0; i < methods.length; i++) {
-			if (methods[i].getElementName().equals(methName)) {
-				return true;
-			}
-		}
-		return false;
-	}			
-	
-	private void checkDefaultConstructorNoCommentNoSuper(String con) throws IOException {
-		StringBuffer buf= new StringBuffer();
-		buf.append("public Test1() {\n");
-		buf.append("\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		compareSource(buf.toString(), con);
-	}
-	
-	private void checkDefaultConstructorWithCommentNoSuper(String con) throws IOException {
-		StringBuffer buf= new StringBuffer();
-		buf.append("/** Constructor Comment\n");
-		buf.append("     * \n");
-		buf.append("     */\n");
-		buf.append("    public Test1() {\n");
-		buf.append("\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		compareSource(buf.toString(), con);
-	}
-	
-	private void checkDefaultConstructorNoCommentWithSuper(String con) throws IOException {
-		StringBuffer buf= new StringBuffer();
-		buf.append("public Test1() {\n");
-		buf.append("        super();\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		String constructor= buf.toString();
-		compareSource(constructor, con);
-	}
-	
-	private void checkDefaultConstructorWithCommentWithSuper(String con) throws IOException {
-		StringBuffer buf= new StringBuffer();
-		buf.append("/** Constructor Comment\n");
-		buf.append("     * \n");
-		buf.append("     */\n");
-		buf.append("    public Test1() {\n");
-		buf.append("        super();\n");
-		buf.append("        // TODO\n");
-		buf.append("    }\n");
-		String constructor= buf.toString();
-		compareSource(constructor, con);
-	}
-
-	private void compareSource(String expected, String actual) throws IOException {
-		assertEqualStringIgnoreDelim(actual, expected);
-	}
-	/*
-	private String writeSource(String str) {
-		StringBuffer buf= new StringBuffer();
-		buf.append("\t\tStringBuffer buf= new StringBuffer();\n");
-		
-		String[] lines= Strings.convertIntoLines(str);
-		for (int i= 0; i < lines.length; i++) {
-			buf.append("\t\tbuf.append(\"").append(lines[i]).append("\\n\");\n");
-		}
-		return buf.toString();
-	}*/
-	
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddUnimplementedMethodsTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddUnimplementedMethodsTest.java
deleted file mode 100644
index 0dafc82..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddUnimplementedMethodsTest.java
+++ /dev/null

@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.internal.corext.codemanipulation.AddUnimplementedMethodsOperation;
-import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility;
-import org.eclipse.jdt.internal.corext.util.JdtFlags;
-
-public class AddUnimplementedMethodsTest extends TestCase {
-	
-	private static final Class THIS= AddUnimplementedMethodsTest.class;
-	
-	private IJavaProject fJavaProject;
-	private IPackageFragment fPackage;
-	private IType fClassA, fInterfaceB, fClassC, fClassD, fInterfaceE;
-
-
-	public AddUnimplementedMethodsTest(String name) {
-		super(name);
-	}
-		
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new AddUnimplementedMethodsTest("test1"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-	
-	/**
-	 * Creates a new test Java project.
-	 */	
-	protected void setUp() throws Exception {
-		fJavaProject= JavaProjectHelper.createJavaProject("DummyProject", "bin");
-		assertNotNull(JavaProjectHelper.addRTJar(fJavaProject));
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		fPackage= root.createPackageFragment("ibm.util", true, null);
-		
-		ICompilationUnit cu= fPackage.getCompilationUnit("A.java");
-		fClassA= cu.createType("public abstract class A {\n}\n", null, true, null);
-		fClassA.createMethod("public abstract void a();\n", null, true, null);
-		fClassA.createMethod("public abstract void b(java.util.Vector v);\n", null, true, null);
-		
-		cu= fPackage.getCompilationUnit("B.java");
-		fInterfaceB= cu.createType("public interface B {\n}\n", null, true, null);
-		fInterfaceB.createMethod("void c(java.util.Hashtable h);\n", null, true, null);
-		
-		cu= fPackage.getCompilationUnit("C.java");
-		fClassC= cu.createType("public abstract class C {\n}\n", null, true, null);
-		fClassC.createMethod("public void c(java.util.Hashtable h) {\n}\n", null, true, null);
-		fClassC.createMethod("public abstract java.util.Enumeration d(java.util.Hashtable h) {\n}\n", null, true, null);
-
-
-		cu= fPackage.getCompilationUnit("D.java");
-		fClassD= cu.createType("public abstract class D extends C {\n}\n", null, true, null);
-		fClassD.createMethod("public abstract void c(java.util.Hashtable h);\n", null, true, null);
-		
-		cu= fPackage.getCompilationUnit("E.java");
-		fInterfaceE= cu.createType("public interface E {\n}\n", null, true, null);
-		fInterfaceE.createMethod("void c(java.util.Hashtable h);\n", null, true, null);
-		fInterfaceE.createMethod("void e() throws java.util.NoSuchElementException;\n", null, true, null);	
-	}
-
-
-	/**
-	 * Removes the test java project.
-	 */
-	protected void tearDown () throws Exception {
-		JavaProjectHelper.delete(fJavaProject);
-		fJavaProject= null;
-		fPackage= null;
-		fClassA= null;
-		fInterfaceB= null;
-		fClassC= null;
-		fClassD= null;
-		fInterfaceE= null;
-	}
-	
-	private IMethod[] getSelected(IType type) throws JavaModelException {
-		IMethod[] inheritedMethods= StubUtility.getOverridableMethods(type, type.newSupertypeHierarchy(null), false);
-		
-		ArrayList toImplement= new ArrayList();
-		for (int i= 0; i < inheritedMethods.length; i++) {
-			IMethod curr= inheritedMethods[i];
-			if (JdtFlags.isAbstract(curr)) {
-				toImplement.add(curr);
-			}
-		}
-		return (IMethod[]) toImplement.toArray(new IMethod[toImplement.size()]);
-	}
-	
-				
-	/*
-	 * basic test: extend an abstract class and an interface
-	 */
-	public void test1() throws Exception {	
-		ICompilationUnit cu= fPackage.getCompilationUnit("Test1.java");
-		IType testClass= cu.createType("public class Test1 extends A implements B {\n}\n", null, true, null);
-	
-		AddUnimplementedMethodsOperation op= new AddUnimplementedMethodsOperation(testClass, new CodeGenerationSettings(), getSelected(testClass), true, null);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] methods= testClass.getMethods();
-		checkMethods(new String[] { "a", "b", "c" }, methods);
-		
-		IImportDeclaration[] imports= cu.getImports();
-		checkImports(new String[] { "java.util.Hashtable", "java.util.Vector" }, imports);	
-	}	
-	
-	/*
-	 * method c() of interface B is already implemented by class C
-	 */
-	public void test2() throws Exception {
-			
-		ICompilationUnit cu= fPackage.getCompilationUnit("Test2.java");
-		IType testClass= cu.createType("public class Test2 extends C implements B {\n}\n", null, true, null);
-		
-		AddUnimplementedMethodsOperation op= new AddUnimplementedMethodsOperation(testClass, new CodeGenerationSettings(), getSelected(testClass), true, null);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] methods= testClass.getMethods();
-		checkMethods(new String[] { "d" }, methods);
-		
-		IImportDeclaration[] imports= cu.getImports();
-		checkImports(new String[] { "java.util.Enumeration", "java.util.Hashtable" }, imports);
-	}	
-
-
-	/*
-	 * method c() is implemented in C but made abstract again in class D
-	 */
-	public void test3() throws Exception {
-		ICompilationUnit cu= fPackage.getCompilationUnit("Test3.java");
-		IType testClass= cu.createType("public class Test3 extends D {\n}\n", null, true, null);
-		
-		AddUnimplementedMethodsOperation op= new AddUnimplementedMethodsOperation(testClass, new CodeGenerationSettings(), getSelected(testClass), true, null);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] methods= testClass.getMethods();
-		checkMethods(new String[] { "c", "d" }, methods);
-		
-		IImportDeclaration[] imports= cu.getImports();
-		checkImports(new String[] { "java.util.Hashtable", "java.util.Enumeration" }, imports);
-		
-	}
-	
-	/*
-	 * method c() defined in both interfaces B and E
-	 */
-	public void test4() throws Exception {
-		ICompilationUnit cu= fPackage.getCompilationUnit("Test4.java");
-		IType testClass= cu.createType("public class Test4 implements B, E {\n}\n", null, true, null);
-		
-		AddUnimplementedMethodsOperation op= new AddUnimplementedMethodsOperation(testClass, new CodeGenerationSettings(), getSelected(testClass), true, null);
-		op.run(new NullProgressMonitor());
-		
-		IMethod[] methods= testClass.getMethods();
-		checkMethods(new String[] { "c", "e" }, methods);
-		
-		IImportDeclaration[] imports= cu.getImports();
-		checkImports(new String[] { "java.util.Hashtable", "java.util.NoSuchElementException" }, imports);
-	}
-	
-	private void checkMethods(String[] expected, IMethod[] methods) {
-		int nMethods= methods.length;
-		int nExpected= expected.length;
-		assertTrue("" + nExpected + " methods expected, is " + nMethods, nMethods == nExpected);
-		for (int i= 0; i < nExpected; i++) {
-			String methName= expected[i];
-			assertTrue("method " + methName + " expected", nameContained(methName, methods));
-		}
-	}			
-	
-	private void checkImports(String[] expected, IImportDeclaration[] imports) {
-		int nImports= imports.length;
-		int nExpected= expected.length;
-		assertTrue("" + nExpected + " imports expected, is " + nImports, nImports == nExpected);
-		for (int i= 0; i < nExpected; i++) {
-			String impName= expected[i];
-			assertTrue("import " + impName + " expected", nameContained(impName, imports));
-		}
-	}
-
-
-	private boolean nameContained(String methName, IJavaElement[] methods) {
-		for (int i= 0; i < methods.length; i++) {
-			if (methods[i].getElementName().equals(methName)) {
-				return true;
-			}
-		}
-		return false;
-	}	
-
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AllTypesCacheTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AllTypesCacheTest.java
deleted file mode 100644
index 833bbf2..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AllTypesCacheTest.java
+++ /dev/null

@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-import org.eclipse.jdt.ui.JavaUI;
-
-import org.eclipse.jdt.internal.corext.util.AllTypesCache;
-import org.eclipse.jdt.internal.corext.util.TypeInfo;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-
-
-public class AllTypesCacheTest extends TestCase {
-	
-	private static final Class THIS= AllTypesCacheTest.class;
-	
-	private IJavaProject fJProject1;
-	private IJavaProject fJProject2;
-	
-	private IPackageFragmentRoot fLibrary;
-	private IPackageFragmentRoot fSourceFolder;
-
-	private boolean fWasAutobuild;
-	
-	public AllTypesCacheTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (false) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new AllTypesCacheTest("testOpenCloseProject"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-
-	protected void setUp() throws Exception {
-		fWasAutobuild= JavaProjectHelper.setAutoBuilding(false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-		
-		File lib= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-		assertTrue("lib does not exist",  lib != null && lib.exists());
-		fLibrary= JavaProjectHelper.addLibrary(fJProject1, new Path(lib.getPath())); // add library to proj1
-		
-		
-		fJProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");
-		assertNotNull("jre is null", JavaProjectHelper.addRTJar(fJProject2));
-		
-		// add Junit source to project 2
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("Junit source", junitSrcArchive != null && junitSrcArchive.exists());
-
-		fSourceFolder= JavaProjectHelper.addSourceContainerWithImport(fJProject2, "src", junitSrcArchive);
-		
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-		JavaProjectHelper.delete(fJProject2);		
-		JavaProjectHelper.setAutoBuilding(fWasAutobuild);
-	}
-
-	public void testDifferentScopes() throws Exception {
-		IJavaSearchScope workspaceScope= SearchEngine.createWorkspaceScope();
-		IJavaSearchScope proj1Scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { fJProject1 });
-		IJavaSearchScope proj2Scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { fJProject2 });
-		
-		ArrayList res1= new ArrayList();
-		
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-		assertTrue("542 types in workspace expected, is " + res1.size(), res1.size() == 542);
-		
-		int nFlushes= AllTypesCache.getNumberOfCacheFlushes();
-		
-		res1.clear();		
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.INTERFACE, null, res1);
-		assertTrue("73 interfaces in workspace expected, is " + res1.size(), res1.size() == 73);
-		
-		assertTrue("unnecessary flush of cache", AllTypesCache.getNumberOfCacheFlushes() == nFlushes);	
-		
-		res1.clear();
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.CLASS, null, res1);
-		assertTrue("469 classes in workspace expected, is " + res1.size(), res1.size() == 469);
-		
-		assertTrue("unnecessary flush of cache", AllTypesCache.getNumberOfCacheFlushes() == nFlushes);
-		
-		res1.clear();
-		AllTypesCache.getTypes(proj1Scope, IJavaSearchConstants.TYPE, null, res1);
-		assertTrue("471 types in proj1 expected, is " + res1.size(), res1.size() == 471);
-		
-		assertTrue("unnecessary flush of cache", AllTypesCache.getNumberOfCacheFlushes() == nFlushes);
-		
-		res1.clear();		
-		AllTypesCache.getTypes(proj1Scope, IJavaSearchConstants.INTERFACE, null, res1);
-		assertTrue("65 interfaces in proj1 expected, is " + res1.size(), res1.size() == 65);
-		
-		assertTrue("unnecessary flush of cache", AllTypesCache.getNumberOfCacheFlushes() == nFlushes);
-		
-		res1.clear();
-		AllTypesCache.getTypes(proj1Scope, IJavaSearchConstants.CLASS, null, res1);
-		assertTrue("406 classes in proj1 expected, is " + res1.size(), res1.size() == 406);
-		
-		assertTrue("unnecessary flush of cache", AllTypesCache.getNumberOfCacheFlushes() == nFlushes);
-		
-		res1.clear();
-		AllTypesCache.getTypes(proj2Scope, IJavaSearchConstants.TYPE, null, res1);
-		assertTrue("539 types in proj2 expected, is " + res1.size(), res1.size() == 539);
-		
-		assertTrue("unnecessary flush of cache", AllTypesCache.getNumberOfCacheFlushes() == nFlushes);
-		
-		res1.clear();		
-		AllTypesCache.getTypes(proj2Scope, IJavaSearchConstants.INTERFACE, null, res1);
-		assertTrue("73 interfaces in proj2 expected, is " + res1.size(), res1.size() == 73);
-		
-		assertTrue("unnecessary flush of cache", AllTypesCache.getNumberOfCacheFlushes() == nFlushes);
-		
-		res1.clear();
-		AllTypesCache.getTypes(proj2Scope, IJavaSearchConstants.CLASS, null, res1);
-		assertTrue("466 classes in proj2 expected, is " + res1.size(), res1.size() == 466);
-		
-		assertTrue("unnecessary flush of cache", AllTypesCache.getNumberOfCacheFlushes() == nFlushes);
-	}
-	
-	public void testClasspathChange() throws Exception {	
-		IJavaSearchScope workspaceScope= SearchEngine.createWorkspaceScope();
-		
-		ArrayList res1= new ArrayList();
-		
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-		assertNotNull("mylib.Foo not found", findTypeRef(res1, "mylib.Foo"));
-		assertTrue("542 types expected, is " + res1.size(), res1.size() == 542);
-		
-		int nFlushes= AllTypesCache.getNumberOfCacheFlushes();
-		
-		JavaProjectHelper.removeFromClasspath(fJProject1, fLibrary.getPath());	
-		assertTrue("cache not flushed", nFlushes != AllTypesCache.getNumberOfCacheFlushes());
-		
-		res1.clear();
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-		assertNull("mylib.Foo still found", findTypeRef(res1, "mylib.Foo"));
-		assertTrue("539 types in workspace expected, is " + res1.size(), res1.size() == 539);
-	}
-	
-	public void testNewElementCreation() throws Exception {
-		IJavaSearchScope workspaceScope= SearchEngine.createWorkspaceScope();
-	
-		ArrayList res1= new ArrayList();
-		
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-		assertTrue("542 types expected, is " + res1.size(), res1.size() == 542);
-		
-		// add type
-		int nFlushes= AllTypesCache.getNumberOfCacheFlushes();
-		IPackageFragment pack= fSourceFolder.getPackageFragment("");
-		ICompilationUnit newCU= pack.getCompilationUnit("A.java");
-		IType type= newCU.createType("public class A {\n}\n", null, true, null);
-		assertTrue("cache not flushed after adding type", nFlushes != AllTypesCache.getNumberOfCacheFlushes());		
-		res1.clear();
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-		assertNotNull("A not found", findTypeRef(res1, "A"));
-		assertTrue("543 types in workspace expected, is " + res1.size(), res1.size() == 543);
-		
-		
-		// create a field: should not flush cache
-		nFlushes= AllTypesCache.getNumberOfCacheFlushes();
-		type.createField("public int fCount;", null, true, null);
-		assertTrue("cache was flushed", nFlushes == AllTypesCache.getNumberOfCacheFlushes());
-		res1.clear();
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);		
-		assertTrue("still 543 types in workspace expected, is " + res1.size(), res1.size() == 543);
-		
-
-		// create an inner type: should flush cache
-		nFlushes= AllTypesCache.getNumberOfCacheFlushes();
-		type.createType("public class AInner {}", null, true, null);
-		res1.clear();
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);		
-		assertTrue("cache not flushed after inner type creation", nFlushes != AllTypesCache.getNumberOfCacheFlushes());
-		assertNotNull("AInner not found", findTypeRef(res1, "A.AInner"));
-		assertTrue("still 544 types in workspace expected, is " + res1.size(), res1.size() == 544);
-	}
-	
-	public void testWorkingCopies() throws Exception {
-		// change a type in the editor and save
-		
-		IJavaSearchScope workspaceScope= SearchEngine.createWorkspaceScope();
-		
-		ArrayList res1= new ArrayList();
-		
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-		TypeInfo ref= findTypeRef(res1, "junit.framework.TestCase");
-		assertNotNull("TestCase not found", ref);
-		assertTrue("542 types expected, is " + res1.size(), res1.size() == 542);
-		
-		int nFlushes= AllTypesCache.getNumberOfCacheFlushes();
-		
-		IType type= fJProject2.findType("junit.framework.TestCase");
-		assertNotNull("TestCase not found", type);
-		
-		IEditorPart part= EditorUtility.openInEditor(type);
-		try {
-			IDocument document= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			ISourceRange range= type.getNameRange();
-			document.replace(range.getOffset(), range.getLength(), "A");
-			
-			part.doSave(null);
-			
-			res1.clear();
-			AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-			assertNotNull("A not found", findTypeRef(res1, "junit.framework.A"));
-			TypeInfo ref2= findTypeRef(res1, "junit.framework.TestCase");
-			assertNull("TestCase still found", ref2);
-			
-			assertTrue("542 types in workspace expected, is " + res1.size(), res1.size() == 542);
-			
-			assertTrue("cache not flushed", nFlushes != AllTypesCache.getNumberOfCacheFlushes());
-		} finally {
-			JavaPlugin.getActivePage().closeAllEditors(false);
-		}
-	
-	}
-	
-	public void testWorkingCopies2() throws Exception {
-		// change a type in the editor and do not save
-		
-		IJavaSearchScope workspaceScope= SearchEngine.createWorkspaceScope();
-		
-		ArrayList res1= new ArrayList();
-		
-		AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-		assertNotNull("TestCase not found", findTypeRef(res1, "junit.framework.TestCase"));
-		assertTrue("542 types expected, is " + res1.size(), res1.size() == 542);
-		
-		int nFlushes= AllTypesCache.getNumberOfCacheFlushes();
-		
-		IType type= fJProject2.findType("junit.framework.TestCase");
-		assertNotNull("TestCase not found", type);
-		
-		IEditorPart part= EditorUtility.openInEditor(type);
-		try {
-			IDocument document= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			ISourceRange range= type.getNameRange();
-			document.replace(range.getOffset(), range.getLength(), "A");
-			
-			res1.clear();
-			AllTypesCache.getTypes(workspaceScope, IJavaSearchConstants.TYPE, null, res1);
-			assertNotNull("A not found", findTypeRef(res1, "junit.framework.A"));
-			assertNull("TestCase still found", findTypeRef(res1, "junit.framework.TestCase"));
-			
-			assertTrue("542 types in workspace expected, is " + res1.size(), res1.size() == 542);
-			
-			assertTrue("cache not flushed", nFlushes != AllTypesCache.getNumberOfCacheFlushes());
-		} finally {
-			JavaPlugin.getActivePage().closeAllEditors(false);
-		}
-	
-	}
-	
-	public void testOpenCloseProject() throws Exception {
-		TypeInfo[] result= AllTypesCache.getTypesForName("TestCase", SearchEngine.createWorkspaceScope(), null);
-		assertTrue("TestCase found", result.length == 1 && 
-				   "junit.framework.TestCase".equals(result[0].getFullyQualifiedName()));
-		
-		fJProject2.getProject().close(null);
-		result= AllTypesCache.getTypesForName("TestCase", SearchEngine.createWorkspaceScope(), null);
-		assertTrue("TestCase not found", result.length == 0);
-		
-		fJProject2.getProject().open(null);
-		result= AllTypesCache.getTypesForName("TestCase", SearchEngine.createWorkspaceScope(), null);
-		assertTrue("TestCase found", result.length == 1 && 
-				   "junit.framework.TestCase".equals(result[0].getFullyQualifiedName()));
-	}
-	
-	private TypeInfo findTypeRef(List refs, String fullname) {
-		for (int i= 0; i <refs.size(); i++) {
-			TypeInfo curr= (TypeInfo) refs.get(i);
-			if (fullname.equals(curr.getFullyQualifiedName())) {
-				return curr;
-			}
-		}
-		return null;
-	}
-		
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/BindingsNameTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/BindingsNameTest.java
deleted file mode 100644
index e34d62c..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/BindingsNameTest.java
+++ /dev/null

@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.Hashtable;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.IProblem;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-
-import org.eclipse.jdt.internal.corext.dom.Bindings;
-
-/**
-  */
-public class BindingsNameTest extends TestCase {
-
-	private static final Class THIS= BindingsNameTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-	private ICompilationUnit fCompilationUnit;
-	
-	private String fComplianceLevel;
-
-	public BindingsNameTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new BindingsNameTest("testFullyQualifiedNames"));
-			return suite;
-		}
-	}
-	protected void setUp() throws Exception {
-		Hashtable  options= JavaCore.getOptions();
-		fComplianceLevel= (String)options.get(JavaCore.COMPILER_COMPLIANCE);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "1.3");
-		JavaCore.setOptions(options);
-		
-		
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		assertTrue("rt not found", JavaProjectHelper.addRTJar(fJProject1) != null);
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack0= fSourceFolder.createPackageFragment("", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class X {\n");
-		buf.append("}\n");
-		pack0.createCompilationUnit("X.java", buf.toString(), false, null);		
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("import X;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public class Inner {\n");
-		buf.append("        public class InnerInner {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("    public void goo(int i, int[] j, Object o, Object[] p, Inner.InnerInner x, Inner.InnerInner[][] y, X a, X[][][] b) {\n");
-		buf.append("    }\n");			
-		buf.append("}\n");
-		fCompilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-	}
-
-
-	protected void tearDown() throws Exception {
-		Hashtable  options= JavaCore.getOptions();
-		options.put(JavaCore.COMPILER_COMPLIANCE, fComplianceLevel);
-		JavaCore.setOptions(options);
-		
-		JavaProjectHelper.delete(fJProject1);
-	}
-	
-	public void testGetFullyQualifiedName() throws Exception {
-		CompilationUnit astRoot= createAST(fCompilationUnit);
-		IProblem[] problems= astRoot.getProblems();
-		assertTrue(problems.length == 0);
-		
-		TypeDeclaration typeDeclaration= (TypeDeclaration) astRoot.types().get(0);
-		MethodDeclaration methodDeclaration= typeDeclaration.getMethods()[0];
-		
-		List params= methodDeclaration.parameters();
-		String[] fullNames= new String[params.size()];
-		
-		for (int i= 0; i < params.size(); i++) {
-			SingleVariableDeclaration elem= (SingleVariableDeclaration) params.get(i);
-			IVariableBinding varBinding= elem.resolveBinding();
-			fullNames[i]= Bindings.getFullyQualifiedName(varBinding.getType());
-		}
-		
-		assertEquals("int", fullNames[0]);
-		assertEquals("int[]", fullNames[1]);
-		assertEquals("java.lang.Object", fullNames[2]);
-		assertEquals("java.lang.Object[]", fullNames[3]);
-		assertEquals("test1.ae.E.Inner.InnerInner", fullNames[4]);
-		assertEquals("test1.ae.E.Inner.InnerInner[][]", fullNames[5]);
-		assertEquals("X", fullNames[6]);
-		assertEquals("X[][][]", fullNames[7]);		
-	}
-	
-	public void testGetTypeQualifiedName() throws Exception {
-		CompilationUnit astRoot= createAST(fCompilationUnit);
-		IProblem[] problems= astRoot.getProblems();
-		assertTrue(problems.length == 0);
-		
-		TypeDeclaration typeDeclaration= (TypeDeclaration) astRoot.types().get(0);
-		MethodDeclaration methodDeclaration= typeDeclaration.getMethods()[0];
-		
-		List params= methodDeclaration.parameters();
-		String[] fullNames= new String[params.size()];
-		
-		for (int i= 0; i < params.size(); i++) {
-			SingleVariableDeclaration elem= (SingleVariableDeclaration) params.get(i);
-			IVariableBinding varBinding= elem.resolveBinding();
-			fullNames[i]= Bindings.getTypeQualifiedName(varBinding.getType());
-		}
-		
-		assertEquals("int", fullNames[0]);
-		assertEquals("int[]", fullNames[1]);
-		assertEquals("Object", fullNames[2]);
-		assertEquals("Object[]", fullNames[3]);
-		assertEquals("E.Inner.InnerInner", fullNames[4]);
-		assertEquals("E.Inner.InnerInner[][]", fullNames[5]);
-		assertEquals("X", fullNames[6]);
-		assertEquals("X[][][]", fullNames[7]);
-	}
-	
-	public void testGetAllNameComponents() throws Exception {
-		CompilationUnit astRoot= createAST(fCompilationUnit);
-		IProblem[] problems= astRoot.getProblems();
-		assertTrue(problems.length == 0);
-		
-		TypeDeclaration typeDeclaration= (TypeDeclaration) astRoot.types().get(0);
-		MethodDeclaration methodDeclaration= typeDeclaration.getMethods()[0];
-		
-		List params= methodDeclaration.parameters();
-		String[][] fullNames= new String[params.size()][];
-		
-		for (int i= 0; i < params.size(); i++) {
-			SingleVariableDeclaration elem= (SingleVariableDeclaration) params.get(i);
-			IVariableBinding varBinding= elem.resolveBinding();
-			fullNames[i]= Bindings.getAllNameComponents(varBinding.getType());
-		}
-		
-		assertEqualArray(new String[] { "int" }, fullNames[0]);
-		assertEqualArray(new String[] { "int[]" }, fullNames[1]);
-		assertEqualArray(new String[] { "java", "lang", "Object" }, fullNames[2]);
-		assertEqualArray(new String[] { "java", "lang", "Object[]" }, fullNames[3]);
-		assertEqualArray(new String[] { "test1", "ae", "E", "Inner", "InnerInner" }, fullNames[4]);
-		assertEqualArray(new String[] { "test1", "ae", "E", "Inner", "InnerInner[][]" }, fullNames[5]);
-		assertEqualArray(new String[] { "X" }, fullNames[6]);
-		assertEqualArray(new String[] { "X[][][]" }, fullNames[7]);		
-	}
-	
-	public void testGetNameComponents() throws Exception {
-		CompilationUnit astRoot= createAST(fCompilationUnit);
-		IProblem[] problems= astRoot.getProblems();
-		assertTrue(problems.length == 0);
-		
-		TypeDeclaration typeDeclaration= (TypeDeclaration) astRoot.types().get(0);
-		MethodDeclaration methodDeclaration= typeDeclaration.getMethods()[0];
-		
-		List params= methodDeclaration.parameters();
-		String[][] fullNames= new String[params.size()][];
-		
-		for (int i= 0; i < params.size(); i++) {
-			SingleVariableDeclaration elem= (SingleVariableDeclaration) params.get(i);
-			IVariableBinding varBinding= elem.resolveBinding();
-			fullNames[i]= Bindings.getNameComponents(varBinding.getType());
-		}
-		
-		assertEqualArray(new String[] { "int" }, fullNames[0]);
-		assertEqualArray(new String[] { "int[]" }, fullNames[1]);
-		assertEqualArray(new String[] { "Object" }, fullNames[2]);
-		assertEqualArray(new String[] { "Object[]" }, fullNames[3]);
-		assertEqualArray(new String[] { "E", "Inner", "InnerInner" }, fullNames[4]);
-		assertEqualArray(new String[] { "E", "Inner", "InnerInner[][]" }, fullNames[5]);
-		assertEqualArray(new String[] { "X" }, fullNames[6]);
-		assertEqualArray(new String[] { "X[][][]" }, fullNames[7]);	
-	}
-	
-	private void assertEqualArray(Object[] elements, Object[] list) {
-		assertEquals("different length", list.length, elements.length);
-		for (int i= 0; i < list.length; i++) {
-			assertEquals(elements[i], list[i]);
-		}
-	}
-	
-	private CompilationUnit createAST(ICompilationUnit compilationUnit) {
-		ASTParser parser= ASTParser.newParser(AST.JLS3);
-		parser.setSource(compilationUnit);
-		parser.setResolveBindings(true);
-		return (CompilationUnit) parser.createAST(null);
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CallHierarchyTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CallHierarchyTest.java
deleted file mode 100644
index de25d1c..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CallHierarchyTest.java
+++ /dev/null

@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *   Jesper Kamstrup Linnet (eclipse@kamstrup-linnet.dk) - initial API and implementation
- *             (report 36180: Callers/Callees view)
- ******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jdt.core.IInitializer;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jdt.internal.corext.callhierarchy.CallHierarchy;
-import org.eclipse.jdt.internal.corext.callhierarchy.MethodWrapper;
-
-import org.eclipse.jdt.ui.tests.callhierarchy.CallHierarchyTestHelper;
-
-public class CallHierarchyTest extends TestCase {
-    private static final String[] EMPTY= new String[0];
-    private static final Class THIS= CallHierarchyTest.class;
-
-    private CallHierarchyTestHelper helper;
-    
-    public CallHierarchyTest(String name) {
-        super(name);
-    }
-    
-	public static Test allTests() {
-		return new TestSuite(THIS);
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests(); 
-        } else {
-            TestSuite suite= new TestSuite();
-            suite.addTest(new CallHierarchyTest("test1"));
-
-            return suite;
-        }
-    }
-
-    protected void setUp() throws Exception {
-        helper= new CallHierarchyTestHelper();
-        helper.setUp();
-    }
-
-    protected void tearDown() throws Exception {
-        helper.tearDown();
-        helper= null;
-    }
-
-    public void testCallers() throws Exception {
-        helper.createSimpleClasses();
-
-        IMethod method= helper.getMethod1();
-        IMethod secondLevelMethod= helper.getMethod3();
-
-        Collection expectedMethods= new ArrayList();
-        expectedMethods.add(helper.getMethod2());
-        expectedMethods.add(secondLevelMethod);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCallerRoot(method);
-
-        MethodWrapper[] uncachedCalls= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethods, uncachedCalls);
-
-        MethodWrapper[] cachedCalls= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethods, cachedCalls);
-
-        MethodWrapper wrapper2= helper.findMethodWrapper(secondLevelMethod, cachedCalls);
-
-        Collection expectedSecondLevelMethods= new ArrayList();
-        expectedSecondLevelMethods.add(helper.getMethod4());
-        helper.assertCalls(expectedSecondLevelMethods, wrapper2.getCalls(new NullProgressMonitor()));
-    }
-
-    public void testCallersNoResults() throws Exception {
-        helper.createSimpleClasses();
-
-        IMethod method= helper.getMethod4();
-
-        Collection expectedMethods= new ArrayList();
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCallerRoot(method);
-
-        MethodWrapper[] uncachedCalls= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethods, uncachedCalls);
-
-        MethodWrapper[] cachedCalls= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethods, cachedCalls);
-    }
-
-    public void testCallees() throws Exception {
-        helper.createSimpleClasses();
-
-        IMethod method= helper.getMethod4();
-        IMethod secondLevelMethod= helper.getMethod3();
-
-        Collection expectedMethods= new ArrayList();
-        expectedMethods.add(secondLevelMethod);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(method);
-
-        MethodWrapper[] uncachedCalls= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethods, uncachedCalls);
-
-        MethodWrapper[] cachedCalls= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethods, cachedCalls);
-
-        MethodWrapper wrapper2= helper.findMethodWrapper(secondLevelMethod, cachedCalls);
-
-        Collection expectedMethodsTo3= new ArrayList();
-        expectedMethodsTo3.add(helper.getMethod1());
-        expectedMethodsTo3.add(helper.getMethod2());
-
-        helper.assertCalls(expectedMethodsTo3, wrapper2.getCalls(new NullProgressMonitor()));
-    }
-
-    public void testCalleesNoResults() throws Exception {
-        helper.createSimpleClasses();
-
-        IMethod method= helper.getMethod1();
-
-        Collection expectedMethods= new ArrayList();
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(method);
-
-        MethodWrapper[] uncachedCalls= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethods, uncachedCalls);
-
-        MethodWrapper[] cachedCalls= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethods, cachedCalls);
-    }
-
-    public void testRecursiveCallers() throws Exception {
-        helper.createSimpleClasses();
-
-        IMethod method1= helper.getRecursiveMethod1();
-        IMethod method2= helper.getRecursiveMethod2();
-
-        Collection expectedMethodsTo1= new ArrayList();
-        expectedMethodsTo1.add(method2);
-
-        Collection expectedMethodsTo2= new ArrayList();
-        expectedMethodsTo2.add(method1);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCallerRoot(method1);
-        MethodWrapper[] callsTo1= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callsTo1, false);
-
-        MethodWrapper wrapper2= helper.findMethodWrapper(method2, callsTo1);
-        assertFalse("Should be marked as recursive", wrapper2.isRecursive());
-
-        MethodWrapper[] callsTo2= wrapper2.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethodsTo2, callsTo2);
-
-        assertRecursive(callsTo2, true);
-
-        MethodWrapper method1Wrapper= helper.findMethodWrapper(method1, callsTo2);
-        callsTo1= method1Wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethodsTo1, callsTo1);
-
-        assertRecursive(callsTo1, true);
-    }
-
-    public void testRecursiveCallees() throws Exception {
-        helper.createSimpleClasses();
-
-        IMethod method1= helper.getRecursiveMethod1();
-        IMethod method2= helper.getRecursiveMethod2();
-
-        Collection expectedMethodsFrom1= new ArrayList();
-        expectedMethodsFrom1.add(method2);
-
-        Collection expectedMethodsFrom2= new ArrayList();
-        expectedMethodsFrom2.add(method1);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(method1);
-        MethodWrapper[] callsFrom1= wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethodsFrom1, callsFrom1);
-
-        MethodWrapper wrapper2= helper.findMethodWrapper(method2, callsFrom1);
-        assertRecursive(callsFrom1, false);
-
-        MethodWrapper[] callsFrom2= wrapper2.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethodsFrom2, callsFrom2);
-
-        assertRecursive(callsFrom2, true);
-        
-        MethodWrapper method1Wrapper= helper.findMethodWrapper(method1, callsFrom2);
-        callsFrom1= method1Wrapper.getCalls(new NullProgressMonitor());
-        helper.assertCalls(expectedMethodsFrom1, callsFrom1);
-
-        assertRecursive(callsFrom1, true);
-    }
-
-    /**
-     * Tests calls that origin from an inner class  
-     */
-    public void testInnerClassCallers() throws Exception {
-        helper.createInnerClass();
-        
-        IMethod someMethod= helper.getType1().getMethod("outerMethod1", EMPTY);
-
-        IMethod innerMethod1= helper.getType1().getType("Inner").getMethod("innerMethod1", EMPTY);
-        IMethod innerMethod2= helper.getType1().getType("Inner").getMethod("innerMethod2", EMPTY);
-
-        Collection expectedCallers= new ArrayList();
-        expectedCallers.add(innerMethod1);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCallerRoot(someMethod);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        helper.assertCalls(expectedCallers, callers);
-        
-        Collection expectedCallersSecondLevel= new ArrayList();
-        expectedCallersSecondLevel.add(innerMethod2);
-        MethodWrapper innerMethod1Wrapper= helper.findMethodWrapper(innerMethod1, callers);
-        helper.assertCalls(expectedCallersSecondLevel, innerMethod1Wrapper.getCalls(new NullProgressMonitor()));
-    }
-
-    /**
-     * Tests callees that enter an inner class  
-     */
-    public void testInnerClassCalleesEntering() throws Exception {
-        helper.createInnerClass();
-
-        IMethod someMethod= helper.getType1().getMethod("outerMethod2", EMPTY);
-
-        IMethod innerMethod1= helper.getType1().getType("Inner").getMethod("innerMethod1", EMPTY);
-        IMethod innerMethod2= helper.getType1().getType("Inner").getMethod("innerMethod2", EMPTY);
-
-        Collection expectedCallers= new ArrayList();
-        expectedCallers.add(innerMethod2);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(someMethod);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        helper.assertCalls(expectedCallers, callers);
-        
-        Collection expectedCallersSecondLevel= new ArrayList();
-        expectedCallersSecondLevel.add(innerMethod1);
-        MethodWrapper innerMethod2Wrapper= helper.findMethodWrapper(innerMethod2, callers);
-        helper.assertCalls(expectedCallersSecondLevel, innerMethod2Wrapper.getCalls(new NullProgressMonitor()));
-    }
-
-    /**
-     * Tests callees that exits an inner class  
-     */
-    public void testInnerClassCalleesExiting() throws Exception {
-        helper.createInnerClass();
-
-        IMethod someMethod= helper.getType1().getMethod("outerMethod1", EMPTY);
-
-        IMethod innerMethod1= helper.getType1().getType("Inner").getMethod("innerMethod1", EMPTY);
-        IMethod innerMethod2= helper.getType1().getType("Inner").getMethod("innerMethod2", EMPTY);
-
-        Collection expectedCallers= new ArrayList();
-        expectedCallers.add(innerMethod1);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(innerMethod2);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        helper.assertCalls(expectedCallers, callers);
-        
-        Collection expectedCallersSecondLevel= new ArrayList();
-        expectedCallersSecondLevel.add(someMethod);
-        MethodWrapper innerMethod1Wrapper= helper.findMethodWrapper(innerMethod1, callers);
-        helper.assertCalls(expectedCallersSecondLevel, innerMethod1Wrapper.getCalls(new NullProgressMonitor()));
-    }
-
-    /**
-     * Tests calls that origin from an inner class  
-     */
-    public void testAnonymousInnerClassCallers() throws Exception {
-        helper.createAnonymousInnerClass();
-        
-        IMethod someMethod= helper.getType1().getMethod("someMethod", EMPTY);
-
-        IMethod result= helper.getType1().getField("anonClass").getType("", 1).getMethod("anotherMethod", EMPTY);
-        Collection expectedCallers= new ArrayList();
-        expectedCallers.add(result);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCallerRoot(someMethod);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        helper.assertCalls(expectedCallers, callers);
-    }
-
-    /**
-     * Tests calls that origin from an inner class  
-     */
-    public void testAnonymousInnerClassOnInterfaceCallees() throws Exception {
-    	//regression test for bug 37290 call hierarchy: Searching for callees into anonymous inner classes fails 
-        helper.createAnonymousInnerClass();
-        
-        IMethod method= helper.getType2().getMethod("anonymousOnInterface", EMPTY);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(method);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        
-        assertEquals("Wrong number of callees", 1, callers.length);
-        IMember member= callers[0].getMember();
-        assertTrue("Wrong member type (expected an instanceof IType)", member instanceof IType);
-        assertEquals("Wrong member name", "Intf", member.getElementName());
-    }
-
-    /**
-     * Tests calls that origin from an inner class  
-     */
-    public void testAnonymousInnerClassInsideMethodCallees() throws Exception {
-        //regression test for bug 56732 call hierarchy: Call Hierarchy doesn't show callees of method from anonymous type 
-        helper.createAnonymousInnerClassInsideMethod();
-        
-        IMethod methodM= helper.getType1().getMethod("m", EMPTY);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(methodM);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        
-        assertEquals("Wrong number of callees", 3, callers.length);
-        
-        IMethod methodRun= methodM.getType("", 1).getMethod("run", EMPTY); 
-
-        wrapper= CallHierarchy.getDefault().getCalleeRoot(methodRun);
-        callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        
-        assertEquals("Wrong number of callees", 1, callers.length);
-        assertEquals("Wrong callee method", "println", callers[0].getMember().getElementName());
-        assertEquals("Wrong callee type", "java.io.PrintStream", callers[0].getMember().getDeclaringType().getFullyQualifiedName());
-    }
-
-    /**
-     * Tests calls that origin from an inner class  
-     */
-    public void testAnonymousInnerClassOnClassCallees() throws Exception {
-		//regression test for bug 37290 call hierarchy: Searching for callees into anonymous inner classes fails 
-        helper.createAnonymousInnerClass();
-        
-        IMethod method= helper.getType2().getMethod("anonymousOnClass", EMPTY);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(method);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        
-        assertEquals("Wrong number of callees", 1, callers.length);
-        IMember member= callers[0].getMember();
-        assertTrue("Wrong member type (expected an instanceof IType)", member instanceof IType);
-        assertEquals("Wrong member name", "Clazz", member.getElementName());
-    }
-
-    /**
-     * Tests calls that origin from a static initializer block.
-     */
-    public void testInitializerCallers() throws Exception {
-        helper.createStaticInitializerClass();
-
-        IMethod someMethod= helper.getType1().getMethod("someMethod", EMPTY);
-
-        IInitializer initializer= helper.getType1().getInitializer(1);
-
-        Collection expectedCallers= new ArrayList();
-        expectedCallers.add(initializer);
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCallerRoot(someMethod);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        helper.assertCalls(expectedCallers, callers);
-    }
-
-    public void testImplicitConstructorCallers() throws Exception {
-        helper.createSimpleClasses();
-        
-        IMethod constructorA= helper.getType1().getMethod("A", EMPTY);
-
-        Collection expectedCallers= new ArrayList();
-        expectedCallers.add(helper.getType2());
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCallerRoot(constructorA);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        helper.assertCalls(expectedCallers, callers);
-    }
-    
-    public void testImplicitConstructorCallees() throws Exception {
-        helper.createImplicitConstructorClasses();
-        
-        IMethod constructorB= helper.getType2().getMethods()[0];
-
-        Collection expectedCallers= new ArrayList();
-        expectedCallers.add(helper.getType1());
-
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(constructorB);
-        MethodWrapper[] callers= wrapper.getCalls(new NullProgressMonitor());
-        assertRecursive(callers, false);
-        helper.assertCalls(expectedCallers, callers);
-    }
-
-    public void testLineNumberCallers() throws Exception {
-        helper.createSimpleClasses();
-        
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCallerRoot(helper.getMethod1());
-        MethodWrapper[] calls= wrapper.getCalls(new NullProgressMonitor());
-        MethodWrapper method2Wrapper= helper.findMethodWrapper(helper.getMethod2(), calls);
-        assertEquals("Wrong line number", 9, method2Wrapper.getMethodCall().getFirstCallLocation().getLineNumber());
-
-        wrapper= CallHierarchy.getDefault().getCallerRoot(helper.getRecursiveMethod2());
-        calls= wrapper.getCalls(new NullProgressMonitor());
-        MethodWrapper recursiveMethod1Wrapper= helper.findMethodWrapper(helper.getRecursiveMethod1(), calls);
-        assertEquals("Wrong line number", 12, recursiveMethod1Wrapper.getMethodCall().getFirstCallLocation().getLineNumber());
-    }
-        
-    public void testLineNumberCallees() throws Exception {
-        helper.createSimpleClasses();
-        
-        MethodWrapper wrapper= CallHierarchy.getDefault().getCalleeRoot(helper.getMethod2());
-        MethodWrapper[] calls= wrapper.getCalls(new NullProgressMonitor());
-        MethodWrapper method1Wrapper= helper.findMethodWrapper(helper.getMethod1(), calls);
-        assertEquals("Wrong line number", 9, method1Wrapper.getMethodCall().getFirstCallLocation().getLineNumber());
-        
-        wrapper= CallHierarchy.getDefault().getCalleeRoot(helper.getRecursiveMethod1());
-        calls= wrapper.getCalls(new NullProgressMonitor());
-        MethodWrapper recursiveMethod2Wrapper= helper.findMethodWrapper(helper.getRecursiveMethod2(), calls);
-        assertEquals("Wrong line number", 12, recursiveMethod2Wrapper.getMethodCall().getFirstCallLocation().getLineNumber());
-    }
-
-    private void assertRecursive(MethodWrapper[] callResults, boolean shouldBeRecursive) {
-        for (int i= 0; i < callResults.length; i++) {
-            assertEquals(
-                "Wrong recursive value: " + callResults[i].getName(),
-                shouldBeRecursive,
-                callResults[i].isRecursive());
-        }
-    }
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ClassPathDetectorTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ClassPathDetectorTest.java
deleted file mode 100644
index add09bb..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ClassPathDetectorTest.java
+++ /dev/null

@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.ui.wizards.ClassPathDetector;
-
-/**
-  */
-public class ClassPathDetectorTest extends TestCase {
-
-	private static final Class THIS= ClassPathDetectorTest.class;
-	
-	private IJavaProject fJProject1;
-
-	private boolean fEnableAutoBuildAfterTesting;
-
-	public ClassPathDetectorTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ClassPathDetectorTest("testClassFolderConflictingWithOutput"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-
-		IWorkspace workspace= JavaTestPlugin.getWorkspace();
-		assertNotNull(workspace);
-
-		// disable auto-build
-		IWorkspaceDescription workspaceDesc= workspace.getDescription();
-		if (workspaceDesc.isAutoBuilding()) {
-			fEnableAutoBuildAfterTesting= true;
-			JavaProjectHelper.setAutoBuilding(false);
-		}
-		
-		IPreferenceStore store= PreferenceConstants.getPreferenceStore();
-		store.setValue(PreferenceConstants.SRCBIN_BINNAME, "bin");
-
-		fJProject1= null;
-	}
-
-	protected void tearDown() throws Exception {
-		if (fJProject1 != null) {
-			JavaProjectHelper.delete(fJProject1);
-		}
-
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);		
-	}
-	
-	private boolean hasSamePaths(IPath[] a, IPath[] b) {
-		if (a.length != b.length) {
-			return false;
-		}
-		for (int i= 0; i < a.length; i++) {
-			if (!a[i].equals(b[i])) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-
-	private IClasspathEntry findEntry(IClasspathEntry entry, IClasspathEntry[] entries) {
-		for (int i= 0; i < entries.length; i++) {
-			IClasspathEntry curr= entries[i];
-			if (curr.getPath().equals(entry.getPath()) && curr.getEntryKind() == entry.getEntryKind()) {
-				if (curr.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					if (hasSamePaths(curr.getExclusionPatterns(), entry.getExclusionPatterns())) {
-						return curr;
-					}
-				} else {
-					return curr;
-				}
-			}
-		}
-		return null;
-	}
-
-
-
-	private void assertSameClasspath(IClasspathEntry[] projectEntries, IClasspathEntry[] entries) throws Exception {
-		assertEquals("Number of classpath entries", projectEntries.length, entries.length);
-		
-		for (int i= 0; i < projectEntries.length; i++) {
-			IClasspathEntry curr= projectEntries[i];
-			assertTrue("entry not found: " + curr.getPath(), findEntry(curr, entries) != null);
-		}
-	}
-	
-	private void clearClasspath() throws Exception {
-		
-		// see 29306 
-		IClasspathEntry other= JavaCore.newSourceEntry(fJProject1.getPath());
-		fJProject1.setRawClasspath(new IClasspathEntry[] { other }, fJProject1.getPath().append("bin"), null);
-		
-		//fJProject1.setRawClasspath(new IClasspathEntry[0], projectOutput, null);		
-	}
-	
-	
-	
-	public void testSourceAndLibrary() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		
-		// source folder & internal JAR
-		
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);		
-		
-		File mylibJar= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-		assertTrue("lib not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addLibraryWithImport(fJProject1, new Path(mylibJar.getPath()), null, null);
-		
-		IClasspathEntry[] jreEntries= PreferenceConstants.getDefaultJRELibrary();
-		for (int i= 0; i < jreEntries.length; i++) {
-			JavaProjectHelper.addToClasspath(fJProject1, jreEntries[i]);
-		}
-		fJProject1.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
-		
-		IClasspathEntry[] projectEntries= fJProject1.getRawClasspath();
-		IPath projectOutput= fJProject1.getOutputLocation();
-		
-		clearClasspath();
-		
-		ClassPathDetector detector= new ClassPathDetector(fJProject1.getProject());
-		IPath outputLocation= detector.getOutputLocation();
-		IClasspathEntry[] entries= detector.getClasspath();
-		assertNotNull("No classpath detected", entries);
-		assertNotNull("No outputLocation detected", outputLocation);
-		
-		assertSameClasspath(projectEntries, entries);
-
-		assertTrue("Output folder", outputLocation.equals(projectOutput));
-	}
-
-	public void testTwoSourceFolders() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		// 2 source folders
-		
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src1", junitSrcArchive);
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJProject1, "src2");
-		IPackageFragment pack1= root.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        getClass();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		IClasspathEntry[] jreEntries= PreferenceConstants.getDefaultJRELibrary();
-		for (int i= 0; i < jreEntries.length; i++) {
-			JavaProjectHelper.addToClasspath(fJProject1, jreEntries[i]);
-		}
-		fJProject1.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
-		
-		IClasspathEntry[] projectEntries= fJProject1.getRawClasspath();
-		IPath projectOutput= fJProject1.getOutputLocation();
-
-		clearClasspath();
-		
-		ClassPathDetector detector= new ClassPathDetector(fJProject1.getProject());
-		IPath outputLocation= detector.getOutputLocation();
-		IClasspathEntry[] entries= detector.getClasspath();
-		assertNotNull("No classpath detected", entries);
-		assertNotNull("No outputLocation detected", outputLocation);
-		
-		assertSameClasspath(projectEntries, entries);
-		
-		assertTrue("Output folder", outputLocation.equals(projectOutput));
-	}
-	
-	public void testNestedSources() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		// 2 nested source folders
-		
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		IPath[] exclusionFilter= new IPath[] { new Path("src2/") };
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src1", junitSrcArchive, exclusionFilter);
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJProject1, "src1/src2");
-		IPackageFragment pack1= root.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        getClass();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		IClasspathEntry[] jreEntries= PreferenceConstants.getDefaultJRELibrary();
-		for (int i= 0; i < jreEntries.length; i++) {
-			JavaProjectHelper.addToClasspath(fJProject1, jreEntries[i]);
-		}
-		fJProject1.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
-		
-		IClasspathEntry[] projectEntries= fJProject1.getRawClasspath();
-		IPath projectOutput= fJProject1.getOutputLocation();
-
-		clearClasspath();
-
-		ClassPathDetector detector= new ClassPathDetector(fJProject1.getProject());
-		IPath outputLocation= detector.getOutputLocation();
-		IClasspathEntry[] entries= detector.getClasspath();
-		assertNotNull("No classpath detected", entries);
-		assertNotNull("No outputLocation detected", outputLocation);
-		
-		assertSameClasspath(projectEntries, entries);
-		
-		assertTrue("Output folder", outputLocation.equals(projectOutput));
-	}
-	
-	public void testSourceAndOutputOnProject() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "");
-	
-		// source folder & internal JAR
-	
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "", junitSrcArchive);		
-	
-		IClasspathEntry[] jreEntries= PreferenceConstants.getDefaultJRELibrary();
-		for (int i= 0; i < jreEntries.length; i++) {
-			JavaProjectHelper.addToClasspath(fJProject1, jreEntries[i]);
-		}
-		fJProject1.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
-	
-		IClasspathEntry[] projectEntries= fJProject1.getRawClasspath();
-		IPath projectOutput= fJProject1.getOutputLocation();
-	
-		clearClasspath();
-	
-		ClassPathDetector detector= new ClassPathDetector(fJProject1.getProject());
-		IPath outputLocation= detector.getOutputLocation();
-		IClasspathEntry[] entries= detector.getClasspath();
-		assertNotNull("No classpath detected", entries);
-		assertNotNull("No outputLocation detected", outputLocation);
-	
-		assertSameClasspath(projectEntries, entries);
-
-		assertTrue("Output folder", outputLocation.equals(projectOutput));
-	}
-	
-	public void testClassFolder() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		// class folder:
-		
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJProject1, "src1");
-		IPackageFragment pack1= root.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        getClass();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("E.java", buf.toString(), false, null);	
-		
-		File lib= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-		assertTrue("lib not found", lib != null && lib.exists());
-		
-		IPackageFragmentRoot cfroot= JavaProjectHelper.addClassFolderWithImport(fJProject1, "cf", null, null, lib);
-		
-		IClasspathEntry[] jreEntries= PreferenceConstants.getDefaultJRELibrary();
-		for (int i= 0; i < jreEntries.length; i++) {
-			JavaProjectHelper.addToClasspath(fJProject1, jreEntries[i]);
-		}
-		fJProject1.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
-		
-		JavaProjectHelper.removeFromClasspath(fJProject1, cfroot.getPath()); // classfolder should not be detected
-		
-		IClasspathEntry[] projectEntries= fJProject1.getRawClasspath();
-		IPath projectOutput= fJProject1.getOutputLocation();
-
-		clearClasspath();
-		
-		ClassPathDetector detector= new ClassPathDetector(fJProject1.getProject());
-		IPath outputLocation= detector.getOutputLocation();
-		IClasspathEntry[] entries= detector.getClasspath();
-		assertNotNull("No classpath detected", entries);
-		assertNotNull("No outputLocation detected", outputLocation);
-		
-		assertSameClasspath(projectEntries, entries); 
-		assertTrue("Output folder", outputLocation.equals(projectOutput));
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CodeCompletionTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CodeCompletionTest.java
deleted file mode 100644
index fb24aa0..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CodeCompletionTest.java
+++ /dev/null

@@ -1,685 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal;
-import org.eclipse.jdt.internal.ui.text.java.ResultCollector;
-
-public class CodeCompletionTest extends CoreTests {
-	
-	private static final Class THIS= CodeCompletionTest.class;
-	
-	private IJavaProject fJProject1;
-
-	public CodeCompletionTest(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new CodeCompletionTest("testSetterCompletion1"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-
-	protected void setUp() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		JavaProjectHelper.addRequiredProject(fJProject1, ProjectTestSetup.getProject());
-
-		Hashtable options= TestOptions.getFormatterOptions();  
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(JavaCore.CODEASSIST_FIELD_PREFIXES, "f");
-		JavaCore.setOptions(options);
-		
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, true);
-
-		TemplateStore codeTemplateStore= JavaPlugin.getDefault().getCodeTemplateStore();
-		codeTemplateStore.findTemplate(CodeTemplateContextType.OVERRIDECOMMENT).setPattern("/* (non-Javadoc)\n * ${see_to_overridden}\n */");	
-		codeTemplateStore.findTemplate(CodeTemplateContextType.METHODSTUB).setPattern("//TODO\n${body_statement}");
-		codeTemplateStore.findTemplate(CodeTemplateContextType.CONSTRUCTORCOMMENT).setPattern("/**\n * Constructor.\n */");
-		codeTemplateStore.findTemplate(CodeTemplateContextType.METHODCOMMENT).setPattern("/**\n * Method.\n */");
-		codeTemplateStore.findTemplate(CodeTemplateContextType.CONSTRUCTORSTUB).setPattern("//TODO\n${body_statement}");
-
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fJProject1);
-	}
-	
-	
-	public void testAnonymousTypeCompletion1() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run= new Runnable(\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
-
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "Runnable run= new Runnable(";
-	
-			int offset= contents.indexOf(str) + str.length();
-	
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-			
-			cu.codeComplete(offset, collector);
-			
-			JavaCompletionProposal[] proposals= collector.getResults();
-			
-			assertNumberOf("proposals", proposals.length, 1);
-			
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-
-			
-			proposals[0].apply(doc);
-	
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("public class A {\n");
-			buf.append("    public void foo() {\n");
-			buf.append("        Runnable run= new Runnable() {\n");
-			buf.append("            public void run() {\n");
-			buf.append("                //TODO\n");
-			buf.append("\n");
-			buf.append("            }\n");
-			buf.append("        }\n");		
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString());
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}
-	}
-	
-	public void testAnonymousTypeCompletion2() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run= new Runnable();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
-		
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "Runnable run= new Runnable(";
-	
-			int offset= contents.indexOf(str) + str.length();
-	
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-			
-			cu.codeComplete(offset, collector);
-			
-			JavaCompletionProposal[] proposals= collector.getResults();
-			
-			assertNumberOf("proposals", proposals.length, 1);
-			
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			
-			proposals[0].apply(doc);
-	
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("public class A {\n");
-			buf.append("    public void foo() {\n");
-			buf.append("        Runnable run= new Runnable() {\n");
-			buf.append("            public void run() {\n");
-			buf.append("                //TODO\n");
-			buf.append("\n");
-			buf.append("            }\n");
-			buf.append("        };\n");		
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString());
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}
-	}	
-
-
-	public void testOverrideCompletion1() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.Writer;\n");
-		buf.append("\n");
-		buf.append("public class A extends Writer {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("    //here\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
-
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "//here";
-
-			int offset= contents.indexOf(str);
-
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-
-			cu.codeComplete(offset, collector);
-
-			JavaCompletionProposal[] proposals= collector.getResults();
-
-			JavaCompletionProposal toStringProposal= null;
-
-			for (int i= 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().startsWith("toString()")) {
-					toStringProposal= proposals[i];
-				}
-			}
-			assertNotNull("no proposal for toString()", toStringProposal);
-
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-
-			toStringProposal.apply(doc);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.Writer;\n");
-			buf.append("\n");
-			buf.append("public class A extends Writer {\n");
-			buf.append("    public void foo() {\n");
-			buf.append("    }\n");
-			buf.append("    /* (non-Javadoc)\n");
-			buf.append("     * @see java.lang.Object#toString()\n");
-			buf.append("     */\n");
-			buf.append("    public String toString() {\n");
-			buf.append("        //TODO\n");
-			buf.append("        return super.toString();\n");
-			buf.append("    }//here\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString());
-			
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}
-		
-	}
-	
-	public void testOverrideCompletion2() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.Writer;\n");
-		buf.append("\n");
-		buf.append("public class A extends Writer {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("    //here\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
-
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "//here";
-
-			int offset= contents.indexOf(str);
-
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-
-			cu.codeComplete(offset, collector);
-
-			JavaCompletionProposal[] proposals= collector.getResults();
-
-			JavaCompletionProposal closeProposal= null;
-
-			for (int i= 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().startsWith("close()")) {
-					closeProposal= proposals[i];
-				}
-			}
-			assertNotNull("no proposal for close()", closeProposal);
-
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-
-			closeProposal.apply(doc);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.IOException;\n");
-			buf.append("import java.io.Writer;\n");
-			buf.append("\n");
-			buf.append("public class A extends Writer {\n");
-			buf.append("    public void foo() {\n");
-			buf.append("    }\n");
-			buf.append("    /* (non-Javadoc)\n");
-			buf.append("     * @see java.io.Writer#close()\n");
-			buf.append("     */\n");
-			buf.append("    public void close() throws IOException {\n");
-			buf.append("        //TODO\n");
-			buf.append("\n");
-			buf.append("    }//here\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString()); 
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}		
-	}
-	
-	public void testOverrideCompletion3() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.BufferedWriter;\n");
-		buf.append("\n");
-		buf.append("public class A extends BufferedWriter {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("    //here\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
-
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "//here";
-
-			int offset= contents.indexOf(str);
-
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-
-			cu.codeComplete(offset, collector);
-
-			JavaCompletionProposal[] proposals= collector.getResults();
-
-			JavaCompletionProposal closeProposal= null;
-
-			for (int i= 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().startsWith("close()")) {
-					closeProposal= proposals[i];
-				}
-			}
-			assertNotNull("no proposal for close()", closeProposal);
-
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			closeProposal.apply(doc);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.BufferedWriter;\n");
-			buf.append("import java.io.IOException;\n");
-			buf.append("\n");
-			buf.append("public class A extends BufferedWriter {\n");
-			buf.append("    public void foo() {\n");
-			buf.append("    }\n");
-			buf.append("    /* (non-Javadoc)\n");
-			buf.append("     * @see java.io.BufferedWriter#close()\n");
-			buf.append("     */\n");
-			buf.append("    public void close() throws IOException {\n");
-			buf.append("        //TODO\n");
-			buf.append("        super.close();\n");
-			buf.append("    }//here\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString()); 
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}		
-	}
-	
-	
-	public void testGetterCompletion1() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.BufferedWriter;\n");
-		buf.append("\n");
-		buf.append("public class A {\n");
-		buf.append("    private BufferedWriter fWriter;\n");
-		buf.append("    get//here\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
-
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "//here";
-
-			int offset= contents.indexOf(str);
-
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-
-			cu.codeComplete(offset, collector);
-
-			JavaCompletionProposal[] proposals= collector.getResults();
-
-			JavaCompletionProposal proposal= null;
-
-			for (int i= 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().startsWith("getWriter")) {
-					proposal= proposals[i];
-				}
-			}
-			assertNotNull("no proposal for getWriter()", proposal);
-
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			proposal.apply(doc);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.BufferedWriter;\n");
-			buf.append("\n");
-			buf.append("public class A {\n");
-			buf.append("    private BufferedWriter fWriter;\n");
-			buf.append("    /**\n");
-			buf.append("     * @return Returns the writer.\n");
-			buf.append("     */\n");
-			buf.append("    public BufferedWriter getWriter() {\n");
-			buf.append("        return fWriter;\n");
-			buf.append("    }//here\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString()); 
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}		
-	}
-	
-	public void testSetterCompletion1() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.BufferedWriter;\n");
-		buf.append("\n");
-		buf.append("public class A {\n");
-		buf.append("    private BufferedWriter writer;\n");
-		buf.append("    se//here\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
-
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "//here";
-
-			int offset= contents.indexOf(str);
-
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-
-			cu.codeComplete(offset, collector);
-
-			JavaCompletionProposal[] proposals= collector.getResults();
-
-			JavaCompletionProposal proposal= null;
-
-			for (int i= 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().startsWith("setWriter")) {
-					proposal= proposals[i];
-				}
-			}
-			assertNotNull("no proposal for setWriter()", proposal);
-
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			proposal.apply(doc);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.BufferedWriter;\n");
-			buf.append("\n");
-			buf.append("public class A {\n");
-			buf.append("    private BufferedWriter writer;\n");
-			buf.append("    /**\n");
-			buf.append("     * @param writer The writer to set.\n");
-			buf.append("     */\n");
-			buf.append("    public void setWriter(BufferedWriter writer) {\n");
-			buf.append("        this.writer = writer;\n");
-			buf.append("    }//here\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString()); 
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}		
-	}
-	
-	public void testMethodCompletion() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.BufferedWriter;\n");
-		buf.append("\n");
-		buf.append("public class A {\n");
-		buf.append("    private BufferedWriter writer;\n");
-		buf.append("    foo//here\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", contents, false, null);
-
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "//here";
-
-			int offset= contents.indexOf(str);
-
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-
-			cu.codeComplete(offset, collector);
-
-			JavaCompletionProposal[] proposals= collector.getResults();
-
-			JavaCompletionProposal proposal= null;
-
-			for (int i= 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().startsWith("foo")) {
-					proposal= proposals[i];
-				}
-			}
-			assertNotNull("no proposal for foo()", proposal);
-
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			proposal.apply(doc);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.BufferedWriter;\n");
-			buf.append("\n");
-			buf.append("public class A {\n");
-			buf.append("    private BufferedWriter writer;\n");
-			buf.append("    /**\n");
-			buf.append("     * Method.\n");
-			buf.append("     */\n");
-			buf.append("    private void foo() {\n");
-			buf.append("        //TODO\n");
-			buf.append("\n");
-			buf.append("    }//here\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString()); 
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}		
-	}
-	
-	
-	public void testConstructorCompletion() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.BufferedWriter;\n");
-		buf.append("\n");
-		buf.append("public class MyClass {\n");
-		buf.append("    private BufferedWriter writer;\n");
-		buf.append("    //here\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("MyClass.java", contents, false, null);
-
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			String str= "//here";
-
-			int offset= contents.indexOf(str);
-
-			ResultCollector collector= new ResultCollector();
-			collector.reset(offset, cu.getJavaProject(), cu);
-			collector.setViewer(null);
-			collector.setReplacementLength(0);
-			collector.setPreventEating(true);
-
-			cu.codeComplete(offset, collector);
-
-			JavaCompletionProposal[] proposals= collector.getResults();
-
-			JavaCompletionProposal proposal= null;
-
-			for (int i= 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().startsWith("MyClass")) {
-					proposal= proposals[i];
-				}
-			}
-			assertNotNull("no proposal for MyClass()", proposal);
-
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			proposal.apply(doc);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.BufferedWriter;\n");
-			buf.append("\n");
-			buf.append("public class MyClass {\n");
-			buf.append("    private BufferedWriter writer;\n");
-			buf.append("    /**\n");
-			buf.append("     * Constructor.\n");
-			buf.append("     */\n");
-			buf.append("    public MyClass() {\n");
-			buf.append("        //TODO\n");
-			buf.append("\n");
-			buf.append("    }//here\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString()); 
-		} finally {
-			part.getSite().getPage().closeAllEditors(false);
-		}		
-	}	
-
-
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CodeFormatterUtilTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CodeFormatterUtilTest.java
deleted file mode 100644
index c30179c..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CodeFormatterUtilTest.java
+++ /dev/null

@@ -1,521 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.text.edits.TextEdit;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.Position;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.CatchClause;
-import org.eclipse.jdt.core.dom.Javadoc;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-
-import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil;
-
-public class CodeFormatterUtilTest extends CoreTests {
-	
-	private static final Class THIS= CodeFormatterUtilTest.class;
-	
-	private IJavaProject fJProject1;
-
-	public CodeFormatterUtilTest(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new CodeFormatterUtilTest("testCUIndented"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-
-	protected void setUp() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		JavaProjectHelper.addRequiredProject(fJProject1, ProjectTestSetup.getProject());
-
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "999");
-		JavaCore.setOptions(options);
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fJProject1);
-	}
-	
-	
-	public void testCU() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    Runnable run= new Runnable() {};\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-	
-		String formatted= CodeFormatterUtil.format(CodeFormatter.K_COMPILATION_UNIT, contents, 0, null, "\n", fJProject1);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run = new Runnable() {\n");
-		buf.append("        };\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-	}
-	
-	public void testCUIndented() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    Runnable run= new Runnable() {};\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-	
-		String formatted= CodeFormatterUtil.format(CodeFormatter.K_COMPILATION_UNIT, contents, 1, null, "\n", fJProject1);
-
-		buf= new StringBuffer();
-		buf.append("    package test1;\n");
-		buf.append("    public class A {\n");
-		buf.append("        public void foo() {\n");
-		buf.append("            Runnable run = new Runnable() {\n");
-		buf.append("            };\n");	
-		buf.append("        }\n");
-		buf.append("    }\n");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-	}	
-	
-	public void testCUNewAPI() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    Runnable run= new Runnable() {};\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-			
-		TextEdit edit= CodeFormatterUtil.format2(CodeFormatter.K_COMPILATION_UNIT, contents, 0, "\n", null);
-		Document doc= new Document(contents);
-		edit.apply(doc);
-		String formatted= doc.get();
-		
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run = new Runnable() {\n");
-		buf.append("        };\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-	}
-	
-	public void testCUNewAPI2() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("/**\n");
-		buf.append(" * comment\n");
-		buf.append(" */\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    Runnable run= new Runnable() {};\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-			
-		TextEdit edit= CodeFormatterUtil.format2(CodeFormatter.K_COMPILATION_UNIT, contents, 0, "\n", null);
-		Document doc= new Document(contents);
-		edit.apply(doc);
-		String formatted= doc.get();
-		
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    /**\n");
-		buf.append("     * comment\n");
-		buf.append("     */\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run = new Runnable() {\n");
-		buf.append("        };\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-	}		
-	
-	public void testCUWithPos() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    Runnable run= new Runnable() {};\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		String word1= "new";
-		int start1= contents.indexOf(word1);
-		int[] positions= { start1, start1 + word1.length() - 1};
-		
-		String formatted= CodeFormatterUtil.format(CodeFormatter.K_COMPILATION_UNIT, contents, 0, positions, "\n", fJProject1);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run = new Runnable() {\n");
-		buf.append("        };\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-		
-		String curr1= formatted.substring(positions[0], positions[1] + 1);
-		assertEqualString(curr1, word1);
-	}	
-	
-	public void testPackage() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("  package   com . test1;");
-		String contents= buf.toString();
-		
-		AST ast= new AST();
-		PackageDeclaration decl= ast.newPackageDeclaration();
-		
-		String formatted= CodeFormatterUtil.format(decl, contents, 0, null, "\n", null);
-
-		buf= new StringBuffer();
-		buf.append("package com.test1;");
-		String expected= buf.toString();
-		assertEqualString(expected, formatted);
-	}
-	
-	public void testPackageWithPos() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package   com . test1;");
-		String contents= buf.toString();
-		
-		AST ast= new AST();
-		PackageDeclaration node= ast.newPackageDeclaration();
-		
-		String word1= "com";
-		int start1= contents.indexOf(word1);
-		
-		String word2= ";";
-		int start2= contents.indexOf(word2);		
-		
-		int[] positions= { start1, start1 + word1.length() - 1, start2, start2 + word2.length() - 1};
-		
-		String formatted= CodeFormatterUtil.format(node, contents, 0, positions, "\n", null);
-
-		buf= new StringBuffer();
-		buf.append("package com.test1;");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-		
-		String curr1= formatted.substring(positions[0], positions[1] + 1);
-		assertEqualString(curr1, word1);
-		
-		String curr2= formatted.substring(positions[2], positions[3] + 1);
-		assertEqualString(curr2, word2);
-		
-	}		
-	
-	public void testVarDeclStatemenetWithPos() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("x[ ]=\nnew  int[ offset]");
-		String contents= buf.toString();
-		
-		AST ast= new AST();
-		VariableDeclarationFragment node= ast.newVariableDeclarationFragment();
-		
-		String word1= "new";
-		int start1= contents.indexOf(word1);
-		
-		String word2= "offset";
-		int start2= contents.indexOf(word2);		
-		
-		int[] positions= { start1, start1 + word1.length() - 1, start2, start2 + word2.length() - 1};
-		
-		String formatted= CodeFormatterUtil.format(node, contents, 0, positions, "\n", null);
-
-		buf= new StringBuffer();
-		buf.append("x[] = new int[offset]");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-		
-		String curr1= formatted.substring(positions[0], positions[1] + 1);
-		assertEqualString(curr1, word1);
-		
-		String curr2= formatted.substring(positions[2], positions[3] + 1);
-		assertEqualString(curr2, word2);
-		
-	}
-	
-	public void testJavadoc() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("/** bar\n");
-		buf.append(" * foo\n");
-		buf.append(" */\n");
-		String contents= buf.toString();
-		
-		AST ast= new AST();
-		Javadoc node= ast.newJavadoc();
-		
-		String word1= "bar";
-		int start1= contents.indexOf(word1);
-		
-		String word2= "foo";
-		int start2= contents.indexOf(word2);		
-		
-		int[] positions= { start1, start1 + word1.length() - 1, start2, start2 + word2.length() - 1};
-		
-		String formatted= CodeFormatterUtil.format(node, contents, 0, positions, "\n", null);
-
-		buf= new StringBuffer();
-		buf.append("/** bar\n");
-		buf.append(" * foo\n");
-		buf.append(" */\n");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-		
-		String curr1= formatted.substring(positions[0], positions[1] + 1);
-		assertEqualString(curr1, word1);
-		
-		String curr2= formatted.substring(positions[2], positions[3] + 1);
-		assertEqualString(curr2, word2);
-		
-	}
-	
-	public void testJavadoc2() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("/** bar\n");
-		buf.append(" * foo\n");
-		buf.append(" */");
-		String contents= buf.toString();
-		
-		AST ast= new AST();
-		Javadoc node= ast.newJavadoc();
-		
-		String word1= "bar";
-		int start1= contents.indexOf(word1);
-		
-		String word2= "foo";
-		int start2= contents.indexOf(word2);		
-		
-		int[] positions= { start1, start1 + word1.length() - 1, start2, start2 + word2.length() - 1};
-		
-		String formatted= CodeFormatterUtil.format(node, contents, 1, positions, "\n", null);
-
-		buf= new StringBuffer();
-		buf.append("    /** bar\n");
-		buf.append("     * foo\n");
-		buf.append("     */");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-		
-		String curr1= formatted.substring(positions[0], positions[1] + 1);
-		assertEqualString(curr1, word1);
-		
-		String curr2= formatted.substring(positions[2], positions[3] + 1);
-		assertEqualString(curr2, word2);
-		
-	}
-	
-	public void testJavadoc3() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("/** bar\n");
-		buf.append(" * foo\n");
-		buf.append(" */");
-		String contents= buf.toString();
-		
-		AST ast= new AST();
-		Javadoc node= ast.newJavadoc();
-		
-		String word1= "bar";
-		int start1= contents.indexOf(word1);
-		
-		String word2= "foo";
-		int start2= contents.indexOf(word2);		
-		
-		int[] positions= { start1, start1 + word1.length() - 1, start2, start2 + word2.length() - 1};
-		
-		String formatted= CodeFormatterUtil.format(node, contents, 0, positions, "\r\n", null);
-
-		buf= new StringBuffer();
-		buf.append("/** bar\r\n");
-		buf.append(" * foo\r\n");
-		buf.append(" */");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-		
-		String curr1= formatted.substring(positions[0], positions[1] + 1);
-		assertEqualString(curr1, word1);
-		
-		String curr2= formatted.substring(positions[2], positions[3] + 1);
-		assertEqualString(curr2, word2);
-		
-	}	
-	
-	public void testCatchClause() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("catch\n");
-		buf.append("(Exception e) {\n");
-		buf.append("}");
-		String contents= buf.toString();
-		
-		AST ast= new AST();
-		CatchClause node= ast.newCatchClause();
-		
-		String word1= "catch";
-		int start1= contents.indexOf(word1);
-		
-		String word2= "Exception";
-		int start2= contents.indexOf(word2);		
-		
-		int[] positions= { start1, start1 + word1.length() - 1, start2, start2 + word2.length() - 1};
-		
-		String formatted= CodeFormatterUtil.format(node, contents, 0, positions, "\n", null);
-
-		buf= new StringBuffer();
-		buf.append("catch (Exception e) {\n");
-		buf.append("}");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-		
-		String curr1= formatted.substring(positions[0], positions[1] + 1);
-		assertEqualString(curr1, word1);
-		
-		String curr2= formatted.substring(positions[2], positions[3] + 1);
-		assertEqualString(curr2, word2);
-		
-	}
-	
-	public void testCatchStringLiteral() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("\"Hello\" ");
-		String contents= buf.toString();
-		
-		AST ast= new AST();
-		StringLiteral node= ast.newStringLiteral();
-				
-		String formatted= CodeFormatterUtil.format(node, contents, 0, null, "\n", null);
-
-		buf= new StringBuffer();
-		buf.append("\"Hello\"");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-				
-	}	
-	
-	public void testFormatSubstring() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    Runnable runnable= new Runnable() {};\n");
-		buf.append("    runnable.toString();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String contents= buf.toString();
-		
-		String formatString= "Runnable runnable= new Runnable() {};";
-		int formatStart= contents.indexOf(formatString);
-		int formatLength= formatString.length();
-		
-		
-		String word1= "import";
-		int start1= contents.indexOf(word1);
-		
-		String word2= "new";
-		int start2= contents.indexOf(word2);
-		
-		String word3= "toString";
-		int start3= contents.indexOf(word3);		
-				
-		Position pos1= new Position(start1, word1.length());
-		Position pos2= new Position(start2, word2.length());
-		Position pos3= new Position(start3, word3.length());
-		
-		TextEdit edit= CodeFormatterUtil.format2(CodeFormatter.K_COMPILATION_UNIT, contents, formatStart, formatLength, 0, "\n", null);
-		assertNotNull(edit);
-		String formatted= CodeFormatterUtil.evaluateFormatterEdit(contents, edit, new Position[] { pos1, pos2, pos3});
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    Runnable runnable = new Runnable() {\n");
-		buf.append("        };\n");
-		buf.append("    runnable.toString();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(formatted, expected);
-		
-		String curr1= formatted.substring(pos1.offset, pos1.getOffset() + pos1.getLength());
-		assertEqualString(curr1, word1);
-		
-		String curr2= formatted.substring(pos2.offset, pos2.getOffset() + pos2.getLength());
-		assertEqualString(curr2, word2);
-		
-		String curr3= formatted.substring(pos3.offset, pos3.getOffset() + pos3.getLength());
-		assertEqualString(curr3, word3);
-		
-	}	
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CoreTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CoreTests.java
deleted file mode 100644
index c9fbf9e..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CoreTests.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.StringAsserts;
-
-/**
-  */
-public class CoreTests extends TestCase {
-
-	public static Test suite() {
-		
-		TestSuite suite= new TestSuite();
-		suite.addTest(AddImportTest.allTests());
-		suite.addTest(AddUnimplementedMethodsTest.allTests());
-		suite.addTest(AddUnimplementedConstructorsTest.allTests());
-		suite.addTest(AllTypesCacheTest.allTests());
-		suite.addTest(BindingsNameTest.allTests());
-		suite.addTest(ClassPathDetectorTest.allTests());
-		suite.addTest(HierarchicalASTVisitorTest.allTests());
-		suite.addTest(ImportOrganizeTest.allTests());
-		suite.addTest(JavaModelUtilTest.allTests());
-		suite.addTest(NameProposerTest.allTests());
-		suite.addTest(TypeInfoTest.allTests());	
-		suite.addTest(CallHierarchyTest.allTests());
-		suite.addTest(ScopeAnalyzerTest.allTests());
-		suite.addTest(PartialASTTest.allTests());
-		suite.addTest(CodeCompletionTest.allTests());
-		suite.addTest(TypeRulesTest.allTests());
-		suite.addTest(JavaElementLabelsTest.allTests());
-		
-		
-		return new ProjectTestSetup(suite);
-	}
-
-	public CoreTests(String name) {
-		super(name);
-	}
-	
-	public static void assertEqualString(String actual, String expected) {	
-		StringAsserts.assertEqualString(actual, expected);
-	}
-	
-	public static void assertEqualStringIgnoreDelim(String actual, String expected) throws IOException {
-		StringAsserts.assertEqualStringIgnoreDelim(actual, expected);
-	}	
-	
-	public static void assertEqualStringsIgnoreOrder(String[] actuals, String[] expecteds) {
-		StringAsserts.assertEqualStringsIgnoreOrder(actuals, expecteds);			
-	}
-	
-	public static void assertNumberOf(String name, int is, int expected) {
-		assertTrue("Wrong number of " + name + ", is: " + is + ", expected: " + expected, is == expected);
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/HierarchicalASTVisitorTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/HierarchicalASTVisitorTest.java
deleted file mode 100644
index 33c1242..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/HierarchicalASTVisitorTest.java
+++ /dev/null

@@ -1,462 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.Comment;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.Statement;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.VariableDeclaration;
-
-import org.eclipse.jdt.internal.corext.Assert;
-import org.eclipse.jdt.internal.corext.dom.HierarchicalASTVisitor;
-
-public class HierarchicalASTVisitorTest extends TestCase {
-	private static class TestHierarchicalASTVisitor extends HierarchicalASTVisitor {
-
-		//---- BEGIN <REGION TO BE UPDATED IN RESPONSE TO ASTNode HIERARCHY CHANGES> ---------------------
-		/* ******************************************************************************
-		 * Whereas the other parts of this test should be relatively static,
-		 * this portion of the file must be maintained in response to
-		 * changes that occur in the ASTNode hierarchy (and, thus, the ASTVisitor).
-		 * Such changes would include addition or removal of node types to or from
-		 * the hierarchy, or changes in the superclass/subclass relationships
-		 * among node classes.  Such changes necessitate, also, changes in the
-		 * HierarchicalASTVisitor itself, whose structure and behaviour this test
-		 * verifies.
-		 * 
-		 * The changes that must be made to this file in response to such changes in
-		 * the ASTNode hierarchy are localized here and limited to maintenance of the
-		 * following set of visit(XX node), superVisit(XX node), endVisit(XX node),
-		 * and superEndVisit(XX node) implementations.
-		 * There should be one such quadruple for each non-leaf ASTNode descendant class,
-		 * including ASTNode itself.
-		 * 
-		 * *****************************************************************************/
-
-		/* Here, for each non-leaf ASTNode descendant class, the visit(XX) method
-		 * is overridden to call registerCall(XX.class), and a void superVisit
-		 * (XX node) method is provided, which simply calls super.visit(XX).
-		 * Accordingly for endVisit(XX) and superEndVisit(XX).
-		 */
-
-		public boolean visit(ASTNode node) {
-			registerCall(ASTNode.class);
-			return false;
-		}
-		public void superVisit(ASTNode node) {
-			super.visit(node);
-		}
-		public void endVisit(ASTNode node) {
-			registerCall(ASTNode.class);
-		}
-		public void superEndVisit(ASTNode node) {
-			super.visit(node);
-		}
-
-		public boolean visit(Expression node) {
-			registerCall(Expression.class);
-			return false;
-		}
-		public void superVisit(Expression node) {
-			super.visit(node);
-		}
-		public void endVisit(Expression node) {
-			registerCall(Expression.class);
-		}
-		public void superEndVisit(Expression node) {
-			super.visit(node);
-		}
-
-		public boolean visit(Annotation node) {
-			registerCall(Annotation.class);
-			return false;
-		}
-		public void superVisit(Annotation node) {
-			super.visit(node);
-		}
-		public void endVisit(Annotation node) {
-			registerCall(Annotation.class);
-		}
-		public void superEndVisit(Annotation node) {
-			super.visit(node);
-		}
-
-		public boolean visit(Name node) {
-			registerCall(Name.class);
-			return false;
-		}
-		public void superVisit(Name node) {
-			super.visit(node);
-		}
-		public void endVisit(Name node) {
-			registerCall(Name.class);
-		}
-		public void superEndVisit(Name node) {
-			super.visit(node);
-		}
-
-		public boolean visit(BodyDeclaration node) {
-			registerCall(BodyDeclaration.class);
-			return false;
-		}
-		public void superVisit(BodyDeclaration node) {
-			super.visit(node);
-		}
-		public void endVisit(BodyDeclaration node) {
-			registerCall(BodyDeclaration.class);
-		}
-		public void superEndVisit(BodyDeclaration node) {
-			super.visit(node);
-		}
-
-		public boolean visit(AbstractTypeDeclaration node) {
-			registerCall(AbstractTypeDeclaration.class);
-			return false;
-		}
-		public void superVisit(AbstractTypeDeclaration node) {
-			super.visit(node);
-		}
-		public void endVisit(AbstractTypeDeclaration node) {
-			registerCall(AbstractTypeDeclaration.class);
-		}
-		public void superEndVisit(AbstractTypeDeclaration node) {
-			super.visit(node);
-		}
-
-		public boolean visit(Comment node) {
-			registerCall(Comment.class);
-			return false;
-		}
-		public void superVisit(Comment node) {
-			super.visit(node);
-		}
-		public void endVisit(Comment node) {
-			registerCall(Comment.class);
-		}
-		public void superEndVisit(Comment node) {
-			super.visit(node);
-		}
-
-		public boolean visit(Type node) {
-			registerCall(Type.class);
-			return false;
-		}
-		public void superVisit(Type node) {
-			super.visit(node);
-		}
-		public void endVisit(Type node) {
-			registerCall(Type.class);
-		}
-		public void superEndVisit(Type node) {
-			super.visit(node);
-		}
-
-		public boolean visit(Statement node) {
-			registerCall(Statement.class);
-			return false;
-		}
-		public void superVisit(Statement node) {
-			super.visit(node);
-		}
-		public void endVisit(Statement node) {
-			registerCall(Statement.class);
-		}
-		public void superEndVisit(Statement node) {
-			super.visit(node);
-		}
-
-		public boolean visit(VariableDeclaration node) {
-			registerCall(VariableDeclaration.class);
-			return false;
-		}
-		public void superVisit(VariableDeclaration node) {
-			super.visit(node);
-		}
-		public void endVisit(VariableDeclaration node) {
-			registerCall(VariableDeclaration.class);
-		}
-		public void superEndVisit(VariableDeclaration node) {
-			super.visit(node);
-		}
-
-		//---- END <REGION TO BE UPDATED IN RESPONSE TO ASTNode HIERARCHY CHANGES> ----------------------
-
-		/**
-		 * Verifies that the visit(XX) method in HierarchicalASTVisitor calls
-		 * visit(YY), where XX is the name of <code>clazz</code> and YY is the
-		 * name of the superclass of clazz.
-		 * 
-		 * <code>clazz</code> must be a <b>proper</b> descendant of ASTNode (<code>clazz</code> is not ASTNode).
-		 */
-		private static void checkMethodCallsSuperclassMethod(Class clazz, boolean isLeaf, boolean isEndVisit) {
-			Assert.isTrue(ASTNode.class.isAssignableFrom(clazz));
-			Assert.isTrue(!ASTNode.class.equals(clazz));
-
-			TestHierarchicalASTVisitor visitor= new TestHierarchicalASTVisitor();
-			visitor._checkMethodCallsSuperclassMethod(clazz, isLeaf, isEndVisit);
-		}
-
-		/**
-		 * This class must have certain methods corresponding to the
-		 * ASTNode descendant class <code>clazz</code>.
-		 * This method reflectively verifies that they are present.
-		 */
-		private static void checkRequiredMethodsForNonLeaf(Class clazz, boolean isEndVisit) {
-			Assert.isTrue(ASTNode.class.isAssignableFrom(clazz));
-			try {
-				TestHierarchicalASTVisitor.class.getDeclaredMethod(getMethodNameFor(clazz, isEndVisit), new Class[] { clazz });
-			} catch (NoSuchMethodException e) {
-				fail("Test must be updated since TestHierarchicalASTVisitor (declared within test class), is missing a method corresponding to non-leaf node class '" + getSimpleName(clazz) + "'");
-			}
-			try {
-				TestHierarchicalASTVisitor.class.getDeclaredMethod(getSuperVisitName(isEndVisit), new Class[] { clazz });
-			} catch (NoSuchMethodException e) {
-				fail("Test must be updated since TestHierarchicalASTVisitor (declared within test class), is missing a method corresponding to non-leaf node class '" + getSimpleName(clazz) + "'");
-			}
-		}
-
-		private Class fNodeClassForCalledMethod= null;
-
-		private void _checkMethodCallsSuperclassMethod(Class clazz, boolean isLeaf, boolean isEndVisit) {
-			/* Invoke a method which will result in the execution of
-			 * HierarchicalASTVisitor's implementation of visit(XX), where 
-			 * XX is the name of clazz.
-			 * 
-			 * If clazz is a leaf, we can invoke visit(XX) directly.
-			 * Otherwise, we must invoke superVisit(XX), (in this class)
-			 * which calls super.visit(XX), since visit(XX) is overridden in
-			 * this class.
-			 * 
-			 * The parameter passed to visit(XX) or superVisit(XX)
-			 * is null.  If there ever was any requirement that the
-			 * parameter to visit(XX) methods, be non-null, we would simply have
-			 * to reflectively instantiate an appropriately typed node.
-			 */
-			try {
-				Method method= TestHierarchicalASTVisitor.class.getMethod(isLeaf ? getMethodNameFor(clazz, isEndVisit) : "superVisit", new Class[] { clazz });
-				method.invoke(this, new Object[] { null });
-			} catch (NoSuchMethodException e) {
-				/* This should have already been discovered by
-				 * hasRequiredMethodsForNonLeaf(..)
-				 */
-				e.printStackTrace();
-				Assert.isTrue(false);
-			} catch (IllegalAccessException e) {
-				e.printStackTrace();
-				Assert.isTrue(false);
-			} catch (InvocationTargetException e) {
-				e.printStackTrace();
-				Assert.isTrue(false);
-			}
-
-			/*
-			 * Verify that the method invokation caused
-			 * a call to visit(YY), where YY is the name of the superclass of
-			 * clazz. (Also, verify that no other visit(ZZ) method was called).
-			 */
-			checkSuperclassMethodCalled(clazz, isLeaf, isEndVisit);
-		}
-		private void checkSuperclassMethodCalled(Class clazz, boolean isLeaf, boolean isEndVisit) {
-			Assert.isNotNull(clazz.getSuperclass());
-			/*
-			 * This class' implementations of the visit(YY) methods (for non-
-			 * leaf YY) cause fNodeClassForCalledMethod to be set to YY.class.
-			 * Such an implementation will be the one executed when a visit(XX)
-			 * implementation in HierarchicalASTVisitor calls the visit(YY)
-			 * method corresponding to XX's superclass, YY. We check here that
-			 * fNodeClassForCalledMethod was set to the superclass of clazz.
-			 */
-			assertTrue(getSuperMethodNotCalledMessageFor(clazz, isLeaf, isEndVisit), clazz.getSuperclass().equals(fNodeClassForCalledMethod));
-		}
-		private String getSuperMethodNotCalledMessageFor(Class clazz, boolean isLeaf, boolean isEndVisit) {
-			return getMethodSignatureFor(clazz, isLeaf, isEndVisit) + " in HierarchicalASTVisitor should call " + getMethodSignatureFor(clazz.getSuperclass(), false, isEndVisit) + ", the visitor method for its superclass.";
-		}
-
-		private void registerCall(Class nodeClassForMethod) {
-			assertNull("The invocation of a visit(XX) method in HierarchicalASTVisitor has caused " +
-					"more than one other visit(XX) method to be called.  Every visit(XX) method in " +
-					"HierarchicalASTVisitor, except visit(ASTNode), should simply call visit(YY), " +
-					"where YY is the superclass of XX.", fNodeClassForCalledMethod);
-			fNodeClassForCalledMethod= nodeClassForMethod;
-		}
-	}
-
-	private static final Class THIS_CLASS= HierarchicalASTVisitorTest.class;
-
-	private Set/*<Class>*/ fLeaves;
-
-	public HierarchicalASTVisitorTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new TestSuite(THIS_CLASS);
-	}
-
-	public static Test suite() {
-		return new TestSuite(THIS_CLASS);
-	}
-
-	public void test() {
-		fLeaves= getLeafASTNodeDescendants();
-		Set allASTNodeDescendants= computeAllDescendantsFromLeaves(fLeaves.iterator(), ASTNode.class);
-
-		checkAllMethodsForHierarchyExist(allASTNodeDescendants.iterator(), false);
-		checkAllMethodsForHierarchyExist(allASTNodeDescendants.iterator(), true);
-		checkMethodsCallSuperclassMethod(allASTNodeDescendants.iterator(), false);
-		checkMethodsCallSuperclassMethod(allASTNodeDescendants.iterator(), true);
-	}
-
-	private boolean isLeaf(Class clazz) {
-		return fLeaves.contains(clazz);
-	}
-
-	/**
-	 * For both HierarchicalASTVisitor and a subsequent part of this test to be correct,
-	 * HierarchicalASTVisitor and TestHierarchicalASTVisitor must declare certain methods,
-	 * each one corresponding to a class in the ASTNode hierarchy.  Specifically, 
-	 * HierarchicalASTVisitor must declare a method corresponding to each class in the hierarchy,
-	 * whereas TestHierarchicalASTVisitor must declare a pair of methods for each non-leaf
-	 * class in the ASTNode hierarchy.
-	 * 
-	 * This method verifies that these required methods exist, and suggests the updates
-	 * that are needed to properly maintain the set of methods.
-	 */
-	private void checkAllMethodsForHierarchyExist(Iterator hierarchyClasses, boolean isEndVisit) {
-		while (hierarchyClasses.hasNext()) {
-			Class descendant= (Class) hierarchyClasses.next();
-			checkHierarchicalASTVisitorMethodExistsFor(descendant, isEndVisit);
-			if (!isLeaf(descendant))
-				TestHierarchicalASTVisitor.checkRequiredMethodsForNonLeaf(descendant, isEndVisit);
-		}
-	}
-
-	/**
-	 * All visit(XX) implementations in HierarchicalASTVisitor, each
-	 * corresponding to a class XX, must call visit(YY), where YY is the
-	 * superclass of YY, unless XX is ASTNode. This method verifies this using
-	 * reflection and a contrived subclass of HierarchicalASTVisitor,
-	 * TestHierarchicalASTVisitor.
-	 */
-	private void checkMethodsCallSuperclassMethod(Iterator hierarchyClasses, boolean isEndVisit) {
-		while (hierarchyClasses.hasNext()) {
-			Class descendant= (Class) hierarchyClasses.next();
-			if (!ASTNode.class.equals(descendant))
-				TestHierarchicalASTVisitor.checkMethodCallsSuperclassMethod(descendant, isLeaf(descendant), isEndVisit);
-		}
-	}
-
-	private void checkHierarchicalASTVisitorMethodExistsFor(Class nodeClass, boolean isEndVisit) {
-		Assert.isTrue(ASTNode.class.isAssignableFrom(nodeClass));
-		try {
-			HierarchicalASTVisitor.class.getDeclaredMethod(getMethodNameFor(nodeClass, isEndVisit), new Class[] { nodeClass });
-		} catch (NoSuchMethodException e) {
-			String signature= getMethodNameFor(nodeClass, isEndVisit) + "(" + getSimpleName(nodeClass) + ")";
-			assertTrue("HierarchicalASTVisitor must be updated to reflect a change in the ASTNode hierarchy.  No method " + signature + " was found in HierarchicalASTVisitor.", false);
-		}
-	}
-
-	private static String getMethodNameFor(Class clazz, boolean isEndVisit) {
-		return isEndVisit ? "endVisit" : "visit";
-	}
-
-	private static String getSuperVisitName(boolean isEndVisit) {
-		return isEndVisit ? "superEndVisit" : "superVisit";
-	}
-	
-	private static String getSimpleName(Class clazz) {
-		String qualified= clazz.getName();
-		return qualified.substring(qualified.lastIndexOf('.') + 1);
-	}
-
-	private static String getMethodSignatureFor(Class clazz, boolean isLeaf, boolean isEndVisit) {
-		return getMethodNameFor(clazz, isEndVisit) + "(" + getSimpleName(clazz) + ")";
-	}
-
-	/**
-	 * Finds the set of all descendants of <code>root</code> which are not proper descendants
-	 * of a class in the sequence <code>leaves</code>.  This will include <code>root</code>
-	 * and all the elements of <code>leaves</code>.
-	 */
-	private static Set computeAllDescendantsFromLeaves(Iterator leaves, Class root) {
-		Set all= new HashSet();
-		while (leaves.hasNext()) {
-			Class leaf= (Class) leaves.next();
-			addAllAncestorsInclusive(leaf, root, all);
-		}
-		return all;
-	}
-
-	private static void addAllAncestorsInclusive(Class from, Class to, Set set) {
-		Assert.isTrue(to.isAssignableFrom(from));
-		Assert.isTrue(!from.isInterface());
-		Assert.isTrue(!to.isInterface());
-
-		Class ancestor= from;
-		while (!ancestor.equals(to)) {
-			set.add(ancestor);
-			ancestor= ancestor.getSuperclass();
-			if (ancestor == null) {
-				Assert.isTrue(false);
-				/* not expected, given assertions passed above */
-			}
-		}
-		set.add(to);
-	}
-
-	/**
-	 * Returns all the leaf node classes (classes with no subclasses) in the
-	 * ASTNode . Since every non-leaf ASTNode descendant (incl. ASTNode)
-	 * is abstract, the set of leaf ASTNode descendants is the set of concrete
-	 * ASTNode descendants.
-	 * 
-	 * If ASTVisitor is maintained, this set will be the set of classes for which
-	 * ASTVisitor has visit(..) methods.  We use this property to compute the set,
-	 * which means that we are as up-to-date as ASTVisitor (to be more
-	 * "up-to-date" would be to require something that HierarchicalASTVisitor would,
-	 * semantically, not be able to provide anyway!).
-	 */
-	private static Set getLeafASTNodeDescendants() {
-		Set result= new HashSet();
-		Method[] methods= ASTVisitor.class.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			Method method= methods[i];
-			if (isVisitMethod(method)) {
-				result.add(method.getParameterTypes()[0]);
-			}
-		}
-		return result;
-	}
-	private static boolean isVisitMethod(Method method) {
-		if (!"visit".equals(method.getName()))
-			return false;
-
-		Class[] parameters= method.getParameterTypes();
-		return parameters.length == 1 && ASTNode.class.isAssignableFrom(parameters[0]);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java
deleted file mode 100644
index ad0040a..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java
+++ /dev/null

@@ -1,1731 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.text.Region;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.internal.corext.codemanipulation.ImportsStructure;
-import org.eclipse.jdt.internal.corext.codemanipulation.OrganizeImportsOperation;
-import org.eclipse.jdt.internal.corext.codemanipulation.OrganizeImportsOperation.IChooseImportQuery;
-import org.eclipse.jdt.internal.corext.util.TypeInfo;
-
-public class ImportOrganizeTest extends CoreTests {
-	
-	private static final Class THIS= ImportOrganizeTest.class;
-	
-	private IJavaProject fJProject1;
-
-	public ImportOrganizeTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ImportOrganizeTest("testVisibility_bug56704"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-
-	protected void setUp() throws Exception {
-		fJProject1= ProjectTestSetup.getProject();
-	
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, String.valueOf(99));
-		JavaCore.setOptions(options);
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-	
-	private IChooseImportQuery createQuery(final String name, final String[] choices, final int[] nEntries) {
-		return new IChooseImportQuery() {
-			public TypeInfo[] chooseImports(TypeInfo[][] openChoices, ISourceRange[] ranges) {
-				assertTrue(name + "-query-nchoices1", choices.length == openChoices.length);
-				assertTrue(name + "-query-nchoices2", nEntries.length == openChoices.length);
-				if (nEntries != null) {
-					for (int i= 0; i < nEntries.length; i++) {
-						assertTrue(name + "-query-cnt" + i, openChoices[i].length == nEntries[i]);
-					}
-				}
-				TypeInfo[] res= new TypeInfo[openChoices.length];
-				for (int i= 0; i < openChoices.length; i++) {
-					TypeInfo[] selection= openChoices[i];
-					assertNotNull(name + "-query-setset" + i, selection);
-					assertTrue(name + "-query-setlen" + i, selection.length > 0);
-					TypeInfo found= null;
-					for (int k= 0; k < selection.length; k++) {
-						if (selection[k].getFullyQualifiedName().equals(choices[i])) {
-							found= selection[k];
-						}
-					}
-					assertNotNull(name + "-query-notfound" + i, found);
-					res[i]= found;
-				}
-				return res;
-			}
-		};
-	}
-	
-	private void assertImports(ICompilationUnit cu, String[] imports) throws Exception {
-		IImportDeclaration[] desc= cu.getImports();
-		assertTrue(cu.getElementName() + "-count", desc.length == imports.length);
-		for (int i= 0; i < imports.length; i++) {
-			assertEquals(cu.getElementName() + "-cmpentries" + i, desc[i].getElementName(), imports[i]);
-		}
-	}
-	
-	public void test1() throws Exception {
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);
-
-		ICompilationUnit cu= (ICompilationUnit) fJProject1.findElement(new Path("junit/runner/BaseTestRunner.java"));
-		assertNotNull("BaseTestRunner.java", cu);
-		
-		IPackageFragmentRoot root= (IPackageFragmentRoot)cu.getParent().getParent();
-		IPackageFragment pack= root.createPackageFragment("mytest", true, null);
-		
-		ICompilationUnit colidingCU= pack.getCompilationUnit("TestListener.java");
-		colidingCU.createType("public abstract class TestListener {\n}\n", null, true, null);
-		
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("BaseTestRunner", new String[] { "junit.framework.TestListener" }, new int[] { 2 });
-		
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		assertImports(cu, new String[] {
-			"java.io.BufferedReader",
-			"java.io.File",
-			"java.io.FileInputStream",
-			"java.io.IOException",
-			"java.io.InputStream",
-			"java.io.PrintWriter",
-			"java.io.StringReader",
-			"java.io.StringWriter",
-			"java.lang.reflect.InvocationTargetException",
-			"java.lang.reflect.Method",
-			"java.text.NumberFormat",
-			"java.util.Properties",
-			"junit.framework.Test",
-			"junit.framework.TestListener",
-			"junit.framework.TestSuite"
-		});
-	}
-	
-	public void test1WithOrder() throws Exception {
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);
-
-		ICompilationUnit cu= (ICompilationUnit) fJProject1.findElement(new Path("junit/runner/BaseTestRunner.java"));
-		assertNotNull("BaseTestRunner.java", cu);
-
-		IPackageFragmentRoot root= (IPackageFragmentRoot)cu.getParent().getParent();
-		IPackageFragment pack= root.createPackageFragment("mytest", true, null);
-
-		ICompilationUnit colidingCU= pack.getCompilationUnit("TestListener.java");
-		colidingCU.createType("public abstract class TestListener {\n}\n", null, true, null);
-
-
-		String[] order= new String[] { "junit", "java.text", "java.io", "java" };
-		IChooseImportQuery query= createQuery("BaseTestRunner", new String[] { "junit.framework.TestListener" }, new int[] { 2 });
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		assertImports(cu, new String[] {
-			"junit.framework.Test",
-			"junit.framework.TestListener",
-			"junit.framework.TestSuite",
-			"java.text.NumberFormat",	
-			"java.io.BufferedReader",
-			"java.io.File",
-			"java.io.FileInputStream",
-			"java.io.IOException",
-			"java.io.InputStream",
-			"java.io.PrintWriter",
-			"java.io.StringReader",
-			"java.io.StringWriter",
-			"java.lang.reflect.InvocationTargetException",
-			"java.lang.reflect.Method",
-			"java.util.Properties"
-		});
-	}	
-	
-		
-	public void test2() throws Exception {
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);
-
-		ICompilationUnit cu= (ICompilationUnit) fJProject1.findElement(new Path("junit/runner/LoadingTestCollector.java"));
-		assertNotNull("LoadingTestCollector.java", cu);
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("LoadingTestCollector", new String[] { }, new int[] { });
-		
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		assertImports(cu, new String[] {
-			"java.lang.reflect.Constructor",
-			"java.lang.reflect.Method",
-			"java.lang.reflect.Modifier",
-			"junit.framework.Test"	
-		});	
-	}
-	
-	
-	public void test3() throws Exception {
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);
-
-		ICompilationUnit cu= (ICompilationUnit) fJProject1.findElement(new Path("junit/runner/TestCaseClassLoader.java"));
-		assertNotNull("TestCaseClassLoader.java", cu);
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("TestCaseClassLoader", new String[] { }, new int[] { });
-		
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 3, false, true, true, query);
-		op.run(null);
-		
-		assertImports(cu, new String[] {
-			"java.io.*",
-			"java.net.URL",
-			"java.util.*",
-			"java.util.zip.ZipEntry",
-			"java.util.zip.ZipFile",
-		});	
-	}
-		
-	public void test4() throws Exception {
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);
-
-		ICompilationUnit cu= (ICompilationUnit) fJProject1.findElement(new Path("junit/textui/TestRunner.java"));
-		assertNotNull("TestRunner.java", cu);
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("TestRunner", new String[] {}, new int[] {});
-		
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		assertImports(cu, new String[] {
-			"java.io.PrintStream",
-			"java.util.Enumeration",
-			"junit.framework.AssertionFailedError",
-			"junit.framework.Test",
-			"junit.framework.TestFailure",
-			"junit.framework.TestResult",
-			"junit.framework.TestSuite",
-			"junit.runner.BaseTestRunner",
-			"junit.runner.StandardTestSuiteLoader",
-			"junit.runner.TestSuiteLoader",
-			"junit.runner.Version"
-		});		
-	}
-	
-	public void testVariousTypeReferences() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack= sourceFolder.createPackageFragment("test", false, null);
-		for (int ch= 'A'; ch < 'M'; ch++) {
-			String name= String.valueOf((char) ch);
-			ICompilationUnit cu= pack.getCompilationUnit(name + ".java");
-			String content= "public class " + name + " {}";
-			cu.createType(content, null, false, null);
-		}
-		for (int ch= 'A'; ch < 'M'; ch++) {
-			String name= "I" + String.valueOf((char) ch);
-			ICompilationUnit cu= pack.getCompilationUnit(name + ".java");
-			String content= "public interface " + name + " {}";
-			cu.createType(content, null, false, null);
-		}		
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class ImportTest extends A implements IA, IB {\n");
-		buf.append("  private B fB;\n");
-		buf.append("  private Object fObj= new C();\n");
-		buf.append("  public IB foo(IC c, ID d) throws IOException {\n");
-		buf.append("   Object local= (D) fObj;\n");
-		buf.append("   if (local instanceof E) {};\n");
-		buf.append("   return null;\n");
-		buf.append("  }\n");
-		buf.append("}\n");
-		
-		pack= sourceFolder.createPackageFragment("other", false, null);
-		ICompilationUnit cu= pack.getCompilationUnit("ImportTest.java");
-		cu.createType(buf.toString(), null, false, null);
-
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("ImportTest", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		assertImports(cu, new String[] {
-			"java.io.IOException",
-			"test.A",
-			"test.B",
-			"test.C",
-			"test.D",
-			"test.E",			
-			"test.IA",
-			"test.IB",
-			"test.IC",
-			"test.ID",
-		});		
-	}
-	
-	public void testInnerClassVisibility() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("  protected static class C1 {\n");
-		buf.append("    public static class C2 {\n");
-		buf.append("    }\n");
-		buf.append("  }\n");
-		buf.append("}\n");	
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		IPackageFragment pack2= sourceFolder.createPackageFragment("test2", false, null);
-				
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-
-		buf.append("import test2.A.A1;\n");		
-		buf.append("import test2.A.A1.A2;\n");
-		buf.append("import test2.A.A1.A2.A3;\n");
-		buf.append("import test2.A.B1;\n");
-		buf.append("import test2.A.B1.B2;\n");
-		buf.append("import test1.C;\n");
-		buf.append("import test1.C.C1.C2;\n");
-		
-		buf.append("public class A {\n");
-		buf.append("    public static class A1 {\n");
-		buf.append("        public static class A2 {\n");
-		buf.append("            public static class A3 {\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		
-		buf.append("    public static class B1 {\n");
-		buf.append("        public static class B2 {\n");
-		buf.append("        }\n");
-		
-		buf.append("        public static class B3 {\n");
-		buf.append("            public static class B4 extends C {\n");
-		buf.append("                B4 b4;\n");
-		buf.append("                B3 b3;\n");
-		buf.append("                B2 b2;\n");
-		buf.append("                B1 b1;\n");
-		buf.append("                A1 a1;\n");
-		buf.append("                A2 a2;\n");
-		buf.append("                A3 a3;\n");
-		buf.append("                C1 c1;\n");
-		buf.append("                C2 c2;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");		
-		ICompilationUnit cu2= pack2.createCompilationUnit("A.java", buf.toString(), false, null);
-
-
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("A", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu2, order, 99, false, true, true, query);
-		op.run(null);
-		
-		assertImports(cu2, new String[] {
-			"test1.C", 
-			"test1.C.C1.C2",
-			"test2.A.A1.A2", 
-			"test2.A.A1.A2.A3"
-		});
-	}
-	
-	
-	public void testClearImports() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");		
-		buf.append("public class C {\n");
-		buf.append("}\n");	
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");	
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testNewImports() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C extends Vector {\n");
-		buf.append("}\n");	
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");			
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");						
-		buf.append("public class C extends Vector {\n");
-		buf.append("}\n");	
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testReplaceImports() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");			
-		buf.append("import java.util.Set;\n");
-		buf.append("\n");				
-		buf.append("public class C extends Vector {\n");
-		buf.append("}\n");	
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");			
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");						
-		buf.append("public class C extends Vector {\n");
-		buf.append("}\n");	
-		assertEqualString(cu.getSource(), buf.toString());
-	}	
-	
-	public void testClearImportsNoPackage() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.getPackageFragment("");
-		StringBuffer buf= new StringBuffer();
-		buf.append("import java.util.Vector;\n");		
-		buf.append("public class C {\n");
-		buf.append("}\n");	
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		buf= new StringBuffer();
-		buf.append("public class C {\n");
-		buf.append("}\n");	
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testNewImportsNoPackage() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.getPackageFragment("");
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class C extends Vector {\n");
-		buf.append("}\n");	
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		buf= new StringBuffer();
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");						
-		buf.append("public class C extends Vector {\n");
-		buf.append("}\n");	
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testReplaceImportsNoPackage() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.getPackageFragment("");
-		StringBuffer buf= new StringBuffer();
-		buf.append("import java.util.Set;\n");
-		buf.append("\n");				
-		buf.append("public class C extends Vector {\n");
-		buf.append("}\n");	
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		buf= new StringBuffer();
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");						
-		buf.append("public class C extends Vector {\n");
-		buf.append("}\n");	
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testCommentAfterImport() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\r\n");
-		buf.append("\r\n");			
-		buf.append("import x;\r\n");		
-		buf.append("import java.util.Vector; // comment\r\n");
-		buf.append("\r\n");			
-		buf.append("public class C {\r\n");
-		buf.append("    Vector v;\r\n");		
-		buf.append("}\r\n");	
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		
-		String[] order= new String[0];
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-	
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-		
-		buf= new StringBuffer();
-		buf.append("package pack1;\r\n");
-		buf.append("\r\n");		
-		buf.append("import java.util.Vector;\r\n");
-		buf.append("\r\n");			
-		buf.append("public class C {\r\n");
-		buf.append("    Vector v;\r\n");
-		buf.append("}\r\n");	
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testImportToStar() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class List {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List.java", buf.toString(), false, null);		
-		
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");		
-		buf.append("\n");		
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    String v5;\n");				
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "pack" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 2, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.*;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    String v5;\n");		
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testImportToStarWithExplicit() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class List {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class List2 {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List2.java", buf.toString(), false, null);
-
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("import pack.List2;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    List2 v5;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "pack" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 2, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.*;\n");
-		buf.append("\n");
-		buf.append("import pack.*;\n");
-		buf.append("import pack.List;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    List2 v5;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testImportToStarWithExplicit2() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class List {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List.java", buf.toString(), false, null);
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "pack" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 1, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.*;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testImportToStarWithExplicit3() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class List {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class Set {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("Set.java", buf.toString(), false, null);		
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "pack" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 1, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.*;\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testImportToStarWithExplicit4() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class List {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List.java", buf.toString(), false, null);
-		
-		IPackageFragment pack3= sourceFolder.createPackageFragment("pack3", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack3;\n");
-		buf.append("public class List {\n");
-		buf.append("}\n");
-		pack3.createCompilationUnit("List.java", buf.toString(), false, null);		
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "pack" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 1, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.*;\n");
-		buf.append("\n");
-		buf.append("import pack.List;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List v4;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}	
-	
-	
-
-	public void testImportToStarWithExplicit5() throws Exception {
-		
-		
-		// unrelated project, to fill the all types cache
-		IJavaProject project2 = JavaProjectHelper.createJavaProject("TestProject2", "bin");
-		try {
-			assertTrue("rt not found", JavaProjectHelper.addRTJar(project2) != null);
-			IPackageFragmentRoot sourceFolder2= JavaProjectHelper.addSourceContainer(project2, "src");
-		
-			IPackageFragment pack22= sourceFolder2.createPackageFragment("packx", false, null);
-			StringBuffer buf= new StringBuffer();
-			buf.append("package pack;\n");
-			buf.append("public class Vector {\n");
-			buf.append("}\n");
-			pack22.createCompilationUnit("List.java", buf.toString(), false, null);
-			
-			buf= new StringBuffer();
-			buf.append("package pack;\n");
-			buf.append("public class Set {\n");
-			buf.append("}\n");
-			pack22.createCompilationUnit("Set.java", buf.toString(), false, null);				
-			
-			IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-			IPackageFragment pack2= sourceFolder.createPackageFragment("pack", false, null);
-			buf= new StringBuffer();
-			buf.append("package pack;\n");
-			buf.append("public class List {\n");
-			buf.append("}\n");
-			pack2.createCompilationUnit("List.java", buf.toString(), false, null);
-		
-			IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-			buf= new StringBuffer();
-			buf.append("package pack1;\n");
-			buf.append("\n");
-			buf.append("import java.util.Set;\n");
-			buf.append("import java.util.Vector;\n");
-			buf.append("import java.util.Map;\n");
-			buf.append("\n");
-			buf.append("import pack.List;\n");
-			buf.append("\n");
-			buf.append("public class C {\n");
-			buf.append("    Vector v;\n");
-			buf.append("    Set v2;\n");
-			buf.append("    Map v3;\n");
-			buf.append("    List v4;\n");
-			buf.append("    String v6;\n");
-			buf.append("}\n");
-			ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		
-			String[] order= new String[] { "java", "pack" };
-			IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-		
-			OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 1, false, true, true, query);
-			op.run(null);
-		
-			buf= new StringBuffer();
-			buf.append("package pack1;\n");
-			buf.append("\n");
-			buf.append("import java.util.*;\n");
-			buf.append("\n");
-			buf.append("import pack.List;\n");
-			buf.append("\n");
-			buf.append("public class C {\n");
-			buf.append("    Vector v;\n");
-			buf.append("    Set v2;\n");
-			buf.append("    Map v3;\n");
-			buf.append("    List v4;\n");
-			buf.append("    String v6;\n");
-			buf.append("}\n");
-			assertEqualString(cu.getSource(), buf.toString());
-		} finally {
-			JavaProjectHelper.delete(project2);
-		}
-	}
-	
-	
-	public void testImportFromDefault() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class List1 {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List1.java", buf.toString(), false, null);
-
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List1 v4;\n");
-		buf.append("    String v5;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "pack" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 2, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import List1;\n");
-		buf.append("\n");	
-		buf.append("import java.util.*;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List1 v4;\n");
-		buf.append("    String v5;\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-
-	public void testImportFromDefaultWithStar() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class List1 {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List1.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("public class List2 {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List2.java", buf.toString(), false, null);
-
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Set;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List1 v4;\n");
-		buf.append("    List2 v5;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "pack" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 2, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import List1;\n");
-		buf.append("import List2;\n");
-		buf.append("\n");	
-		buf.append("import java.util.*;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    Vector v;\n");
-		buf.append("    Set v2;\n");
-		buf.append("    Map v3;\n");
-		buf.append("    List1 v4;\n");
-		buf.append("    List2 v5;\n");
-		buf.append("    String v6;\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testImportOfMemberFromLocal() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        class Local {\n");
-		buf.append("            class LocalMember {\n");
-		buf.append("            }\n");
-		buf.append("            LocalMember x;\n");
-		buf.append("            Vector v;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "pack" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");		
-		buf.append("public class C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        class Local {\n");
-		buf.append("            class LocalMember {\n");
-		buf.append("            }\n");
-		buf.append("            LocalMember x;\n");
-		buf.append("            Vector v;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testGroups1() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack0", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("public class List1 {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List1.java", buf.toString(), false, null);
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    File f;\n");
-		buf.append("    IOException f1;\n");
-		buf.append("    RandomAccessFile f2;\n");
-		buf.append("    ArrayList f3;\n");
-		buf.append("    List1 f4;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java.io", "java.util" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.io.File;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.io.RandomAccessFile;\n");
-		buf.append("\n");		
-		buf.append("import java.util.ArrayList;\n");						
-		buf.append("\n");
-		buf.append("import pack0.List1;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    File f;\n");
-		buf.append("    IOException f1;\n");
-		buf.append("    RandomAccessFile f2;\n");
-		buf.append("    ArrayList f3;\n");
-		buf.append("    List1 f4;\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testBaseGroups1() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack0", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("public class List1 {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("List1.java", buf.toString(), false, null);
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    File f;\n");
-		buf.append("    IOException f1;\n");
-		buf.append("    RandomAccessFile f2;\n");
-		buf.append("    ArrayList f3;\n");
-		buf.append("    List1 f4;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] { "java", "java.io" };
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("\n");
-		buf.append("import java.io.File;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.io.RandomAccessFile;\n");
-		buf.append("\n");
-		buf.append("import pack0.List1;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("    File f;\n");
-		buf.append("    IOException f1;\n");
-		buf.append("    RandomAccessFile f2;\n");
-		buf.append("    ArrayList f3;\n");
-		buf.append("    List1 f4;\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testVisibility_bug26746() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack0", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("public interface MyInterface {\n");
-		buf.append("	public interface MyInnerInterface {\n");
-		buf.append("	}\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("MyInterface.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("\n");
-		buf.append("import pack0.MyInterface.MyInnerInterface;\n");
-		buf.append("public class MyClass implements MyInterface {\n");
-		buf.append("	public MyInnerInterface myMethod() {\n");
-		buf.append("		return null;\n");
-		buf.append("	}\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack2.createCompilationUnit("MyClass.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] {};
-		IChooseImportQuery query= createQuery("MyClass", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("\n");
-		buf.append("public class MyClass implements MyInterface {\n");
-		buf.append("	public MyInnerInterface myMethod() {\n");
-		buf.append("		return null;\n");
-		buf.append("	}\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testVisibility_bug37299a() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("public class ClusterSingletonStepped {\n");
-		buf.append("	public interface SingletonStep {\n");
-		buf.append("	}\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("ClusterSingletonStepped.java", buf.toString(), false, null);
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack0", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("\n");
-		buf.append("import pack1.ClusterSingletonStepped;\n");
-		buf.append("import pack1.ClusterSingletonStepped.SingletonStep;\n");
-		buf.append("\n");
-		buf.append("public class TestFile extends ClusterSingletonStepped implements SingletonStep {\n");
-		buf.append("    SingletonStep step;\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack2.createCompilationUnit("TestFile.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] {};
-		IChooseImportQuery query= createQuery("TestFile", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("\n");
-		buf.append("import pack1.ClusterSingletonStepped;\n");
-		buf.append("import pack1.ClusterSingletonStepped.SingletonStep;\n");
-		buf.append("\n");
-		buf.append("public class TestFile extends ClusterSingletonStepped implements SingletonStep {\n");
-		buf.append("    SingletonStep step;\n");	
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testVisibility_bug37299b() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("public class ClusterSingletonStepped {\n");
-		buf.append("	public interface SingletonStep {\n");
-		buf.append("	}\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("ClusterSingletonStepped.java", buf.toString(), false, null);
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack0", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("\n");
-		buf.append("import pack1.ClusterSingletonStepped;\n");
-		buf.append("import pack1.ClusterSingletonStepped.SingletonStep;\n");
-		buf.append("\n");
-		buf.append("public class TestFile extends ClusterSingletonStepped {\n");
-		buf.append("    SingletonStep step;\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack2.createCompilationUnit("TestFile.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] {};
-		IChooseImportQuery query= createQuery("TestFile", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("\n");
-		buf.append("import pack1.ClusterSingletonStepped;\n");
-		buf.append("\n");
-		buf.append("public class TestFile extends ClusterSingletonStepped {\n");
-		buf.append("    SingletonStep step;\n");	
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testVisibility_bug56704() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack2= sourceFolder.createPackageFragment("pack0", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("public class A {\n");
-		buf.append("	public class AX {\n");
-		buf.append("	}\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("\n");
-		buf.append("import pack0.A.AX;\n");
-		buf.append("public class B extends A {\n");
-		buf.append("	public class BX extends AX {\n");
-		buf.append("	}\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack2.createCompilationUnit("B.java", buf.toString(), false, null);
-
-
-		String[] order= new String[] {};
-		IChooseImportQuery query= createQuery("MyClass", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack0;\n");
-		buf.append("\n");
-		buf.append("public class B extends A {\n");
-		buf.append("	public class BX extends AX {\n");
-		buf.append("	}\n");
-		buf.append("}\n");
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-
-	
-	
-	public void test5() throws Exception {
-	
-		String[] types= new String[] {
-			"org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader",
-			"org.eclipse.core.resources.IContainer",
-			"org.eclipse.core.runtime.IPath",
-			"org.eclipse.core.runtime.CoreException",
-			"org.eclipse.core.resources.IResource",
-			"org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer"
-		};
-		String[] order= new String[] { "org.eclipse.jdt", "org.eclipse" };
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		for (int i= 0; i < types.length; i++) {
-			String pack= Signature.getQualifier(types[i]);
-			String name= Signature.getSimpleName(types[i]);
-			
-			IPackageFragment pack2= sourceFolder.createPackageFragment(pack, false, null);
-			StringBuffer buf= new StringBuffer();
-			buf.append("package "); buf.append(pack); buf.append(";\n");
-			buf.append("public class "); buf.append(name); buf.append(" {\n");
-			buf.append("}\n");
-			pack2.createCompilationUnit(name + ".java", buf.toString(), false, null);		
-		}
-	
-		StringBuffer body= new StringBuffer();
-		body.append("public class C {\n");
-		for (int i= 0; i < types.length; i++) {
-			String name= Signature.getSimpleName(types[i]);
-			body.append(name); body.append(" a"); body.append(i); body.append(";\n");
-		}
-		body.append("}\n");		
-	
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append(body.toString());
-		
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, 99, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");		
-		buf.append("import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;\n");
-		buf.append("import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\n");
-		buf.append("\n");
-		buf.append("import org.eclipse.core.resources.IContainer;\n");
-		buf.append("import org.eclipse.core.resources.IResource;\n");
-		buf.append("import org.eclipse.core.runtime.CoreException;\n");
-		buf.append("import org.eclipse.core.runtime.IPath;\n");
-		buf.append("\n");
-		buf.append(body.toString());
-		
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void test_bug25773() throws Exception {
-
-		String[] types= new String[] {
-			"java.util.Vector",
-			"java.util.Map",
-			"java.util.Set",
-			"org.eclipse.gef.X1",
-			"org.eclipse.gef.X2",
-			"org.eclipse.gef.X3",						
-			"org.eclipse.core.runtime.IAdaptable",
-			"org.eclipse.draw2d.IFigure",
-			"org.eclipse.draw2d.LayoutManager",			
-			"org.eclipse.draw2d.geometry.Point",
-			"org.eclipse.draw2d.geometry.Rectangle",
-			"org.eclipse.swt.accessibility.ACC",
-			"org.eclipse.swt.accessibility.AccessibleControlEvent"
-		};
-		
-		String[] order= new String[] { "java", "org.eclipse", "org.eclipse.gef", "org.eclipse.draw2d", "org.eclipse.gef.examples" };
-		int threshold= 3;
-
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		for (int i= 0; i < types.length; i++) {
-			String pack= Signature.getQualifier(types[i]);
-			if (!pack.startsWith("java.")) {
-				String name= Signature.getSimpleName(types[i]);
-	
-				IPackageFragment pack2= sourceFolder.createPackageFragment(pack, false, null);
-				StringBuffer buf= new StringBuffer();
-				buf.append("package "); buf.append(pack); buf.append(";\n");
-				buf.append("public class "); buf.append(name); buf.append(" {\n");
-				buf.append("}\n");
-				pack2.createCompilationUnit(name + ".java", buf.toString(), false, null);
-			}
-		}
-
-		StringBuffer body= new StringBuffer();
-		body.append("public class C {\n");
-		for (int i= 0; i < types.length; i++) {
-			String name= Signature.getSimpleName(types[i]);
-			body.append(name); body.append(" a"); body.append(i); body.append(";\n");
-		}
-		body.append("}\n");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append(body.toString());
-
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, threshold, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import java.util.*;\n");
-		buf.append("\n");
-		buf.append("import org.eclipse.core.runtime.IAdaptable;\n");
-		buf.append("import org.eclipse.swt.accessibility.ACC;\n");
-		buf.append("import org.eclipse.swt.accessibility.AccessibleControlEvent;\n");
-		buf.append("\n");		
-		buf.append("import org.eclipse.gef.*;\n");
-		buf.append("\n");
-		buf.append("import org.eclipse.draw2d.IFigure;\n");
-		buf.append("import org.eclipse.draw2d.LayoutManager;\n");
-		buf.append("import org.eclipse.draw2d.geometry.Point;\n");
-		buf.append("import org.eclipse.draw2d.geometry.Rectangle;\n");
-		buf.append("\n");
-		buf.append(body.toString());
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void test_bug25113() throws Exception {
-
-		String[] types= new String[] {
-			"com.mycompany.Class1",
-			"com.foreigncompany.Class2",
-			"com.foreigncompany.Class3",
-			"com.mycompany.Class4",
-			"com.misc.Class5"
-		};
-
-		String[] order= new String[] { "com", "com.foreigncompany", "com.mycompany" };
-		int threshold= 99;
-
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		for (int i= 0; i < types.length; i++) {
-			String pack= Signature.getQualifier(types[i]);
-			if (!pack.startsWith("java.")) {
-				String name= Signature.getSimpleName(types[i]);
-
-				IPackageFragment pack2= sourceFolder.createPackageFragment(pack, false, null);
-				StringBuffer buf= new StringBuffer();
-				buf.append("package "); buf.append(pack); buf.append(";\n");
-				buf.append("public class "); buf.append(name); buf.append(" {\n");
-				buf.append("}\n");
-				pack2.createCompilationUnit(name + ".java", buf.toString(), false, null);
-			}
-		}
-
-		StringBuffer body= new StringBuffer();
-		body.append("public class C {\n");
-		for (int i= 0; i < types.length; i++) {
-			String name= Signature.getSimpleName(types[i]);
-			body.append(name); body.append(" a"); body.append(i); body.append(";\n");
-		}
-		body.append("}\n");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append(body.toString());
-
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		IChooseImportQuery query= createQuery("C", new String[] {}, new int[] {});
-
-		OrganizeImportsOperation op= new OrganizeImportsOperation(cu, order, threshold, false, true, true, query);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("import com.misc.Class5;\n");
-		buf.append("\n");
-		buf.append("import com.foreigncompany.Class2;\n");
-		buf.append("import com.foreigncompany.Class3;\n");
-		buf.append("\n");
-		buf.append("import com.mycompany.Class1;\n");
-		buf.append("import com.mycompany.Class4;\n");
-		buf.append("\n");
-		buf.append(body.toString());
-		assertEqualString(cu.getSource(), buf.toString());
-	}
-	
-	public void testImportStructureOnNonExistingCU() throws Exception {
-	
-		IJavaProject project1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(project1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		ICompilationUnit unit= pack1.getCompilationUnit("A.java");
-		unit.becomeWorkingCopy(null, null);
-		try {
-			StringBuffer buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("public class A {\n");
-			buf.append("    public Object foo() {\n");
-			buf.append("    }\n");
-			buf.append("}\n");	
-			unit.getBuffer().setContents(buf.toString());
-			
-			String[] order= new String[] { "com", "com.foreigncompany", "com.mycompany" };
-			int threshold= 99;
-	
-			ImportsStructure importsStructure= new ImportsStructure(unit, order, threshold, true);
-			importsStructure.addImport("java.util.HashMap");
-			importsStructure.create(false, null);
-	
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.util.HashMap;\n");
-			buf.append("\n");		
-			buf.append("public class A {\n");
-			buf.append("    public Object foo() {\n");
-			buf.append("    }\n");
-			buf.append("}\n");	
-			
-			assertEqualStringIgnoreDelim(unit.getSource(), buf.toString());
-		} finally {
-			unit.discardWorkingCopy();
-		}
-	}
-	
-	public void testOrganizeImportOnRange() throws Exception {
-	
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("        HashMap map;\n");
-		buf.append("        /*b*/\n");
-		buf.append("        Iterator iter= ((Collection) vec).iterator();\n");
-		buf.append("        /*e*/\n");
-		buf.append("    }\n");
-		buf.append("}\n");	
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", content, false, null);
-
-		int start= content.indexOf("/*b*/");
-		int end= content.indexOf("/*e*/");
-		Region sel= new Region(start, end);
-
-		String[] order= new String[] { };
-		int threshold= 99;
-				
-		ImportsStructure structure= new ImportsStructure(cu, order, threshold, true);
-		OrganizeImportsOperation op= new OrganizeImportsOperation(structure, sel, true, true, null);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Collection;\n");
-		buf.append("import java.util.Iterator;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("        HashMap map;\n");
-		buf.append("        /*b*/\n");
-		buf.append("        Iterator iter= ((Collection) vec).iterator();\n");
-		buf.append("        /*e*/\n");
-		buf.append("    }\n");
-		buf.append("}\n");	
-		assertEqualStringIgnoreDelim(cu.getSource(), buf.toString());
-
-	}
-	
-	public void testOrganizeImportOnRange2() throws Exception {
-	
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("        /*b*/HashMap map;\n");
-		buf.append("    }\n");
-		buf.append("}\n");	
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", content, false, null);
-
-		int start= content.indexOf("/*b*/");
-		Region sel= new Region(start, 5);
-
-		String[] order= new String[] { };
-		int threshold= 99;
-				
-		ImportsStructure structure= new ImportsStructure(cu, order, threshold, true);
-		OrganizeImportsOperation op= new OrganizeImportsOperation(structure, sel, true, true, null);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("        /*b*/HashMap map;\n");
-		buf.append("    }\n");
-		buf.append("}\n");	
-		assertEqualStringIgnoreDelim(cu.getSource(), buf.toString());
-		
-		sel= new Region(start, 9);
-		
-		structure= new ImportsStructure(cu, order, threshold, true);
-		op= new OrganizeImportsOperation(structure, sel, true, true, null);
-		op.run(null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.HashMap;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Map;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("        /*b*/HashMap map;\n");
-		buf.append("    }\n");
-		buf.append("}\n");	
-		assertEqualStringIgnoreDelim(cu.getSource(), buf.toString());		
-
-	}			
-	
-		
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/JavaElementLabelsTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/JavaElementLabelsTest.java
deleted file mode 100644
index b4440ab..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/JavaElementLabelsTest.java
+++ /dev/null

@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.ui.viewsupport.JavaElementLabels;
-
-public class JavaElementLabelsTest extends CoreTests {
-	
-	private static final Class THIS= JavaElementLabelsTest.class;
-	
-	private IJavaProject fJProject1;
-
-	public JavaElementLabelsTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new JavaElementLabelsTest("testOrganizeImportOnRange2"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-
-	protected void setUp() throws Exception {
-		fJProject1= ProjectTestSetup.getProject();
-		
-		IPreferenceStore store= PreferenceConstants.getPreferenceStore();
-		store.setValue(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES, false);
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-		
-	public void testTypeLabelOuter() throws Exception {
-	
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("org.test", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package org.test;\n");
-		buf.append("public class Outer {\n");
-		buf.append("}\n");	
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("Outer.java", content, false, null);
-
-		IJavaElement elem= cu.getElementAt(content.indexOf("Outer"));
-		String lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED);
-		assertEqualString(lab, "org.test.Outer");
-
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_CONTAINER_QUALIFIED);
-		assertEqualString(lab, "Outer");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_POST_QUALIFIED);
-		assertEqualString(lab, "Outer - org.test");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.APPEND_ROOT_PATH);
-		assertEqualString(lab, "org.test.Outer - TestSetupProject/src");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.PREPEND_ROOT_PATH);
-		assertEqualString(lab, "TestSetupProject/src - org.test.Outer");
-	}
-	
-	public void testTypeLabelInner() throws Exception {
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("org.test", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package org.test;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class Outer {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("    }\n");
-		buf.append("    public class Inner {\n");
-		buf.append("        public int inner(Vector vec) {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");	
-		buf.append("}\n");	
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("Outer.java", content, false, null);
-
-		IJavaElement elem= cu.getElementAt(content.indexOf("Inner"));
-		String lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED);
-		assertEqualString(lab, "org.test.Outer.Inner");
-
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_CONTAINER_QUALIFIED);
-		assertEqualString(lab, "Outer.Inner");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_POST_QUALIFIED);
-		assertEqualString(lab, "Inner - org.test.Outer");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.APPEND_ROOT_PATH);
-		assertEqualString(lab, "org.test.Outer.Inner - TestSetupProject/src");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.PREPEND_ROOT_PATH);
-		assertEqualString(lab, "TestSetupProject/src - org.test.Outer.Inner");
-	}
-	
-	public void testTypeLabelLocal() throws Exception {
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("org.test", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package org.test;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class Outer {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("        public class Local {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");	
-		buf.append("}\n");	
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("Outer.java", content, false, null);
-
-		IJavaElement elem= cu.getElementAt(content.indexOf("Local"));
-		String lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED);
-		assertEqualString(lab, "org.test.Outer.foo(..).Local");
-
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_CONTAINER_QUALIFIED);
-		assertEqualString(lab, "Outer.foo(..).Local");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_POST_QUALIFIED);
-		assertEqualString(lab, "Local - org.test.Outer.foo(..)");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.APPEND_ROOT_PATH);
-		assertEqualString(lab, "org.test.Outer.foo(..).Local - TestSetupProject/src");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.PREPEND_ROOT_PATH);
-		assertEqualString(lab, "TestSetupProject/src - org.test.Outer.foo(..).Local");
-	}
-	
-	public void testTypeLabelAnonymous() throws Exception {
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("org.test", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package org.test;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class Outer {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("        new Object() {\n");
-		buf.append("        };\n");
-		buf.append("    }\n");	
-		buf.append("}\n");	
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("Outer.java", content, false, null);
-
-		IJavaElement elem= cu.getElementAt(content.indexOf("Object"));
-		String lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED);
-		assertEqualString(lab, "org.test.Outer.foo(..).new Object() {..}");
-
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_CONTAINER_QUALIFIED);
-		assertEqualString(lab, "Outer.foo(..).new Object() {..}");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_POST_QUALIFIED);
-		assertEqualString(lab, "new Object() {..} - org.test.Outer.foo(..)");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.APPEND_ROOT_PATH);
-		assertEqualString(lab, "org.test.Outer.foo(..).new Object() {..} - TestSetupProject/src");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.PREPEND_ROOT_PATH);
-		assertEqualString(lab, "TestSetupProject/src - org.test.Outer.foo(..).new Object() {..}");
-	}
-	
-	public void testTypeLabelAnonymousInAnonymous() throws Exception {
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("org.test", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package org.test;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class Outer {\n");
-		buf.append("    public void foo(Vector vec) {\n");
-		buf.append("        new Object() {\n");
-		buf.append("            public void xoo() {\n");
-		buf.append("                new Serializable() {\n");
-		buf.append("                };\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");	
-		buf.append("}\n");	
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("Outer.java", content, false, null);
-
-		IJavaElement elem= cu.getElementAt(content.indexOf("Serializable"));
-		String lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED);
-		assertEqualString(lab, "org.test.Outer.foo(..).new Object() {..}.xoo().new Serializable() {..}");
-
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_CONTAINER_QUALIFIED);
-		assertEqualString(lab, "Outer.foo(..).new Object() {..}.xoo().new Serializable() {..}");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_POST_QUALIFIED);
-		assertEqualString(lab, "new Serializable() {..} - org.test.Outer.foo(..).new Object() {..}.xoo()");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.APPEND_ROOT_PATH);
-		assertEqualString(lab, "org.test.Outer.foo(..).new Object() {..}.xoo().new Serializable() {..} - TestSetupProject/src");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.PREPEND_ROOT_PATH);
-		assertEqualString(lab, "TestSetupProject/src - org.test.Outer.foo(..).new Object() {..}.xoo().new Serializable() {..}");
-	}
-	
-	public void testTypeLabelAnonymousInFieldInitializer() throws Exception {
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("org.test", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package org.test;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class Outer {\n");
-		buf.append("    Object o= new Thread() {\n");
-		buf.append("    };\n");	
-		buf.append("}\n");	
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("Outer.java", content, false, null);
-
-		IJavaElement elem= cu.getElementAt(content.indexOf("Thread"));
-		String lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED);
-		assertEqualString(lab, "org.test.Outer.o.new Thread() {..}");
-
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_CONTAINER_QUALIFIED);
-		assertEqualString(lab, "Outer.o.new Thread() {..}");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_POST_QUALIFIED);
-		assertEqualString(lab, "new Thread() {..} - org.test.Outer.o");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.APPEND_ROOT_PATH);
-		assertEqualString(lab, "org.test.Outer.o.new Thread() {..} - TestSetupProject/src");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.PREPEND_ROOT_PATH);
-		assertEqualString(lab, "TestSetupProject/src - org.test.Outer.o.new Thread() {..}");
-	}
-	
-	public void testTypeLabelAnonymousInInitializer() throws Exception {
-		
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		IPackageFragment pack1= sourceFolder.createPackageFragment("org.test", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package org.test;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class Outer {\n");
-		buf.append("    static {\n");
-		buf.append("        new Object() {\n");
-		buf.append("        };\n");
-		buf.append("    }\n");	
-		buf.append("}\n");		
-		String content= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("Outer.java", content, false, null);
-
-		IJavaElement elem= cu.getElementAt(content.indexOf("Object"));
-		String lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED);
-		assertEqualString(lab, "org.test.Outer.{...}.new Object() {..}");
-
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_CONTAINER_QUALIFIED);
-		assertEqualString(lab, "Outer.{...}.new Object() {..}");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_POST_QUALIFIED);
-		assertEqualString(lab, "new Object() {..} - org.test.Outer.{...}");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.APPEND_ROOT_PATH);
-		assertEqualString(lab, "org.test.Outer.{...}.new Object() {..} - TestSetupProject/src");
-		
-		lab= JavaElementLabels.getTextLabel(elem, JavaElementLabels.T_FULLY_QUALIFIED | JavaElementLabels.PREPEND_ROOT_PATH);
-		assertEqualString(lab, "TestSetupProject/src - org.test.Outer.{...}.new Object() {..}");
-	}
-			
-	
-		
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/JavaModelUtilTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/JavaModelUtilTest.java
deleted file mode 100644
index 9f7f960..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/JavaModelUtilTest.java
+++ /dev/null

@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.Signature;
-
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
-
-public class JavaModelUtilTest extends TestCase {
-	
-	private static final Class THIS= JavaModelUtilTest.class;
-	
-	private IJavaProject fJProject1;
-	private IJavaProject fJProject2;
-
-	private boolean fEnableAutoBuildAfterTesting;
-
-	private static final IPath LIB= new Path("testresources/mylib.jar");
-
-	public JavaModelUtilTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new JavaModelUtilTest("testFindType"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-
-	protected void setUp() throws Exception {
-		IWorkspace workspace= JavaTestPlugin.getWorkspace();
-		assertNotNull(workspace);
-
-		// disable auto-build
-		IWorkspaceDescription workspaceDesc= workspace.getDescription();
-		if (workspaceDesc.isAutoBuilding()) {
-			fEnableAutoBuildAfterTesting= true;
-			JavaProjectHelper.setAutoBuilding(false);
-		}
-		
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		fJProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");
-
-		IPackageFragmentRoot jdk= JavaProjectHelper.addVariableRTJar(fJProject1, "JRE_LIB_TEST", null, null);
-		assertTrue("jdk not found", jdk != null);
-
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());
-
-		JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);
-
-		File mylibJar= JavaTestPlugin.getDefault().getFileInPlugin(LIB);
-		assertTrue("lib not found", junitSrcArchive != null && junitSrcArchive.exists());
-		
-		JavaProjectHelper.addLibraryWithImport(fJProject1, new Path(mylibJar.getPath()), null, null);
-
-		JavaProjectHelper.addVariableEntry(fJProject2, new Path("JRE_LIB_TEST"), null, null);
-
-		IPackageFragmentRoot root1= JavaProjectHelper.addSourceContainer(fJProject2, "src");
-		IPackageFragment pack1= root1.createPackageFragment("pack1", true, null);
-		
-		ICompilationUnit cu1= pack1.getCompilationUnit("ReqProjType.java");
-		cu1.createType("public class ReqProjType { static class Inner { static class InnerInner {} }\n}\n", null, true, null);
-
-		JavaProjectHelper.addRequiredProject(fJProject1, fJProject2);
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fJProject1);
-		JavaProjectHelper.delete(fJProject2);
-
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-	}
-
-
-	private void assertElementName(String name, IJavaElement elem, int type) {
-		assertNotNull(name, elem);
-		assertEquals(name + "-name", name, elem.getElementName());
-		assertTrue(name + "-type", type == elem.getElementType());
-	}
-
-	public void testFindType() throws Exception {
-		IType type= JavaModelUtil.findType(fJProject1, "junit.extensions.ExceptionTestCase");
-		assertElementName("ExceptionTestCase", type, IJavaElement.TYPE);
-
-		type= JavaModelUtil.findType(fJProject1, "junit.samples.money.IMoney");
-		assertElementName("IMoney", type, IJavaElement.TYPE);	
-
-		type= JavaModelUtil.findType(fJProject1, "junit.tests.TestCaseTest.TornDown");
-		assertElementName("TornDown", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "mylib.Foo");
-		assertElementName("Foo", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "mylib.Foo.FooInner");
-		assertElementName("FooInner", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "mylib.Foo.FooInner.FooInnerInner");
-		assertElementName("FooInnerInner", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "pack1.ReqProjType");
-		assertElementName("ReqProjType", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "pack1.ReqProjType.Inner");
-		assertElementName("Inner", type, IJavaElement.TYPE);	
-
-		type= JavaModelUtil.findType(fJProject1, "pack1.ReqProjType.Inner.InnerInner");
-		assertElementName("InnerInner", type, IJavaElement.TYPE);	
-	}
-	
-	/**
-	 * @deprecated Tests a deprecated method
-	 */
-	public void testFindType2() throws Exception {
-		IType type= JavaModelUtil.findType(fJProject1, "junit.extensions", "ExceptionTestCase");
-		assertElementName("ExceptionTestCase", type, IJavaElement.TYPE);
-
-		type= JavaModelUtil.findType(fJProject1, "junit.samples.money" , "IMoney");
-		assertElementName("IMoney", type, IJavaElement.TYPE);	
-
-		type= JavaModelUtil.findType(fJProject1, "junit.tests", "TestCaseTest.TornDown");
-		assertElementName("TornDown", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "mylib" , "Foo");
-		assertElementName("Foo", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "mylib", "Foo.FooInner");
-		assertElementName("FooInner", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "mylib", "Foo.FooInner.FooInnerInner");
-		assertElementName("FooInnerInner", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "pack1", "ReqProjType");
-		assertElementName("ReqProjType", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findType(fJProject1, "pack1", "ReqProjType.Inner");
-		assertElementName("Inner", type, IJavaElement.TYPE);	
-
-		type= JavaModelUtil.findType(fJProject1, "pack1", "ReqProjType.Inner.InnerInner");
-		assertElementName("InnerInner", type, IJavaElement.TYPE);				
-	}
-	
-	public void testFindTypeContainer() throws Exception {
-		IJavaElement elem= JavaModelUtil.findTypeContainer(fJProject1, "junit.extensions");
-		assertElementName("junit.extensions", elem, IJavaElement.PACKAGE_FRAGMENT);
-
-		elem= JavaModelUtil.findTypeContainer(fJProject1, "junit.tests.TestCaseTest");
-		assertElementName("TestCaseTest", elem, IJavaElement.TYPE);
-		
-		elem= JavaModelUtil.findTypeContainer(fJProject1, "mylib" );
-		assertElementName("mylib", elem, IJavaElement.PACKAGE_FRAGMENT);
-		
-		elem= JavaModelUtil.findTypeContainer(fJProject1, "mylib.Foo");
-		assertElementName("Foo", elem, IJavaElement.TYPE);
-		
-		elem= JavaModelUtil.findTypeContainer(fJProject1, "mylib.Foo.FooInner");
-		assertElementName("FooInner", elem, IJavaElement.TYPE);
-		
-		elem= JavaModelUtil.findTypeContainer(fJProject1, "pack1");
-		assertElementName("pack1", elem, IJavaElement.PACKAGE_FRAGMENT);
-		
-		elem= JavaModelUtil.findTypeContainer(fJProject1, "pack1.ReqProjType");
-		assertElementName("ReqProjType", elem, IJavaElement.TYPE);	
-
-		elem= JavaModelUtil.findTypeContainer(fJProject1, "pack1.ReqProjType.Inner");
-		assertElementName("Inner", elem, IJavaElement.TYPE);				
-	}
-	
-	public void testFindTypeInCompilationUnit() throws Exception {
-		ICompilationUnit cu= (ICompilationUnit) fJProject1.findElement(new Path("junit/tests/TestCaseTest.java"));
-		assertElementName("TestCaseTest.java", cu, IJavaElement.COMPILATION_UNIT);
-		
-		IType type= JavaModelUtil.findTypeInCompilationUnit(cu, "TestCaseTest");
-		assertElementName("TestCaseTest", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findTypeInCompilationUnit(cu, "TestCaseTest.TornDown");
-		assertElementName("TornDown", type, IJavaElement.TYPE);
-		
-		cu= (ICompilationUnit) fJProject1.findElement(new Path("pack1/ReqProjType.java"));
-		assertElementName("ReqProjType.java", cu, IJavaElement.COMPILATION_UNIT);
-		
-		type= JavaModelUtil.findTypeInCompilationUnit(cu, "ReqProjType");
-		assertElementName("ReqProjType", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findTypeInCompilationUnit(cu, "ReqProjType.Inner");
-		assertElementName("Inner", type, IJavaElement.TYPE);
-		
-		type= JavaModelUtil.findTypeInCompilationUnit(cu, "ReqProjType.Inner.InnerInner");
-		assertElementName("InnerInner", type, IJavaElement.TYPE);		
-	}
-	
-	public void testFindMemberInCompilationUnit() throws Exception {
-		ICompilationUnit cu= (ICompilationUnit) fJProject1.findElement(new Path("junit/tests/TestCaseTest.java"));
-		assertElementName("TestCaseTest.java", cu, IJavaElement.COMPILATION_UNIT);
-		ArrayList children= new ArrayList();
-		
-		IType type= JavaModelUtil.findTypeInCompilationUnit(cu, "TestCaseTest");
-		assertElementName("TestCaseTest", type, IJavaElement.TYPE);
-		
-		children.addAll(Arrays.asList(type.getChildren()));
-		
-		type= JavaModelUtil.findTypeInCompilationUnit(cu, "TestCaseTest.TornDown");
-		assertElementName("TornDown", type, IJavaElement.TYPE);
-		
-		children.addAll(Arrays.asList(type.getChildren()));
-		
-		assertTrue("a", children.size() == 19);
-
-		for (int i= 0; i < children.size(); i++) {
-			Object curr= children.get(i);
-			assertTrue("b", curr instanceof IMember);
-			IMember member= JavaModelUtil.findMemberInCompilationUnit(cu, (IMember) curr);
-			assertEquals("b-" + i, curr, member);
-		}
-	}
-	
-	private void assertClasspathEntry(String name, IJavaElement elem, IPath path, int type) throws Exception {
-		IPackageFragmentRoot root= JavaModelUtil.getPackageFragmentRoot(elem);
-		assertNotNull(name + "-noroot", root);
-		IClasspathEntry entry= root.getRawClasspathEntry();
-		assertNotNull(name + "-nocp", entry);
-		assertEquals(name + "-wrongpath", entry.getPath(), path);
-		assertTrue(name + "-wrongtype", type == entry.getEntryKind());
-	}
-	
-	public void testGetRawClasspathEntry() throws Exception {
-		IType type= JavaModelUtil.findType(fJProject1, "junit.extensions.ExceptionTestCase");
-		assertElementName("ExceptionTestCase", type, IJavaElement.TYPE);
-		IPath path= fJProject1.getProject().getFullPath().append("src");
-		assertClasspathEntry("ExceptionTestCase", type, path, IClasspathEntry.CPE_SOURCE);
-		
-		type= JavaModelUtil.findType(fJProject1, "mylib.Foo");
-		assertElementName("Foo", type, IJavaElement.TYPE);
-		path= fJProject1.getProject().getFullPath().append(LIB.lastSegment());
-		assertClasspathEntry("Foo", type, path, IClasspathEntry.CPE_LIBRARY);
-		
-		type= JavaModelUtil.findType(fJProject1, "java.lang.Object");
-		assertElementName("Object", type, IJavaElement.TYPE);
-		path= new Path("JRE_LIB_TEST");
-		assertClasspathEntry("Object", type, path, IClasspathEntry.CPE_VARIABLE);
-	
-		type= JavaModelUtil.findType(fJProject1, "pack1.ReqProjType");
-		assertElementName("ReqProjType", type, IJavaElement.TYPE);
-		path= fJProject2.getProject().getFullPath().append("src");
-		assertClasspathEntry("ReqProjType", type, path, IClasspathEntry.CPE_SOURCE);		
-	}
-
-	/**
-	 * @deprecated Tests a deprecated method
-	 */	
-	public void testIsOnBuildPath() throws Exception {
-		IType type= JavaModelUtil.findType(fJProject1, "junit.extensions.ExceptionTestCase");
-		assertElementName("ExceptionTestCase", type, IJavaElement.TYPE);
-		assertTrue("ExceptionTestCase-bp1", JavaModelUtil.isOnBuildPath(fJProject1, type));
-		assertTrue("ExceptionTestCase-bp2", !JavaModelUtil.isOnBuildPath(fJProject2, type));
-		
-		type= JavaModelUtil.findType(fJProject1, "java.lang.Object");
-		assertElementName("Object", type, IJavaElement.TYPE);		
-		assertTrue("Object-bp1", JavaModelUtil.isOnBuildPath(fJProject1, type));
-		// relies on shared objects for library entries
-		assertTrue("Object-bp2", JavaModelUtil.isOnBuildPath(fJProject2, type));			
-		
-		type= JavaModelUtil.findType(fJProject1, "pack1.ReqProjType");
-		assertElementName("ReqProjType", type, IJavaElement.TYPE);
-		assertTrue("ReqProjType-bp1", JavaModelUtil.isOnBuildPath(fJProject1, type));
-		// relies on shared objects for project entries
-		assertTrue("ReqProjType-bp2", JavaModelUtil.isOnBuildPath(fJProject2, type));		
-	}
-	
-	private void assertFindMethod(String methName, String[] paramTypeNames, boolean isConstructor, IType type) throws Exception {
-		String[] sig= new String[paramTypeNames.length];
-		for (int i= 0; i < paramTypeNames.length; i++) {
-			// create as unresolved
-			String name= Signature.getSimpleName(paramTypeNames[i]);
-			sig[i]= Signature.createTypeSignature(name, false);
-			assertNotNull(methName + "-ts1" + i, sig[i]);
-		}
-		IMethod meth= JavaModelUtil.findMethod(methName, sig, isConstructor, type);
-		assertElementName(methName, meth, IJavaElement.METHOD);
-		assertTrue("methName-nparam1", meth.getParameterTypes().length == paramTypeNames.length);
-		
-		for (int i= 0; i < paramTypeNames.length; i++) {
-			// create as resolved
-			sig[i]= Signature.createTypeSignature(paramTypeNames[i], true);
-			assertNotNull(methName + "-ts2" + i, sig[i]);
-		}		
-		meth= JavaModelUtil.findMethod(methName, sig, isConstructor, type);
-		assertElementName(methName, meth, IJavaElement.METHOD);
-		assertTrue("methName-nparam2", meth.getParameterTypes().length == paramTypeNames.length);
-	}
-	
-	public void testFindMethod() throws Exception {
-		IType type= JavaModelUtil.findType(fJProject1, "junit.framework.Assert");
-		assertElementName("Assert", type, IJavaElement.TYPE);
-		
-		assertFindMethod("assertNotNull", new String[] { "java.lang.Object" }, false, type);
-		assertFindMethod("assertNotNull", new String[] { "java.lang.String", "java.lang.Object" }, false, type);
-		assertFindMethod("assertEquals", new String[] { "java.lang.String", "double", "double", "double" }, false, type);
-		assertFindMethod("assertEquals", new String[] { "java.lang.String", "long", "long" }, false, type);
-		assertFindMethod("Assert", new String[0], true, type);
-
-		type= JavaModelUtil.findType(fJProject1, "junit.samples.money.MoneyTest");
-		assertElementName("MoneyTest", type, IJavaElement.TYPE);
-
-		assertFindMethod("main", new String[] { "java.lang.String[]" }, false, type);
-		assertFindMethod("setUp", new String[0] , false, type);
-		assertFindMethod("MoneyTest", new String[] { "java.lang.String" } , true, type);
-	}
-
-	private void assertFindMethodInHierarchy(String methName, String[] paramTypeNames, boolean isConstructor, IType type, String declaringTypeName) throws Exception {
-		ITypeHierarchy hierarchy= type.newSupertypeHierarchy(null);
-		
-		String[] sig= new String[paramTypeNames.length];
-		for (int i= 0; i < paramTypeNames.length; i++) {
-			// create as unresolved
-			String name= Signature.getSimpleName(paramTypeNames[i]);
-			sig[i]= Signature.createTypeSignature(name, false);
-			assertNotNull(methName + "-ts1" + i, sig[i]);
-		}
-		IMethod meth= JavaModelUtil.findMethodDeclarationInHierarchy(hierarchy, type, methName, sig, isConstructor);
-		assertElementName(methName, meth, IJavaElement.METHOD);
-		assertTrue("methName-nparam1", meth.getParameterTypes().length == paramTypeNames.length);
-		assertEquals("methName-decltype", declaringTypeName, JavaModelUtil.getFullyQualifiedName(meth.getDeclaringType()));
-		
-		for (int i= 0; i < paramTypeNames.length; i++) {
-			// create as resolved
-			sig[i]= Signature.createTypeSignature(paramTypeNames[i], true);
-			assertNotNull(methName + "-ts2" + i, sig[i]);
-		}		
-		meth= JavaModelUtil.findMethodDeclarationInHierarchy(hierarchy, type, methName, sig, isConstructor);
-		assertElementName(methName, meth, IJavaElement.METHOD);
-		assertTrue("methName-nparam2", meth.getParameterTypes().length == paramTypeNames.length);
-		assertEquals("methName-decltype", declaringTypeName, JavaModelUtil.getFullyQualifiedName(meth.getDeclaringType()));
-	}
-
-	public void testFindMethodInHierarchy() throws Exception {
-		IType type= JavaModelUtil.findType(fJProject1, "junit.extensions.TestSetup");
-		assertElementName("TestSetup", type, IJavaElement.TYPE);		
-		
-		assertFindMethodInHierarchy("run", new String[] { "junit.framework.TestResult" }, false, type, "junit.framework.Test");
-		assertFindMethodInHierarchy("toString", new String[] {} , false, type, "java.lang.Object");
-	}
-	
-	public void testHasMainMethod() throws Exception {
-		IType type= JavaModelUtil.findType(fJProject1, "junit.samples.money.MoneyTest");
-		assertElementName("MoneyTest", type, IJavaElement.TYPE);
-		
-		assertTrue("MoneyTest-nomain", JavaModelUtil.hasMainMethod(type));
-		
-		type= JavaModelUtil.findType(fJProject1, "junit.framework.TestResult");
-		assertElementName("TestResult", type, IJavaElement.TYPE);
-		
-		assertTrue("TestResult-hasmain", !JavaModelUtil.hasMainMethod(type));
-		
-		type= JavaModelUtil.findType(fJProject1, "junit.samples.VectorTest");
-		assertElementName("VectorTest", type, IJavaElement.TYPE);
-		
-		assertTrue("VectorTest-nomain", JavaModelUtil.hasMainMethod(type));
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/NameProposerTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/NameProposerTest.java
deleted file mode 100644
index 82a6f6b..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/NameProposerTest.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Preferences;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.internal.corext.codemanipulation.GetterSetterUtil;
-
-
-public class NameProposerTest extends TestCase {
-	
-	private static final Class THIS= NameProposerTest.class;
-
-	private IJavaProject fJProject1;
-
-	public NameProposerTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new TestSuite(THIS);
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new NameProposerTest("testGetterSetterName"));
-			return suite;
-		}	
-	}
-
-	protected void setUp() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		assertTrue("rt not found", JavaProjectHelper.addRTJar(fJProject1) != null);
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fJProject1);
-	}
-
-
-	public void testGetterSetterName() throws Exception {
-		IPackageFragmentRoot sourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-
-		IPackageFragment pack1= sourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("public class C {\n");
-		buf.append("  int fCount;\n");
-		buf.append("  static int fgSingleton;\n");		
-		buf.append("  int foo;\n");
-		buf.append("\n");		
-		buf.append("  boolean fBlue;\n");		
-		buf.append("  boolean modified;\n");
-		buf.append("  boolean isTouched;\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		IType type= cu.getType("C");
-		
-		Preferences corePrefs= JavaCore.getPlugin().getPluginPreferences();
-		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_PREFIXES, "f");
-		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_PREFIXES, "fg");
-
-		String[] excluded= new String[0];
-		IField f1= type.getField("fCount");
-		IField f2= type.getField("fgSingleton");
-		IField f3= type.getField("foo");
-		IField f4= type.getField("fBlue");
-		IField f5= type.getField("modified");
-		IField f6= type.getField("isTouched");
-		
-		assertEqualString("setCount", GetterSetterUtil.getSetterName(f1, excluded));
-		assertEqualString("getCount", GetterSetterUtil.getGetterName(f1, excluded));
-		assertEqualString("setSingleton", GetterSetterUtil.getSetterName(f2, excluded));
-		assertEqualString("getSingleton", GetterSetterUtil.getGetterName(f2, excluded));
-		assertEqualString("setFoo", GetterSetterUtil.getSetterName(f3, excluded));
-		assertEqualString("getFoo", GetterSetterUtil.getGetterName(f3, excluded));
-		
-		assertEqualString("setBlue", GetterSetterUtil.getSetterName(f4, excluded));
-		assertEqualString("isBlue", GetterSetterUtil.getGetterName(f4, excluded));
-		assertEqualString("setModified", GetterSetterUtil.getSetterName(f5, excluded));
-		assertEqualString("isModified", GetterSetterUtil.getGetterName(f5, excluded));
-		assertEqualString("setTouched", GetterSetterUtil.getSetterName(f6, excluded));
-		assertEqualString("isTouched", GetterSetterUtil.getGetterName(f6, excluded));
-				
-	}
-	
-	private void assertEqualString(String expected, String actual) {
-		assertEquals("Expected '" + expected + "', is '" + actual + "'", expected, actual);
-	}	
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/PartialASTTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/PartialASTTest.java
deleted file mode 100644
index 505eeef..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/PartialASTTest.java
+++ /dev/null

@@ -1,539 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.Hashtable;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.*;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.corext.dom.ASTNodes;
-import org.eclipse.jdt.internal.corext.dom.NodeFinder;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-public class PartialASTTest extends CoreTests {
-	
-	private static final Class THIS= PartialASTTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public PartialASTTest(String name) {
-		super(name);
-	}
-
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new PartialASTTest("testPartialCU1"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	
-	public void testPartialCU1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() {\n");
-		buf.append("        fField1 = fField2;\n");
-		buf.append("    }\n");
-		buf.append("    public int foo1(int i) {\n");
-		buf.append("        return i;\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String existing= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", existing, false, null);
-		
-		String statement= "fField1 = fField2;";
-		int offset= existing.indexOf(statement);
-		
-		CompilationUnit astRoot= getPartialCompilationUnit(cu, offset);
-		String string= ASTNodes.asFormattedString(astRoot, 0, String.valueOf('\n'));
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() {\n");
-		buf.append("        fField1 = fField2;\n");
-		buf.append("    }\n");
-		buf.append("    public int foo1(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String expected= buf.toString();
-		
-		assertEqualString(string, expected);
-		
-		offset= expected.indexOf(statement);
-		
-		ASTNode node= NodeFinder.perform(astRoot, offset, statement.length());
-		Assignment assignment= (Assignment) ((ExpressionStatement) node).getExpression();
-		Expression e1= assignment.getLeftHandSide();
-		Expression e2= assignment.getRightHandSide();
-		assertNotNull(e1.resolveTypeBinding());
-		assertNotNull(e2.resolveTypeBinding());
-		
-		assertTrue(((SimpleName) e1).resolveBinding() instanceof IVariableBinding);
-		assertTrue(((SimpleName) e2).resolveBinding() instanceof IVariableBinding);
-		
-		assertAllBindings(astRoot);		
-	}
-	
-	private void assertAllBindings(CompilationUnit astRoot) {
-		List list= astRoot.types();
-		for (int i= 0; i < list.size(); i++) {
-			TypeDeclaration decl= (TypeDeclaration) list.get(i);
-			assertTrue(decl.resolveBinding() != null);
-			
-			if (!decl.isInterface() && decl.getSuperclassType() != null) {
-				assertTrue(decl.getSuperclassType().resolveBinding() != null);
-			}
-			List interfaces= decl.superInterfaceTypes();
-			for (int j= 0; j < interfaces.size(); j++) {
-				assertTrue(((Type) interfaces.get(j)).resolveBinding() != null);
-			}
-			
-			MethodDeclaration[] declarations= decl.getMethods();
-			for (int k= 0; k < declarations.length; k++) {
-				MethodDeclaration meth= declarations[k];
-				assertTrue(meth.resolveBinding() != null);
-				List params= meth.parameters();
-				for (int n= 0; n < params.size(); n++) {
-					SingleVariableDeclaration arg= (SingleVariableDeclaration) params.get(n);
-					assertTrue(arg.resolveBinding() != null);
-				}
-				if (!meth.isConstructor()) {		
-					assertTrue(meth.getReturnType2().resolveBinding() != null);
-				}
-			}
-		}
-		
-		
-	}
-	
-	
-	public void testPartialCU2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner {\n");
-		buf.append("        public int inner(int i) {\n");
-		buf.append("            return i;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() {\n");
-		buf.append("        fField1 = fField2;\n");
-		buf.append("        if (fField1 == 0) {\n");
-		buf.append("            fField2++;\n");
-		buf.append("        }\n");
-		buf.append("        EInner inner = new EInner();\n");
-		buf.append("    }\n");
-		buf.append("    public int foo1(int i) {\n");
-		buf.append("        private class Local {\n");
-		buf.append("            public int local(int i) {\n");
-		buf.append("                return i;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("        Local local = new Local();\n");	
-		buf.append("        return i;\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String existing= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", existing, false, null);
-		
-		int offset= existing.indexOf("fField1 = fField2;");
-		
-		CompilationUnit astRoot= getPartialCompilationUnit(cu, offset);
-		String string= ASTNodes.asFormattedString(astRoot, 0, String.valueOf('\n'));
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner {\n");
-		buf.append("        public int inner(int i) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() {\n");
-		buf.append("        fField1 = fField2;\n");
-		buf.append("        if (fField1 == 0) {\n");
-		buf.append("            fField2++;\n");
-		buf.append("        }\n");
-		buf.append("        EInner inner = new EInner();\n");
-		buf.append("    }\n");
-		buf.append("    public int foo1(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String expected= buf.toString();
-		
-		assertEqualString(string, expected);
-		assertAllBindings(astRoot);	
-	}
-	
-	public void testPartialCU3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.io.Serializable;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner implements Serializable {\n");
-		buf.append("        public int inner(int i) {\n");
-		buf.append("            return i;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() {\n");
-		buf.append("        fField1 = fField2;\n");
-		buf.append("        if (fField1 == 0) {\n");
-		buf.append("            fField2++;\n");
-		buf.append("        }\n");
-		buf.append("        EInner inner = new EInner();\n");
-		buf.append("    }\n");
-		buf.append("    public int foo1(int i) {\n");
-		buf.append("        private class Local {\n");
-		buf.append("            public int local(int i) {\n");
-		buf.append("                return 1;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("        Local local = new Local();\n");	
-		buf.append("        return i;\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String existing= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", existing, false, null);
-		
-		int offset= existing.indexOf("return 1;");
-		
-		CompilationUnit astRoot= getPartialCompilationUnit(cu, offset);
-		String string= ASTNodes.asFormattedString(astRoot, 0, String.valueOf('\n'));
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.io.Serializable;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner implements Serializable {\n");
-		buf.append("        public int inner(int i) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() {\n");
-		buf.append("    }\n");
-		buf.append("    public int foo1(int i) {\n");
-		buf.append("        private class Local {\n");
-		buf.append("            public int local(int i) {\n");
-		buf.append("                return 1;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("        Local local = new Local();\n");	
-		buf.append("        return i;\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String expected= buf.toString();
-		
-		assertEqualString(string, expected);
-		assertAllBindings(astRoot);	
-	}
-	
-	public void testPartialCU4() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner {\n");
-		buf.append("        public int inner(int i) {\n");
-		buf.append("            return 0;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() throws IOException, ParseException {\n");
-		buf.append("        fField1 = fField2;\n");
-		buf.append("        if (fField1 == 0) {\n");
-		buf.append("            fField2++;\n");
-		buf.append("        }\n");
-		buf.append("        EInner inner = new EInner();\n");
-		buf.append("    }\n");
-		buf.append("    public int foo1(int i) {\n");
-		buf.append("        private class Local {\n");
-		buf.append("            public int local(int i) {\n");
-		buf.append("                return 1;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("        Local local = new Local();\n");	
-		buf.append("        return i;\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String existing= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", existing, false, null);
-		
-		int offset= existing.indexOf("return 0;");
-		
-		CompilationUnit astRoot= getPartialCompilationUnit(cu, offset);
-		String string= ASTNodes.asFormattedString(astRoot, 0, String.valueOf('\n'));
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner {\n");
-		buf.append("        public int inner(int i) {\n");
-		buf.append("            return 0;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() throws IOException, ParseException {\n");
-		buf.append("    }\n");
-		buf.append("    public int foo1(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String expected= buf.toString();
-		
-		assertEqualString(string, expected);
-		assertAllBindings(astRoot);	
-	}		
-	
-	public void testPartialCUPositionNotInMethod1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner {\n");
-		buf.append("        public int inner(int i) {\n");
-		buf.append("            return 0;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() throws IOException, ParseException {\n");
-		buf.append("        fField1 = fField2;\n");
-		buf.append("        if (fField1 == 0) {\n");
-		buf.append("            fField2++;\n");
-		buf.append("        }\n");
-		buf.append("        EInner inner = new EInner();\n");
-		buf.append("    }\n");
-		buf.append("    public int foo2(int i) {\n");
-		buf.append("        private class Local {\n");
-		buf.append("            public int local(int i) {\n");
-		buf.append("                return 1;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("        Local local = new Local();\n");	
-		buf.append("        return i;\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String existing= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", existing, false, null);
-		
-		int offset= existing.indexOf("private int fField1;");
-		
-		CompilationUnit astRoot= getPartialCompilationUnit(cu, offset);
-		String string= ASTNodes.asFormattedString(astRoot, 0, String.valueOf('\n'));
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner {\n");
-		buf.append("        public int inner(int i) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() throws IOException, ParseException {\n");
-		buf.append("    }\n");
-		buf.append("    public int foo2(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String expected= buf.toString();
-		
-		assertEqualString(string, expected);
-		assertAllBindings(astRoot);	
-	}
-	
-	public void testPartialCUPositionNotInMethod2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner {\n");
-		buf.append("        {\n");
-		buf.append("            System.out.println();\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() throws IOException, ParseException {\n");
-		buf.append("        fField1 = fField2;\n");
-		buf.append("        if (fField1 == 0) {\n");
-		buf.append("            fField2++;\n");
-		buf.append("        }\n");
-		buf.append("        EInner inner = new EInner();\n");
-		buf.append("    }\n");
-		buf.append("    public int foo2(int i) {\n");
-		buf.append("        private class Local {\n");
-		buf.append("            private int fField3;\n");
-		buf.append("            public int local(int i) {\n");
-		buf.append("                return 1;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("        Local local = new Local();\n");	
-		buf.append("        return i;\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String existing= buf.toString();
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", existing, false, null);
-		
-		int offset= existing.indexOf("private int fField3;");
-		
-		CompilationUnit astRoot= getPartialCompilationUnit(cu, offset);
-		String string= ASTNodes.asFormattedString(astRoot, 0, String.valueOf('\n'));
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class EInner {\n");
-		buf.append("        {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    private int fField1;\n");
-		buf.append("    private int fField2;\n");
-		buf.append("    public void foo1() throws IOException, ParseException {\n");
-		buf.append("    }\n");
-		buf.append("    public int foo2(int i) {\n");
-		buf.append("        private class Local {\n");
-		buf.append("            private int fField3;\n");
-		buf.append("            public int local(int i) {\n");
-		buf.append("                return 1;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("        Local local = new Local();\n");	
-		buf.append("        return i;\n");
-		buf.append("    }\n");
-		buf.append("}");
-		String expected= buf.toString();
-		
-		assertEqualString(string, expected);
-		assertAllBindings(astRoot);	
-	}		
-	
-	private CompilationUnit getPartialCompilationUnit(ICompilationUnit cu, int offset) {
-		ASTParser p= ASTParser.newParser(AST.JLS3);
-		p.setSource(cu);
-		p.setFocalPosition(offset);
-		p.setResolveBindings(true);
-		return (CompilationUnit) p.createAST(null);
-	}
-	
-	/*
-	private static class PartialVisitor extends ASTVisitor {
-		
-		private int fOffset;
-
-		public PartialVisitor(int offset) {
-			fOffset= offset;
-		}
-		
-		public boolean visit(Block node) {
-			ASTNode parent= node.getParent();
-			if (parent instanceof MethodDeclaration || parent instanceof Initializer) {
-				int start= node.getStartPosition();
-				int end= start + node.getLength();
-				
-				if (start <= fOffset && fOffset < end) {
-					return true;
-				}
-				node.statements().clear();
-				return false;
-			}
-			return true;
-		}
-	}*/
-	
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ProjectTestSetup.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ProjectTestSetup.java
deleted file mode 100644
index 85819ab..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ProjectTestSetup.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.Map;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-
-public class ProjectTestSetup extends TestSetup {
-
-	public static final String PROJECT_NAME= "TestSetupProject";
-	
-	public static IJavaProject getProject() {
-		IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
-		return JavaCore.create(project);
-	}
-	
-	public static IClasspathEntry[] getDefaultClasspath() {
-		IPath[] rtJarPath= JavaProjectHelper.find15RtJar();
-		assertTrue("rt not found", rtJarPath != null);		
-		return new IClasspathEntry[] {  JavaCore.newLibraryEntry(rtJarPath[0], rtJarPath[1], rtJarPath[2], true) };
-	}
-	
-		
-	private IJavaProject fJProject;
-
-	private boolean fAutobuilding;
-	
-	public ProjectTestSetup(Test test) {
-		super(test);
-	}
-	
-	/* (non-Javadoc)
-	 * @see junit.extensions.TestSetup#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		IJavaProject project= getProject();
-		if (project.exists()) { // allow nesting of ProjectTestSetup's
-			return;
-		}
-		
-		fAutobuilding = JavaProjectHelper.setAutoBuilding(false);
-		
-		fJProject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		fJProject.setRawClasspath(getDefaultClasspath(), null);
-		Map options= fJProject.getOptions(false);
-		JavaProjectHelper.set15CompilerOptions(options);
-		fJProject.setOptions(options);
-		
-		JavaCore.setOptions(TestOptions.getFormatterOptions());
-		TestOptions.initializeCodeGenerationOptions();
-		JavaPlugin.getDefault().getCodeTemplateStore().load();		
-	}
-
-	protected void tearDown() throws Exception {
-		if (fJProject != null) {
-			JavaProjectHelper.delete(fJProject);
-			JavaProjectHelper.setAutoBuilding(fAutobuilding);
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ScopeAnalyzerTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ScopeAnalyzerTest.java
deleted file mode 100644
index ecad033..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ScopeAnalyzerTest.java
+++ /dev/null

@@ -1,773 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.IProblem;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IBinding;
-
-import org.eclipse.jdt.internal.corext.dom.ScopeAnalyzer;
-
-/**
-  */
-public class ScopeAnalyzerTest extends CoreTests {
-
-	private static final Class THIS= ScopeAnalyzerTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public ScopeAnalyzerTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests(); 
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ScopeAnalyzerTest("testVariableDeclarations6"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-	
-	protected void setUp() throws Exception {
-		
-		fJProject1= ProjectTestSetup.getProject();
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.IGNORE);
-		
-		JavaCore.setOptions(options);		
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-	
-	public void testVariableDeclarations1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    int[] fGlobal;\n");
-		buf.append("    public int goo(int param1, int param2) {\n");
-		buf.append("        int count= 0;\n");
-		buf.append("        fGlobal= new int[] { 1, 2, 3};\n");
-		buf.append("        for (int i= 0; i < fGlobal.length; i++) {\n");
-		buf.append("            int insideFor= 0;\n");
-		buf.append("            count= insideFor + fGlobal[i];\n");
-		buf.append("            return -1;\n");		
-		buf.append("        }\n");
-		buf.append("        count++;\n");
-		buf.append("        int count2= 0;\n");
-		buf.append("        count+= count2;\n");
-		buf.append("        return count;\n");		
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		
-		{
-			String str= "count+= count2;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-	
-			assertVariables(res, new String[] { "param1", "param2", "count", "count2", "fGlobal" });
-		}
-		
-		{
-			String str= "count++;";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "param1", "param2", "count", "fGlobal" });
-		}
-	
-		{
-			String str= "return -1;";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-	
-			assertVariables(res, new String[] { "param1", "param2", "count", "i", "insideFor", "fGlobal" });
-		}		
-		
-	}
-
-	public void testVariableDeclarations2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int goo(int param1) {\n");
-		buf.append("        int count= 9, count2= 0;\n");
-		buf.append("        try {\n");
-		buf.append("            for (int i= 0, j= 0; i < 9; i++) {\n");
-		buf.append("                System.out.println(i + j);\n");
-		buf.append("                j++;\n");
-		buf.append("                throw new IOException();\n");		
-		buf.append("            }\n");
-		buf.append("            return 8;\n");			
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("           int k= 0;\n");
-		buf.append("           return k;\n");
-		buf.append("        } catch (Exception x) {\n");
-		buf.append("           x= null;\n");					 
-		buf.append("        };\n");
-		buf.append("        return count;\n");		
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		
-		{
-			String str= "j++;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "param1", "count", "count2", "i", "j"});
-		}
-		
-		{
-			String str= "return 8;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "param1", "count", "count2"});
-		}		
-		
-		{
-			String str= "return k;";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-
-			assertVariables(res, new String[] { "param1", "count", "count2", "e", "k" });
-		}
-		
-		{
-			String str= "x= null;";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "param1", "count", "count2", "x" });
-		}		
-	
-		{
-			String str= "return count;";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "param1", "count", "count2" });
-		}		
-		
-	}
-	
-	public void testVariableDeclarations3() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fVar1, fVar2;\n");
-		buf.append("    public int goo(int param1) {\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            int fInner;\n");		
-		buf.append("            public void run() {\n");
-		buf.append("                int k= 0;\n");
-		buf.append("                fVar1= k;\n");
-		buf.append("            }\n");		
-		buf.append("        };\n");
-		buf.append("        int k= 0;\n");
-		buf.append("        return k;\n");
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		
-		{
-			String str= "fVar1= k;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "k", "fInner",  "param1", "run", "fVar1", "fVar2"});
-		}
-		
-		{
-			String str= "return k;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "k", "param1", "run", "fVar1", "fVar2"});
-		}
-
-	}
-	
-	public void testVariableDeclarations4() throws Exception {
-		IPackageFragment pack0= fSourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("public class Rectangle {\n");
-		buf.append("  public int x;\n");
-		buf.append("  public int y;\n");
-		buf.append("}\n");
-		pack0.createCompilationUnit("Rectangle.java", buf.toString(), false, null);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("import pack1.Rectangle;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fVar1, fVar2;\n");
-		buf.append("    public int goo(int param1) {\n");
-		buf.append("        int k= 0;\n");
-		buf.append("        Rectangle r= new Rectangle();\n");		
-		buf.append("        return r.x;\n");
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		{
-			String str= "return r.x;";
-			int offset= buf.toString().indexOf(str) + "return r.".length();
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "x", "y"});
-		}			
-			
-	}
-	
-	public void testVariableDeclarations5() throws Exception {
-		
-		IPackageFragment pack0= fSourceFolder.createPackageFragment("pack1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack1;\n");
-		buf.append("\n");
-		buf.append("public interface IConstants {\n");
-		buf.append("  public final int CONST= 1;\n");
-		buf.append("}\n");
-		pack0.createCompilationUnit("IConstants.java", buf.toString(), false, null);		
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fVar1, fVar2;\n");
-		
-		buf.append("    private class A {\n");
-		buf.append("        int fCount;\n");
-		buf.append("        public int foo(int param1) {\n");
-		buf.append("            return 1;\n");		
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("    public int goo(int param0) {\n");
-		buf.append("        int k= 0;\n");
-		buf.append("        class B extends A implements pack1.IConstants {\n");
-		buf.append("            int fCount2;\n");
-		buf.append("            public int foo(int param1) {\n");
-		buf.append("                return 2;\n");		
-		buf.append("            }\n");		
-		buf.append("        }\n");		
-		buf.append("        return 3;\n");
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		{
-			String str= "return 1;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "param1", "fCount", "fVar1", "fVar2"});
-		}
-		
-		{
-			String str= "return 2;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "param1", "fCount2", "fCount", "k", "param0", "fVar1", "fVar2", "CONST"});
-		}				
-			
-	}
-
-	public void testVariableDeclarations6() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    int[] fGlobal;\n");
-		buf.append("    public int goo(int param1, int param2) {\n");
-		buf.append("        switch (param1) {\n");
-		buf.append("            case 1:\n;");
-		buf.append("                fGlobal= new int[] { 1, 2, 3};\n");
-		buf.append("                int temp= 9;\n");
-		buf.append("                break;\n");
-		buf.append("            case 2:\n;");
-		buf.append("                do {\n");
-		buf.append("                   int insideDo= 0;\n");
-		buf.append("                   return -1;\n");
-		buf.append("                } while (true);\n");
-		buf.append("            case 3:\n;");
-		buf.append("                int temp2= 9;\n");
-		buf.append("                Math.min(1.0f, 2.0f);\n");
-		buf.append("                return 3;\n");
-		buf.append("        }\n");
-		buf.append("        return 4;\n");		
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		
-		{
-			String str= "break;";
-			int offset= buf.toString().indexOf(str);
-
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-
-			assertVariables(res, new String[] { "param1", "param2", "temp", "fGlobal" });
-		}
-		
-		{
-			String str= "return -1;";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-
-			assertVariables(res, new String[] { "param1", "param2", "temp", "insideDo", "fGlobal" });
-		}			
-			
-		{
-			String str= "Math";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-
-			assertVariables(res, new String[] { "param1", "param2", "temp", "temp2", "fGlobal" });
-		}			
-
-		{
-			String str= "min";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-
-			assertVariables(res, new String[] { "E", "PI" });
-		}
-		
-		{
-			String str= "return 4;";
-			int offset= buf.toString().indexOf(str);
-			
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-
-			assertVariables(res, new String[] { "param1", "param2", "fGlobal" });
-		}		
-		
-	}
-
-
-
-
-
-	public void testDeclarationsAfter() throws Exception {
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int goo(final int param0) {\n");
-		buf.append("        int k= 0;\n");
-		buf.append("        try {\n");
-		buf.append("            for (int i= 0; i < 10; i++) {\n");
-		buf.append("                k += i;\n");
-		buf.append("            }\n");
-		buf.append("        } catch (Exception x) {\n");
-		buf.append("           return 9;\n");					 
-		buf.append("        };\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            int fInner;\n");		
-		buf.append("            public void run() {\n");
-		buf.append("                int x1= 0;\n");
-		buf.append("                x1 += param0;\n");
-		buf.append("                {\n");
-		buf.append("                    for (int i= 0, j= 0; i < 10; i++) {\n");
-		buf.append("                        x1 += i;\n");
-		buf.append("                        int x2= 0;\n");
-		buf.append("                    }\n");
-		buf.append("                }\n");		
-		buf.append("            }\n");		
-		buf.append("        };\n");			
-		buf.append("        return 3;\n");
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		{
-			String str= "int k= 0;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsAfter(offset, flags);
-			
-			assertVariables(res, new String[] { "k", "i", "x", "run"});
-		}
-		
-		{
-			String str= "return 9;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsAfter(offset, flags);
-			
-			assertVariables(res, new String[] { });
-		}
-		
-		{
-			String str= "x1 += param0;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.VARIABLES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsAfter(offset, flags);
-			
-			assertVariables(res, new String[] { "i", "j", "x2" });
-		}				
-			
-	}
-
-	public void testTypeDeclarations1() throws Exception {
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static class A {\n");
-		buf.append("        public class A1 {\n");
-		buf.append("            public int foo() {\n");
-		buf.append("                return 1;\n");		
-		buf.append("            }\n");			
-		buf.append("        }\n");
-		buf.append("        public class A2 {\n");
-		buf.append("        }\n");		
-		buf.append("        public int foo() {\n");
-		buf.append("            return 2;\n");		
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");		
-		buf.append("class F {\n");
-		buf.append("    public int goo(int param0) {\n");
-		buf.append("        class C extends E.A {\n");
-		buf.append("            A1 b;\n");
-		buf.append("            public int foo() {\n");
-		buf.append("                return 3;\n");		
-		buf.append("            }\n");
-		buf.append("        }\n");		
-		buf.append("        return 4;\n");
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		{
-			String str= "return 1;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.TYPES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "A1", "A", "E", "A2", "F"});
-		}
-		
-		{
-			String str= "return 2;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.TYPES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "A1", "A", "E", "A2", "F"});
-		}
-		
-		{
-			String str= "return 3;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.TYPES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "C", "F", "A1", "A2", "E"});
-		}
-		
-		{
-			String str= "return 4;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.TYPES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "C", "F", "E"});
-		}					
-			
-	}
-	
-	public void testTypeDeclarations2() throws Exception {
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static class E1 extends G {\n");
-		buf.append("        public static class EE1 {\n");
-		buf.append("        }\n");
-		buf.append("        public static class EE2 {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("    public static class E2 {\n");
-		buf.append("    }\n");				
-		buf.append("}\n");		
-		buf.append("class F extends E.E1{\n");
-		buf.append("    F f1;\n");
-		buf.append("}\n");
-		buf.append("class G {\n");
-		buf.append("    public static class G1 {\n");
-		buf.append("    }\n");
-		buf.append("}\n");		
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		{
-			String str= "F f1;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.TYPES;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertVariables(res, new String[] { "F", "EE1", "EE2", "G1", "G", "E"});
-		}
-	}		
-	
-		
-	
-	public void testMethodDeclarations1() throws Exception {
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");			
-		
-		buf.append("    public void goo() {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		
-		buf.append("    public String toString() {\n");
-		buf.append("        return String.valueOf(1);\n");
-		buf.append("    }\n");	
-		
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-		{
-			String str= "return;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.METHODS;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertMethods(res, new String[] { "goo", "foo" }, true);
-		}			
-			
-	}
-
-	public void testMethodDeclarations2() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1.ae", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1.ae;\n");
-		buf.append("public class E {\n");
-		buf.append("    int fVar1, fVar2;\n");
-		buf.append("    public int goo(int param1) {\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            int fInner;\n");		
-		buf.append("            public void run() {\n");
-		buf.append("                return;\n");
-		buf.append("            }\n");		
-		buf.append("        };\n");
-		buf.append("        int k= 0;\n");
-		buf.append("        return k;\n");
-		buf.append("    }\n");
-		buf.append("    private class A extends E {\n");
-		buf.append("        { // initializer\n");
-		buf.append("           fVar1= 9; \n");		
-		buf.append("        }\n");
-		buf.append("        public int foo(int param1) {\n");
-		buf.append("            return 1;\n");		
-		buf.append("        }\n");		
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit compilationUnit= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= createAST(compilationUnit);
-		assertNoProblems(astRoot);
-
-		{
-			String str= "return;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.METHODS;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertMethods(res, new String[] { "run", "goo"}, true);
-		}
-		
-		{
-			String str= "return k;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.METHODS;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertMethods(res, new String[] { "goo"}, true);
-		}
-		
-		{
-			String str= "return 1;";
-			int offset= buf.toString().indexOf(str);
-	
-			int flags= ScopeAnalyzer.METHODS;
-			IBinding[] res= new ScopeAnalyzer(astRoot).getDeclarationsInScope(offset, flags);
-			
-			assertMethods(res, new String[] { "foo", "goo"}, true);
-		}		
-
-	}
-	
-	
-	private static final String[] OBJ_METHODS= new String[] { "getClass", 
-		"hashCode", "equals", "clone", "toString", "notify", "notifyAll", "wait", "wait",
-		"wait", "finalize" };
-
-	private void assertMethods(IBinding[] res, String[] expectedNames, boolean addObjectMethods) {
-		String[] names= new String[res.length];		
-		for (int i= 0; i < res.length; i++) {
-			names[i]= res[i].getName();
-		}
-		String[] expected= expectedNames;
-		
-		if (addObjectMethods) {
-			expected= new String[expectedNames.length + OBJ_METHODS.length];
-			System.arraycopy(OBJ_METHODS, 0, expected, 0, OBJ_METHODS.length);
-			System.arraycopy(expectedNames, 0, expected, OBJ_METHODS.length, expectedNames.length);
-		}
-		
-		assertEqualStringsIgnoreOrder(names, expected);
-	}	
-
-	private void assertVariables(IBinding[] res, String[] expectedNames) {
-		String[] names= new String[res.length];		
-		for (int i= 0; i < res.length; i++) {
-			names[i]= res[i].getName();
-		}
-		assertEqualStringsIgnoreOrder(names, expectedNames);
-	}
-	
-	private void assertNoProblems(CompilationUnit astRoot) {
-		IProblem[] problems= astRoot.getProblems();
-		if (problems.length > 0) {
-			StringBuffer buf= new StringBuffer();
-			for (int i= 0; i < problems.length; i++) {
-				buf.append(problems[i].getMessage()).append('\n');
-			}
-			assertTrue(buf.toString(), false);	
-		}
-	}
-
-	private CompilationUnit createAST(ICompilationUnit compilationUnit) {
-		ASTParser parser= ASTParser.newParser(AST.JLS3);
-		parser.setSource(compilationUnit);
-		parser.setResolveBindings(true);
-		return (CompilationUnit) parser.createAST(null);
-	}
-	
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeHierarchyTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeHierarchyTest.java
deleted file mode 100644
index add80d3..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeHierarchyTest.java
+++ /dev/null

@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.ITypeHierarchyChangedListener;
-
-import org.eclipse.jdt.ui.JavaUI;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-
-public class TypeHierarchyTest extends TestCase {
-	
-	private static final Class THIS= TypeHierarchyTest.class;
-	
-	private IJavaProject fJavaProject1;
-	private IJavaProject fJavaProject2;
-	
-	public TypeHierarchyTest(String name) {
-		super(name);
-	}
-			
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new AllTypesCacheTest("testHierarchyWithWorkingCopy"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-	
-	protected void setUp() throws Exception {
-		fJavaProject1= ProjectTestSetup.getProject();
-		fJavaProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");
-	}
-
-	protected void tearDown () throws Exception {
-		JavaProjectHelper.clear(fJavaProject1, ProjectTestSetup.getDefaultClasspath());
-		JavaProjectHelper.delete(fJavaProject2);		
-	}
-					
-	public void test1() throws Exception {
-		IPackageFragmentRoot root1= JavaProjectHelper.addSourceContainer(fJavaProject1, "src");
-		IPackageFragment pack1= root1.createPackageFragment("pack1", true, null);
-		
-		ICompilationUnit cu1= pack1.getCompilationUnit("A.java");
-		cu1.createType("public class A {\n}\n", null, true, null);
-		
-		JavaProjectHelper.addRTJar(fJavaProject2);
-		JavaProjectHelper.addRequiredProject(fJavaProject2, fJavaProject1);
-		IPackageFragmentRoot root2= JavaProjectHelper.addSourceContainer(fJavaProject2, "src");
-		IPackageFragment pack2= root2.createPackageFragment("pack2", true, null);
-		
-		ICompilationUnit cu2= pack2.getCompilationUnit("B.java");
-		IType type2= cu2.createType("public class B extends pack1.A {\n}\n", null, true, null);
-		
-		ITypeHierarchy hierarchy= type2.newSupertypeHierarchy(null);
-		IType[] allTypes= hierarchy.getAllTypes();
-		
-		assertTrue("Should contain 3 types, contains: " + allTypes.length, allTypes.length == 3);
-		
-		IType type= fJavaProject2.findType("pack1.A");
-		assertTrue("Type not found", type != null);
-
-	}
-	
-	
-	public void testHierarchyWithWorkingCopy1() throws Exception {
-		
-		IPackageFragmentRoot root1= JavaProjectHelper.addSourceContainer(fJavaProject1, "src");
-		IPackageFragment pack1= root1.createPackageFragment("pack1", true, null);
-		
-		ICompilationUnit cu1= pack1.getCompilationUnit("A.java");
-		cu1.createType("public class A {\n}\n", null, true, null);
-		
-		IPackageFragment pack2= root1.createPackageFragment("pack2", true, null);
-		
-		ICompilationUnit cu2= pack2.getCompilationUnit("B.java");
-		IType type2= cu2.createType("public class B extends pack1.A {\n}\n", null, true, null);
-		
-		final int[] updateCount= new int[] {0};
-		
-		ITypeHierarchy hierarchy= type2.newSupertypeHierarchy(null);
-		hierarchy.addTypeHierarchyChangedListener(new ITypeHierarchyChangedListener() {
-			public void typeHierarchyChanged(ITypeHierarchy typeHierarchy) {
-				updateCount[0]++;
-			}
-		});
-		
-		IType[] allTypes= hierarchy.getAllTypes();
-		
-		assertTrue("Should contain 3 types, contains: " + allTypes.length, allTypes.length == 3);
-		assertTrue("Update count should be 0, is: " + updateCount[0], updateCount[0] == 0);
-		
-		IEditorPart part= EditorUtility.openInEditor(type2);
-		try {
-			IDocument document= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			String superType= "pack1.A";
-			
-			int offset= document.get().indexOf(superType);
-			
-			document.replace(offset, superType.length(), "Object");
-			
-			allTypes= hierarchy.getAllTypes();
-		
-			// no update of hierarchies on working copies
-			assertTrue("Update count should be 0, is: " + updateCount[0], updateCount[0] == 0);
-			assertTrue("Should contain 3 types, contains: " + allTypes.length, allTypes.length == 3);
-			
-			part.doSave(null);
-			hierarchy.refresh(null);
-			
-			allTypes= hierarchy.getAllTypes();
-		
-			// update after save
-			assertTrue("Update count should be 1, is: " + updateCount[0], updateCount[0] == 1);
-			hierarchy.refresh(null);
-			assertTrue("Should contain 2 types, contains: " + allTypes.length, allTypes.length == 2);
-			
-		} finally {
-			JavaPlugin.getActivePage().closeAllEditors(false);
-		}
-		
-		allTypes= hierarchy.getAllTypes();
-		
-		// update after save
-		assertTrue("Update count should be 1, is: " + updateCount[0], updateCount[0] == 1);
-		assertTrue("Should contain 2 types, contains: " + allTypes.length, allTypes.length == 2);
-
-
-	}
-	
-	public void testHierarchyWithWorkingCopy2() throws Exception {
-		
-		IPackageFragmentRoot root1= JavaProjectHelper.addSourceContainer(fJavaProject1, "src");
-		IPackageFragment pack1= root1.createPackageFragment("pack1", true, null);
-		
-		ICompilationUnit cu1= pack1.getCompilationUnit("A.java");
-		cu1.createType("public class A {\n}\n", null, true, null);
-		
-		IPackageFragment pack2= root1.createPackageFragment("pack2", true, null);
-		
-		ICompilationUnit cu2= pack2.getCompilationUnit("B.java");
-		IType type2= cu2.createType("public class B extends pack1.A {\n}\n", null, true, null);
-			
-		IEditorPart part= EditorUtility.openInEditor(type2);
-
-		final int[] updateCount= new int[] {0};
-		
-		// create on type in working copy
-		ITypeHierarchy hierarchy= type2.newSupertypeHierarchy(null);
-		hierarchy.addTypeHierarchyChangedListener(new ITypeHierarchyChangedListener() {
-			public void typeHierarchyChanged(ITypeHierarchy typeHierarchy) {
-				updateCount[0]++;
-			}
-		});
-		
-		IType[] allTypes= hierarchy.getAllTypes();
-	
-		assertTrue("Update count should be 0, is: " + updateCount[0], updateCount[0] == 0);
-		assertTrue("Should contain 3 types, contains: " + allTypes.length, allTypes.length == 3);
-		
-		try {
-			
-			IDocument document= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			String superType= "pack1.A";
-			
-			int offset= document.get().indexOf(superType);
-			
-			document.replace(offset, superType.length(), "Object");
-			
-			allTypes= hierarchy.getAllTypes();
-		
-			// no update of hierarchies on working copies
-			assertTrue("Update count should be 0, is: " + updateCount[0], updateCount[0] == 0);
-			assertTrue("Should contain 3 types, contains: " + allTypes.length, allTypes.length == 3);
-			
-			part.doSave(null);
-			hierarchy.refresh(null);
-			
-			allTypes= hierarchy.getAllTypes();
-		
-			// update after save
-			assertTrue("Update count should be 1, is: " + updateCount[0], updateCount[0] == 1);
-			hierarchy.refresh(null);
-			assertTrue("Should contain 2 types, contains: " + allTypes.length, allTypes.length == 2);
-
-		} finally {
-			JavaPlugin.getActivePage().closeAllEditors(false);
-		}
-		
-		allTypes= hierarchy.getAllTypes();
-		
-		// update after save
-		assertTrue("Update count should be 1, is: " + updateCount[0], updateCount[0] == 1);
-		assertTrue("Should contain 2 types, contains: " + allTypes.length, allTypes.length == 2);	
-
-	}
-	
-	public void testHierarchyWithWorkingCopy3() throws Exception {
-		
-		IPackageFragmentRoot root1= JavaProjectHelper.addSourceContainer(fJavaProject1, "src");
-		IPackageFragment pack1= root1.createPackageFragment("pack1", true, null);
-		
-		ICompilationUnit cu1= pack1.getCompilationUnit("A.java");
-		cu1.createType("public class A {\n}\n", null, true, null);
-		
-		IPackageFragment pack2= root1.createPackageFragment("pack2", true, null);
-		
-		ICompilationUnit cu2= pack2.getCompilationUnit("B.java");
-		IType type2= cu2.createType("public class B extends pack1.A {\n}\n", null, true, null);
-		
-		// open editor -> working copy will be created
-		IEditorPart part= EditorUtility.openInEditor(type2);
-
-		final int[] updateCount= new int[] {0};
-		
-		// create on type in working copy
-		ITypeHierarchy hierarchy= type2.newSupertypeHierarchy(null);
-		hierarchy.addTypeHierarchyChangedListener(new ITypeHierarchyChangedListener() {
-			public void typeHierarchyChanged(ITypeHierarchy typeHierarchy) {
-				updateCount[0]++;
-			}
-		});
-		
-		IType[] allTypes= hierarchy.getAllTypes();
-	
-		assertTrue("Should contain 3 types, contains: " + allTypes.length, allTypes.length == 3);
-		assertTrue("Update count should be 0, is: " + updateCount[0], updateCount[0] == 0);
-		
-		try {			
-			IDocument document= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			String superType= "pack1.A";
-			
-			int offset= document.get().indexOf(superType);
-			// modify source
-			document.replace(offset, superType.length(), "Object");
-			
-			allTypes= hierarchy.getAllTypes();
-		
-			// no update of hierarchies on working copies
-			assertTrue("Should contain 3 types, contains: " + allTypes.length, allTypes.length == 3);
-			assertTrue("Update count should be 0, is: " + updateCount[0], updateCount[0] == 0);
-			
-			// no save
-			
-		} finally {
-			JavaPlugin.getActivePage().closeAllEditors(false);
-		}
-		
-		allTypes= hierarchy.getAllTypes();
-		
-		// update after save
-		assertTrue("Should contain 3 types, contains: " + allTypes.length, allTypes.length == 3);
-		assertTrue("Update count should be 0, is: " + updateCount[0], updateCount[0] == 0);
-
-	}
-	
-	
-
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeInfoTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeInfoTest.java
deleted file mode 100644
index 5e9524d..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeInfoTest.java
+++ /dev/null

@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.ITypeNameRequestor;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-
-import org.eclipse.jdt.internal.corext.util.AllTypesCache;
-import org.eclipse.jdt.internal.corext.util.IFileTypeInfo;
-import org.eclipse.jdt.internal.corext.util.JarFileEntryTypeInfo;
-import org.eclipse.jdt.internal.corext.util.TypeInfo;
-import org.eclipse.jdt.internal.corext.util.TypeInfoRequestor;
-
-
-public class TypeInfoTest extends TestCase {
-	
-	private static final Class THIS= TypeInfoTest.class;
-	
-	private IJavaProject fJProject1;
-	private IJavaProject fJProject2;
-
-	public TypeInfoTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new TypeInfoTest("test1"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-	protected void setUp() throws Exception {
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
-		assertNotNull("jre is null", JavaProjectHelper.addRTJar(fJProject1));
-		
-		fJProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");
-		assertNotNull("jre is null", JavaProjectHelper.addRTJar(fJProject2));		
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fJProject1);
-		JavaProjectHelper.delete(fJProject2);		
-		
-	}
-
-
-	public void test1() throws Exception {
-		
-		// add Junit source to project 2
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("Junit source", junitSrcArchive != null && junitSrcArchive.exists());
-		JavaProjectHelper.addSourceContainerWithImport(fJProject2, "src", junitSrcArchive);
-	
-		// source folder
-		IPackageFragmentRoot root1= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		IPackageFragment pack1= root1.createPackageFragment("com.oti", true, null);
-		ICompilationUnit cu1= pack1.getCompilationUnit("V.java");
-		cu1.createType("public class V {\n static class VInner {\n}\n}\n", null, true, null);
-
-		// proj1 has proj2 as prerequisit
-		JavaProjectHelper.addRequiredProject(fJProject1, fJProject2);
-
-		// internal jar
-		//IPackageFragmentRoot root2= JavaProjectHelper.addLibraryWithImport(fJProject1, JARFILE, null, null);
-		ArrayList result= new ArrayList();
-
-		IJavaElement[] elements= new IJavaElement[] { fJProject1 };
-		IJavaSearchScope scope= SearchEngine.createJavaSearchScope(elements);
-		ITypeNameRequestor requestor= new TypeInfoRequestor(result);
-		SearchEngine engine= new SearchEngine();
-
-		engine.searchAllTypeNames(
-			null, 
-			new char[] {'V'}, 
-			SearchPattern.R_PREFIX_MATCH, 
-			IJavaSearchConstants.TYPE, 
-			scope, 
-			requestor, 
-			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, 
-			null); 
-		findTypeRef(result, "com.oti.V");
-		findTypeRef(result, "com.oti.V.VInner");
-		findTypeRef(result, "java.lang.VerifyError");
-		findTypeRef(result, "java.lang.Void");
-		findTypeRef(result, "java.util.Vector");
-		findTypeRef(result, "junit.samples.VectorTest");
-
-		
-		for (int i= 0; i < result.size(); i++) {
-			TypeInfo ref= (TypeInfo) result.get(i);
-			//System.out.println(ref.getTypeName());
-			IType resolvedType= ref.resolveType(scope);
-			if (resolvedType == null) {
-				assertTrue("Could not be resolved: " + ref.toString(), false);
-			}
-		}
-		assertTrue("Should find 9 elements, is " + result.size(), result.size() == 9);
-
-
-	}
-	
-	private void findTypeRef(List refs, String fullname) {
-		for (int i= 0; i <refs.size(); i++) {
-			TypeInfo curr= (TypeInfo) refs.get(i);
-			if (fullname.equals(curr.getFullyQualifiedName())) {
-				return;
-			}
-		}
-		assertTrue("Type not found: " + fullname, false);
-	}
-		
-	
-	public void test2() throws Exception {	
-		ArrayList result= new ArrayList();
-		
-		// add Junit source to project 2
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("Junit source", junitSrcArchive != null && junitSrcArchive.exists());
-		JavaProjectHelper.addSourceContainerWithImport(fJProject2, "src", junitSrcArchive);
-		
-		
-		IJavaProject[] elements= new IJavaProject[] { fJProject2 };
-		IJavaSearchScope scope= SearchEngine.createJavaSearchScope(elements);
-		ITypeNameRequestor requestor= new TypeInfoRequestor(result);
-		SearchEngine engine= new SearchEngine();
-
-		engine.searchAllTypeNames(
-			null, 
-			new char[] {'T'}, 
-			SearchPattern.R_PREFIX_MATCH, 
-			IJavaSearchConstants.TYPE, 
-			scope, 
-			requestor, 
-			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, 
-			null); 
-
-		findTypeRef(result, "junit.extensions.TestDecorator");
-		findTypeRef(result, "junit.framework.Test");
-		findTypeRef(result, "junit.framework.TestListener");
-		findTypeRef(result, "junit.tests.TestCaseTest.TornDown");
-
-		assertTrue("Should find 37 elements, is " + result.size(), result.size() == 37);
-		//System.out.println("Elements found: " + result.size());
-		for (int i= 0; i < result.size(); i++) {
-			TypeInfo ref= (TypeInfo) result.get(i);
-			//System.out.println(ref.getTypeName());
-			IType resolvedType= ref.resolveType(scope);
-			if (resolvedType == null) {
-				assertTrue("Could not be resolved: " + ref.toString(), false);
-			}
-		}
-	}
-	
-	
-	
-	
-	
-	public void testNoSourceFolder() throws Exception {
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJProject1, "");
-		IPackageFragment pack1= root.createPackageFragment("", true, null);
-		ICompilationUnit cu1= pack1.getCompilationUnit("A.java");
-		cu1.createType("public class A {\n}\n", null, true, null);		
-
-		IPackageFragment pack2= root.createPackageFragment("org.eclipse", true, null);
-		ICompilationUnit cu2= pack2.getCompilationUnit("B.java");
-		cu2.createType("public class B {\n}\n", null, true, null);
-		
-		TypeInfo[] result= AllTypesCache.getAllTypes(new NullProgressMonitor());
-		for (int i= 0; i < result.length; i++) {
-			TypeInfo info= result[i];
-			if (info.getElementType() == TypeInfo.IFILE_TYPE_INFO) {
-				IFileTypeInfo fileInfo= (IFileTypeInfo)info;
-				if (info.getTypeName().equals("A")) {
-					assertEquals(info.getPackageName(), "");
-					assertEquals(fileInfo.getProject(), "TestProject1");
-					assertNull(fileInfo.getFolder());
-					assertEquals(fileInfo.getFileName(), "A");
-					assertEquals(fileInfo.getExtension(), "java");
-				} else if (info.getTypeName().equals("B")) {
-					assertEquals(info.getPackageName(), "org.eclipse");
-					assertEquals(fileInfo.getProject(), "TestProject1");
-					assertNull(fileInfo.getFolder());
-					assertEquals(fileInfo.getFileName(), "B");
-					assertEquals(fileInfo.getExtension(), "java");
-				}
-			}
-		}
-	}
-
-	public void testSourceFolder() throws Exception {
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		IPackageFragment pack1= root.createPackageFragment("", true, null);
-		ICompilationUnit cu1= pack1.getCompilationUnit("A.java");
-		cu1.createType("public class A {\n}\n", null, true, null);		
-
-		IPackageFragment pack2= root.createPackageFragment("org.eclipse", true, null);
-		ICompilationUnit cu2= pack2.getCompilationUnit("B.java");
-		cu2.createType("public class B {\n}\n", null, true, null);
-		
-		TypeInfo[] result= AllTypesCache.getAllTypes(new NullProgressMonitor());
-		for (int i= 0; i < result.length; i++) {
-			TypeInfo info= result[i];
-			if (info.getElementType() == TypeInfo.IFILE_TYPE_INFO) {
-				IFileTypeInfo fileInfo= (IFileTypeInfo)info;
-				if (info.getTypeName().equals("A")) {
-					assertEquals(info.getPackageName(), "");
-					assertEquals(fileInfo.getProject(), "TestProject1");
-					assertEquals(fileInfo.getFolder(), "src");
-					assertEquals(fileInfo.getFileName(), "A");
-					assertEquals(fileInfo.getExtension(), "java");
-				} else if (info.getTypeName().equals("B")) {
-					assertEquals(info.getPackageName(), "org.eclipse");
-					assertEquals(fileInfo.getProject(), "TestProject1");
-					assertEquals(fileInfo.getFolder(), "src");
-					assertEquals(fileInfo.getFileName(), "B");
-					assertEquals(fileInfo.getExtension(), "java");
-				}
-			}
-		}
-	}
-	
-	public void testJar() throws Exception {
-		TypeInfo[] result= AllTypesCache.getAllTypes(new NullProgressMonitor());
-		for (int i= 0; i < result.length; i++) {
-			TypeInfo info= result[i];
-			if (info.getElementType() == TypeInfo.JAR_FILE_ENTRY_TYPE_INFO) {
-				JarFileEntryTypeInfo jarInfo= (JarFileEntryTypeInfo)info;
-				if (info.getTypeName().equals("Object")) {
-					assertEquals(info.getPackageName(), "java.lang");
-					assertTrue(jarInfo.getJar().endsWith("rtstubs.jar"));
-					assertEquals(jarInfo.getFileName(), "Object");
-					assertEquals(jarInfo.getExtension(), "class");
-				}
-			}
-		}		
-	}
-
-	public void test_bug44772() throws Exception {
-		File lib= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-
-		JavaProjectHelper.addLibraryWithImport(fJProject1, new Path(lib.getPath()), null, null); // as internal 
-		JavaProjectHelper.addLibrary(fJProject1, new Path(lib.getPath())); // and as external
-		
-		ArrayList result= new ArrayList();
-
-		IJavaElement[] elements= new IJavaElement[] { fJProject1 };
-		IJavaSearchScope scope= SearchEngine.createJavaSearchScope(elements);
-		ITypeNameRequestor requestor= new TypeInfoRequestor(result);
-		SearchEngine engine= new SearchEngine();
-
-		engine.searchAllTypeNames(
-			null, 
-			"Foo".toCharArray(),
-			SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE, 
-			IJavaSearchConstants.TYPE, 
-			scope, 
-			requestor, 
-			IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, 
-			null); 
-		assertEquals("result size", result.size(), 2);
-		IType type1= ((TypeInfo) result.get(0)).resolveType(scope);
-		IType type2= ((TypeInfo) result.get(1)).resolveType(scope);
-		
-		assertNotNull(type1);
-		assertNotNull(type2);
-		assertFalse(type1.equals(type2));
-
-	}
-
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeRulesTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeRulesTest.java
deleted file mode 100644
index 1f4c829..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeRulesTest.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.core;
-
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-
-import org.eclipse.jdt.internal.corext.dom.TypeRules;
-
-
-public class TypeRulesTest extends CoreTests {
-	
-	private static final Class THIS= TypeRulesTest.class;
-	
-	private IJavaProject fJProject1;
-
-	private IPackageFragmentRoot fSourceFolder;
-
-	public TypeRulesTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new TypeRulesTest("test1"));
-			return new ProjectTestSetup(suite);
-		}	
-	}
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(JavaCore.COMPILER_PB_NO_EFFECT_ASSIGNMENT, JavaCore.IGNORE);
-		options.put(JavaCore.COMPILER_PB_UNNECESSARY_TYPE_CHECK, JavaCore.IGNORE);
-		options.put(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.IGNORE);
-		JavaCore.setOptions(options);
-		
-		fJProject1= ProjectTestSetup.getProject();
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-	
-	
-	private VariableDeclarationFragment[] createVariables() throws JavaModelException {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.util.Collection;\n");
-		buf.append("import java.io.Serializable;\n");
-		buf.append("import java.net.Socket;\n");
-		buf.append("public class E {\n");
-		buf.append("    boolean bool= false;\n");
-		buf.append("    char c= 0;\n");
-		buf.append("    byte b= 0;\n");
-		buf.append("    short s= 0;\n");
-		buf.append("    int i= 0;\n");
-		buf.append("    long l= 0;\n");
-		buf.append("    float f= 0;\n");
-		buf.append("    double d= 0;\n");
-		buf.append("    Object object= null;\n");
-		buf.append("    Vector vector= null;\n");
-		buf.append("    Socket socket= null;\n");
-		buf.append("    Cloneable cloneable= null;\n");
-		buf.append("    Collection collection= null;\n");
-		buf.append("    Serializable serializable= null;\n");
-		buf.append("    Object[] objectArr= null;\n");
-		buf.append("    int[] int_arr= null;\n");
-		buf.append("    long[] long_arr= null;\n");
-		buf.append("    Vector[] vector_arr= null;\n");
-		buf.append("    Socket[] socket_arr= null;\n");
-		buf.append("    Collection[] collection_arr= null;\n");
-		buf.append("    Object[][] objectArrArr= null;\n");
-		buf.append("    Collection[][] collection_arrarr= null;\n");
-		buf.append("    Vector[][] vector_arrarr= null;\n");
-		buf.append("    Socket[][] socket_arrarr= null;\n");
-		buf.append("}\n");
-		ICompilationUnit cu1=pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		ASTParser parser= ASTParser.newParser(AST.JLS3);
-		parser.setSource(cu1);
-		parser.setResolveBindings(true);
-		
-		CompilationUnit astRoot= (CompilationUnit) parser.createAST(null);
-		IProblem[] problems= astRoot.getProblems();
-		assertNumberOf("problems", problems.length, 0);
-		
-		TypeDeclaration type= (TypeDeclaration) astRoot.types().get(0);
-		FieldDeclaration[] fields= type.getFields();
-		
-		VariableDeclarationFragment[] targets= new VariableDeclarationFragment[fields.length];
-		for (int i= 0; i < fields.length; i++) {
-			targets[i]= (VariableDeclarationFragment) fields[i].fragments().get(0);
-		}
-		return targets;
-	}
-	
-	public void testCanAssign() throws Exception {
-		VariableDeclarationFragment[] targets= createVariables();
-		
-		for (int k= 0; k < targets.length; k++) {
-			for (int n= 0; n < targets.length; n++) {
-				VariableDeclarationFragment f1= targets[k];
-				VariableDeclarationFragment f2= targets[n];
-				String line= f2.getName().getIdentifier() + "= " + f1.getName().getIdentifier();
-				
-				StringBuffer buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class F extends E {\n");
-				buf.append("    void foo() {\n");
-				buf.append("        ").append(line).append(";\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				char[] content= buf.toString().toCharArray();
-				
-				ASTParser parser= ASTParser.newParser(AST.JLS3);
-				parser.setSource(content);
-				parser.setProject(fJProject1);
-				parser.setUnitName("F.java");
-				
-				CompilationUnit astRoot= (CompilationUnit) parser.createAST(null);
-				IProblem[] problems= astRoot.getProblems();
-
-				ITypeBinding b1= f1.resolveBinding().getType();
-				assertNotNull(b1);
-				ITypeBinding b2= f2.resolveBinding().getType();
-				assertNotNull(b2);
-				boolean res= TypeRules.canAssign(b1, b2.getQualifiedName());
-				assertEquals(line, problems.length == 0, res);
-				boolean res2= TypeRules.canAssign(b1, b2);
-				assertEquals(line, problems.length == 0, res2);			
-			}	
-		}
-	}
-	
-	public void testCanCast() throws Exception {
-		VariableDeclarationFragment[] targets= createVariables();
-		for (int k= 0; k < targets.length; k++) {
-			for (int n= 0; n < targets.length; n++) {
-				VariableDeclarationFragment f1= targets[k];
-				VariableDeclarationFragment f2= targets[n];
-				
-				String castType= f2.resolveBinding().getType().getQualifiedName();
-				String line= castType + " x= (" + castType + ") " + f1.getName().getIdentifier();
-				
-				StringBuffer buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class F extends E {\n");
-				buf.append("    void foo() {\n");
-				buf.append("        ").append(line).append(";\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				char[] content= buf.toString().toCharArray();
-				
-				ASTParser parser= ASTParser.newParser(AST.JLS3);
-				parser.setSource(content);
-				parser.setResolveBindings(true);
-				parser.setProject(fJProject1);
-				parser.setUnitName("F.java");
-				
-				CompilationUnit astRoot= (CompilationUnit) parser.createAST(null);
-				IProblem[] problems= astRoot.getProblems();
-
-				ITypeBinding b1= f1.resolveBinding().getType();
-				assertNotNull(b1);
-				ITypeBinding b2= f2.resolveBinding().getType();
-				assertNotNull(b2);
-				boolean res= TypeRules.canCast(b2, b1);
-				if (res != (problems.length == 0)) {
-					res= TypeRules.canCast(b2, b1);
-					assertTrue(line, false);
-				}
-			}	
-		}
-	}
-		
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/DialogsTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/DialogsTest.java
deleted file mode 100644
index 4cf4143..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/DialogsTest.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.dialogs;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.util.DialogCheck;
-
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.JavaElementSorter;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-
-import org.eclipse.jdt.internal.corext.util.AllTypesCache;
-import org.eclipse.jdt.internal.corext.util.TypeInfo;
-import org.eclipse.jdt.internal.ui.dialogs.MultiElementListSelectionDialog;
-import org.eclipse.jdt.internal.ui.dialogs.OpenTypeSelectionDialog;
-import org.eclipse.jdt.internal.ui.util.TypeInfoLabelProvider;
-
-public class DialogsTest extends TestCase {
-	
-	private static final String PROJECT_NAME = "DummyProject";
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite(DialogsTest.class.getName());
-//		suite.addTest(new DialogsTest("testElementListSelectionDialog2"));
-		suite.addTest(new DialogsTest("testElementListSelectionDialog"));
-		suite.addTest(new DialogsTest("testMultiElementSelectionDialog"));
-		suite.addTest(new DialogsTest("testTwoPaneSelectionDialog"));
-		suite.addTest(new DialogsTest("testElementTreeSelectionDialog"));
-		suite.addTest(new DialogsTest("testElementListSelectionDialog"));
-		return suite;
-	}
-
-	public DialogsTest(String name) {
-		super(name);
-	}
-	private Shell getShell() {
-		return DialogCheck.getShell();
-	}
-	public void testTwoPaneSelectionDialog() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		JavaProjectHelper.addSourceContainer(jproject, "src1");
-		JavaProjectHelper.addRTJar(jproject);
-		
-		OpenTypeSelectionDialog dialog= new OpenTypeSelectionDialog(getShell(), new ProgressMonitorDialog(getShell()), 
-			IJavaSearchConstants.TYPE, SearchEngine.createWorkspaceScope());
-	
-		dialog.setTitle("Open Type"); 
-		dialog.setMessage("&Choose a type (? = any character, * = any string):"); 
-
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);
-	}
-	
-	private TypeInfo[] getRefs(ArrayList list, int off, int len) {
-		TypeInfo[] res= new TypeInfo[len];
-		for (int i= 0; i < len; i++) {
-			res[i]= (TypeInfo) list.get(off + i);
-		}
-		return res;
-	}
-	
-	public void testMultiElementSelectionDialog() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		JavaProjectHelper.addSourceContainer(jproject, "src1");
-		JavaProjectHelper.addRTJar(jproject);
-
-		ILabelProvider labelProvider= new TypeInfoLabelProvider(TypeInfoLabelProvider.SHOW_FULLYQUALIFIED);
-
-		ArrayList list= new ArrayList(200);
-
-		IJavaSearchScope searchScope= SearchEngine.createJavaSearchScope(new IJavaElement[] { jproject });		
-		AllTypesCache.getTypes(searchScope, IJavaSearchConstants.TYPE, null, list);
-		
-		MultiElementListSelectionDialog dialog= new MultiElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setTitle("Title"); //$NON-NLS-1$
-		dialog.setMessage("Description:"); //$NON-NLS-1$
-	
-		assertTrue(list.size() > 15);
-		TypeInfo[][] refs= new TypeInfo[][] { getRefs(list, 0, 3), getRefs(list, 4, 6), getRefs(list, 10, 5) };
-		dialog.setElements(refs);
-		dialog.setInitialSelections(new Object[refs.length]);
-		
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);		
-	
-	}
-	
-	public void testElementTreeSelectionDialog() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		JavaProjectHelper.addSourceContainer(jproject, "src1");
-		Object initSelection= JavaProjectHelper.addSourceContainer(jproject, "src2");
-
-		IJavaProject jproject2= JavaProjectHelper.createJavaProject("Project2", "bin");
-		JavaProjectHelper.addSourceContainer(jproject2, "src1");
-		JavaProjectHelper.addSourceContainer(jproject2, "src2");
-
-		StandardJavaElementContentProvider provider= new StandardJavaElementContentProvider();
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT); 
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
-		dialog.setSorter(new JavaElementSorter());
-		dialog.setTitle("Title"); 
-		dialog.setMessage("Message"); 
-		
-		dialog.setInput(jproject.getJavaModel());
-		dialog.setInitialSelection(initSelection);
-		
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);	
-		JavaProjectHelper.delete(jproject2);
-	}
-	
-	public void testElementListSelectionDialog() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root=  JavaProjectHelper.addRTJar(jproject);
-		assertTrue(root != null);
-		Object[] elements= root.getChildren();
-
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT));
-		dialog.setIgnoreCase(false);
-		dialog.setTitle("Title"); 
-		dialog.setMessage("Message"); 
-		dialog.setEmptyListMessage("empty list"); 		
-		dialog.setElements(elements);
-		
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);	
-	}
-	
-
-	private static class TestLabelProvider extends LabelProvider {
-		public Image getImage(Object element) {
-			return null;
-		}
-		
-		public String getText(Object element) {
-			Integer i= (Integer) element;			
-			return "e-" + i.toString();
-		}
-	}
-
-	public void testElementListSelectionDialog2() throws Exception {
-		Object[] elements= new Integer[] {
-			new Integer(0),
-			new Integer(1),
-			new Integer(2),
-			new Integer(7),
-			new Integer(12),
-			new Integer(42)			
-		};
-
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new TestLabelProvider());
-		dialog.setIgnoreCase(false);
-		dialog.setTitle("Title"); 
-		dialog.setMessage("Message"); 
-		dialog.setEmptyListMessage("empty messgae"); 		
-		dialog.setElements(elements);
-		dialog.setInitialSelections(new Object[] {new Integer(7)});
-		
-		DialogCheck.assertDialog(dialog);
-		
-		Object[] results= dialog.getResult();
-		assertTrue(results.length == 1);
-		assertEquals(new Integer(7), results[0]);
-	}
-
-}
-

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/DialogsTest2.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/DialogsTest2.java
deleted file mode 100644
index f6491b9..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/DialogsTest2.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.dialogs;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
-
-import org.eclipse.jdt.core.IJavaProject;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.util.DialogCheck;
-
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.JavaElementSorter;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-
-public class DialogsTest2 extends TestCase {
-	
-	private static final String PROJECT_NAME = "DummyProject";
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite(DialogsTest2.class.getName());
-		suite.addTest(new DialogsTest2("testCheckedTreeSelectionDialog"));
-		suite.addTest(new DialogsTest2("testCheckedTreeSelectionDialog"));
-		return suite;
-	}
-
-	public DialogsTest2(String name) {
-		super(name);
-	}
-	private Shell getShell() {
-		return DialogCheck.getShell();
-	}
-	public void testCheckedTreeSelectionDialog() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		JavaProjectHelper.addSourceContainer(jproject, "src1");
-		Object initSelection= JavaProjectHelper.addSourceContainer(jproject, "src2");
-
-		IJavaProject jproject2= JavaProjectHelper.createJavaProject("Project2", "bin");
-		JavaProjectHelper.addSourceContainer(jproject2, "src1");
-		JavaProjectHelper.addSourceContainer(jproject2, "src2");
-
-		StandardJavaElementContentProvider provider= new StandardJavaElementContentProvider();
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT); 
-		CheckedTreeSelectionDialog dialog= new CheckedTreeSelectionDialog(getShell(), labelProvider, provider);
-		dialog.setSorter(new JavaElementSorter());
-		dialog.setTitle("Title"); //$NON-NLS-1$
-		dialog.setMessage("Select the elements"); //$NON-NLS-1$
-		
-		dialog.setInput(jproject.getJavaModel());
-		dialog.setInitialSelection(initSelection);
-		dialog.setExpandedElements(new Object[] { initSelection, jproject });
-		
-		DialogCheck.assertDialog(dialog);
-		
-		System.out.println("Result:");
-		Object[] checkedElements= dialog.getResult();
-		for (int i= 0; i < checkedElements.length; i++) {
-			System.out.println(labelProvider.getText(checkedElements[i]));
-		}
-		
-		
-		JavaProjectHelper.delete(jproject);	
-		JavaProjectHelper.delete(jproject2);
-	}
-
-}
-

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/PreferencesTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/PreferencesTest.java
deleted file mode 100644
index 5af25c5..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/PreferencesTest.java
+++ /dev/null

@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.dialogs;
-
-import java.util.Iterator;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.ui.internal.WorkbenchMessages;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.dialogs.PropertyDialog;
-import org.eclipse.ui.internal.dialogs.PropertyPageContributorManager;
-import org.eclipse.ui.internal.dialogs.PropertyPageManager;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.util.DialogCheck;
-
-public class PreferencesTest extends TestCase {
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite(PreferencesTest.class.getName());
-		suite.addTest(new PreferencesTest("testJavaBasePrefPage"));
-		suite.addTest(new PreferencesTest("testClasspathVarPrefPage"));
-		suite.addTest(new PreferencesTest("testCodeFormatterPrefPage"));
-		suite.addTest(new PreferencesTest("testExecArgPropPage"));
-		suite.addTest(new PreferencesTest("testImportOrganizePrefPage"));
-		suite.addTest(new PreferencesTest("testInfoPropPage"));
-		suite.addTest(new PreferencesTest("testJARSourceAttachmentPropPage"));
-		suite.addTest(new PreferencesTest("testJavaBasePrefPage"));
-		suite.addTest(new PreferencesTest("testJavaCompilerPrefPage"));
-		suite.addTest(new PreferencesTest("testJavaDebugPrefPage"));
-		suite.addTest(new PreferencesTest("testJavaEditorPrefPage"));
-		suite.addTest(new PreferencesTest("testNoExecArgPropPage"));
-		suite.addTest(new PreferencesTest("testRefactoringPrefPage"));
-		suite.addTest(new PreferencesTest("testVMPrefPage"));
-		suite.addTest(new PreferencesTest("testVMPropPage"));
-		suite.addTest(new PreferencesTest("testVSourceLookupPage"));
-		suite.addTest(new PreferencesTest("testVariableSourceAttachmentPropPage"));					
-		return suite;
-	}	
-	
-	private static class PreferenceDialogWrapper extends PreferenceDialog {
-		
-		public PreferenceDialogWrapper(Shell parentShell, PreferenceManager manager) {
-			super(parentShell, manager);
-		}
-		protected boolean showPage(IPreferenceNode node) {
-			return super.showPage(node);
-		}
-	}
-	
-	private class PropertyDialogWrapper extends PropertyDialog {
-		
-		public PropertyDialogWrapper(Shell parentShell, PreferenceManager manager, ISelection selection) {
-			super(parentShell, manager, selection);
-		}
-		protected boolean showPage(IPreferenceNode node) {
-			return super.showPage(node);
-		}
-	}		
-	
-	
-	private boolean fIsInteractive= true;
-	
-	private static final String PROJECT_NAME = "DummyProject";
-	
-	public PreferencesTest(String name) {
-		super(name);
-	}
-
-	private Shell getShell() {
-		return DialogCheck.getShell();
-	}
-	
-	public void assertDialog(Dialog dialog, Assert assertTrue) {
-		if (fIsInteractive) {
-			DialogCheck.assertDialog(dialog);
-		} else {
-			DialogCheck.assertDialogTexts(dialog);
-		}
-	}
-	
-	
-	private PreferenceDialog getPreferenceDialog(String id) {
-		PreferenceDialogWrapper dialog = null;
-		PreferenceManager manager = WorkbenchPlugin.getDefault().getPreferenceManager();
-		if (manager != null) {
-			dialog = new PreferenceDialogWrapper(getShell(), manager);
-			dialog.create();	
-
-			for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
-			     iterator.hasNext();)
-			{
-				IPreferenceNode node = (IPreferenceNode)iterator.next();
-				if ( node.getId().equals(id) ) {
-					dialog.showPage(node);
-					break;
-				}
-			}
-		}
-		return dialog;
-	}
-	
-	private PropertyDialog getPropertyDialog(String id, IAdaptable element) {
-		PropertyDialogWrapper dialog = null;
-
-		PropertyPageManager manager = new PropertyPageManager();
-		String title = "";
-		String name  = "";
-
-		// load pages for the selection
-		// fill the manager with contributions from the matching contributors
-		PropertyPageContributorManager.getManager().contribute(manager, element);
-		
-		IWorkbenchAdapter adapter = (IWorkbenchAdapter)element.getAdapter(IWorkbenchAdapter.class);
-		if (adapter != null) {
-			name = adapter.getLabel(element);
-		}
-		
-		// testing if there are pages in the manager
-		Iterator pages = manager.getElements(PreferenceManager.PRE_ORDER).iterator();		
-		if (!pages.hasNext()) {
-			return null;
-		} else {
-			title = WorkbenchMessages.format("PropertyDialog.propertyMessage", new Object[] {name});
-			dialog = new PropertyDialogWrapper(getShell(), manager, new StructuredSelection(element)); 
-			dialog.create();
-			dialog.getShell().setText(title);
-			for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
-			     iterator.hasNext();)
-			{
-				IPreferenceNode node = (IPreferenceNode)iterator.next();
-				if ( node.getId().equals(id) ) {
-					dialog.showPage(node);
-					break;
-				}
-			}
-		}
-		return dialog;
-	}
-	
-	public void testJavaBasePrefPage() {
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage");
-		assertDialog(dialog, this);
-	}
-	
-	public void testImportOrganizePrefPage() {
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.preferences.ImportOrganizePreferencePage");
-		assertDialog(dialog, this);
-	}
-	
-	public void testCodeFormatterPrefPage() {
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.preferences.CodeFormatterPreferencePage");
-		assertDialog(dialog, this);
-	}
-	
-	public void testClasspathVarPrefPage() throws Exception {
-		IPath path= ResourcesPlugin.getWorkspace().getRoot().getLocation();		
-		JavaCore.setClasspathVariable("DUMMY_VAR", path, null);
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.preferences.ClasspathVariablesPreferencePage");
-		assertDialog(dialog, this);
-		JavaCore.removeClasspathVariable("DUMMY_VAR", null);
-	}
-	
-	public void testJavaEditorPrefPage() {
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.preferences.JavaEditorPreferencePage");
-		assertDialog(dialog, this);
-	}
-	
-	public void testJavaCompilerPrefPage() {
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.preferences.CompilerPreferencePage");
-		assertDialog(dialog, this);
-	}
-	
-	public void testJavaDebugPrefPage() {
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.JavaDebugPreferencePage");
-		assertDialog(dialog, this);
-	}
-	
-	public void testRefactoringPrefPage() {
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.preferences.RefactoringPreferencePage");
-		assertDialog(dialog, this);
-	}
-	
-	public void testVMPrefPage() {
-		Dialog dialog = getPreferenceDialog("org.eclipse.jdt.ui.preferences.VMPreferencePage");
-		assertDialog(dialog, this);
-	}
-
-	public void testBuildPathPropPage() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		JavaProjectHelper.addSourceContainer(jproject, "src");
-		JavaProjectHelper.addRTJar(jproject);
-		IJavaProject dep1= JavaProjectHelper.createJavaProject("OtherProject", "bin");
-		JavaProjectHelper.addRequiredProject(jproject, dep1);
-		
-		Dialog dialog = getPropertyDialog("org.eclipse.jdt.ui.propertyPages.BuildPathsPropertyPage", jproject);
-		assertDialog(dialog, this);
-		JavaProjectHelper.delete(jproject);
-		JavaProjectHelper.delete(dep1);
-	}
-	
-	public void testJARSourceAttachmentPropPage() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addRTJar(jproject);
-		assertTrue(root != null);
-		
-		Dialog dialog = getPropertyDialog("org.eclipse.jdt.ui.propertyPages.SourceAttachmentPage1", root);
-		assertDialog(dialog, this);
-		
-		JavaProjectHelper.delete(jproject);
-	}
-	
-	public void testVariableSourceAttachmentPropPage() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addVariableRTJar(jproject, "VAR_LIB", "VAR_SRC", "VAR_SRCROOT");
-		assertTrue(root != null);
-		
-		Dialog dialog = getPropertyDialog("org.eclipse.jdt.ui.propertyPages.SourceAttachmentPage1", root);
-		assertDialog(dialog, this);
-		
-		JavaProjectHelper.delete(jproject);
-		JavaCore.removeClasspathVariable("VAR_LIB", null);
-		JavaCore.removeClasspathVariable("VAR_SRC", null);
-		JavaCore.removeClasspathVariable("VAR_SRCROOT", null);
-	}
-	
-	public void testInfoPropPage() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(jproject, "src");
-		IPackageFragment pack= root.createPackageFragment("org.eclipse.jdt.internal.ui.wizards.dummy", true, null);
-		ICompilationUnit cu= pack.getCompilationUnit("DummyCompilationUnitWizard.java");
-		cu.createType("public class DummyCompilationUnitWizard {\n\n}\n", null, true, null);	
-		
-		Dialog dialog = getPropertyDialog("org.eclipse.jdt.ui.propertyPages.InfoPage", cu);
-		assertDialog(dialog, this);
-		
-		JavaProjectHelper.delete(jproject);
-	}
-	
-	public void testNoExecArgPropPage() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(jproject, "src");
-		IPackageFragment pack= root.createPackageFragment("org.eclipse.jdt.internal.ui.hello", true, null);
-		ICompilationUnit cu= pack.getCompilationUnit("HelloWorld.java");
-		cu.createType("public class HelloWorld {\n\n}\n", null, true, null);	
-	
-		Dialog dialog = getPropertyDialog("org.eclipse.jdt.ui.propertyPages.ExecutionArgsPage", cu);
-		assertDialog(dialog, this);
-		
-		JavaProjectHelper.delete(jproject);
-	}	
-	
-	public void testExecArgPropPage() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(jproject, "src");
-		IPackageFragment pack= root.createPackageFragment("org.eclipse.jdt.internal.ui.hello", true, null);
-		ICompilationUnit cu= pack.getCompilationUnit("HelloWorld.java");
-		cu.createType("public class HelloWorld {\npublic static void main(String[] args) {}\n}\n", null, true, null);	
-	
-		Dialog dialog = getPropertyDialog("org.eclipse.jdt.ui.propertyPages.ExecutionArgsPage", cu);
-		assertDialog(dialog, this);
-		
-		JavaProjectHelper.delete(jproject);
-	}	
-		
-
-	public void testVMPropPage() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-
-		Dialog dialog = getPropertyDialog("org.eclipse.jdt.ui.propertyPages.VMPropertyPage", jproject);
-		assertDialog(dialog, this);
-		
-		JavaProjectHelper.delete(jproject);
-	}	
-	
-	public void testVSourceLookupPage() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IJavaProject dep1= JavaProjectHelper.createJavaProject("OtherProject", "bin");
-		JavaProjectHelper.addRequiredProject(jproject, dep1);
-		
-		Dialog dialog = getPropertyDialog("org.eclipse.jdt.ui.launching.SourceLookupPage", jproject);
-		assertDialog(dialog, this);
-		
-		JavaProjectHelper.delete(jproject);
-		JavaProjectHelper.delete(dep1);
-	}	
-	
-}
-

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/WizardsTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/WizardsTest.java
deleted file mode 100644
index 9934b2c..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/dialogs/WizardsTest.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.dialogs;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.util.DialogCheck;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.internal.ui.jarpackager.JarPackageWizard;
-import org.eclipse.jdt.internal.ui.wizards.JavaProjectWizard;
-import org.eclipse.jdt.internal.ui.wizards.NewClassCreationWizard;
-import org.eclipse.jdt.internal.ui.wizards.NewInterfaceCreationWizard;
-import org.eclipse.jdt.internal.ui.wizards.NewPackageCreationWizard;
-import org.eclipse.jdt.internal.ui.wizards.NewSourceFolderCreationWizard;
-
-public class WizardsTest extends TestCase {
-	
-	private static final String PROJECT_NAME = "DummyProject";
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite(WizardsTest.class.getName());
-		suite.addTest(new WizardsTest("testClassWizard"));
-		suite.addTest(new WizardsTest("testInterfaceWizard"));
-		suite.addTest(new WizardsTest("testJarPackageWizard"));
-		suite.addTest(new WizardsTest("testNewProjectWizard"));
-		suite.addTest(new WizardsTest("testPackageWizard"));
-		suite.addTest(new WizardsTest("testSourceFolderWizard"));				
-		return suite;
-	}		
-	
-	public WizardsTest(String name) {
-		super(name);
-	}
-	private Shell getShell() {
-		return DialogCheck.getShell();
-	}
-	private IWorkbench getWorkbench() {
-		return PlatformUI.getWorkbench();
-	}
-	
-	public void testNewProjectWizard() throws Exception {	
-		JavaProjectWizard wizard = new JavaProjectWizard();
-		wizard.init(getWorkbench(),  null);
-		wizard.setForcePreviousAndNextButtons(true);
-		WizardDialog dialog = new WizardDialog(getShell(), wizard);
-		dialog.create();
-		DialogCheck.assertDialog(dialog);
-	}
-	
-	public void testSourceFolderWizard() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		JavaProjectHelper.addSourceContainer(jproject, "src1");
-		JavaProjectHelper.addRTJar(jproject);
-	
-		NewSourceFolderCreationWizard wizard = new NewSourceFolderCreationWizard();
-		wizard.init(getWorkbench(), new StructuredSelection(jproject));
-		wizard.setForcePreviousAndNextButtons(true);
-		WizardDialog dialog = new WizardDialog(getShell(), wizard);
-		dialog.create();
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);
-	}
-	
-	public void testPackageWizard() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(jproject, "src1");
-		JavaProjectHelper.addRTJar(jproject);
-	
-		NewPackageCreationWizard wizard = new NewPackageCreationWizard();
-		wizard.init(getWorkbench(), new StructuredSelection(root));
-		wizard.setForcePreviousAndNextButtons(true);
-		WizardDialog dialog = new WizardDialog(getShell(), wizard);
-		dialog.create();
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);
-	}
-	
-	public void testClassWizard() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(jproject, "src1");
-		IPackageFragment pack= root.createPackageFragment("org.eclipse.jdt.internal.ui.hello", true, null);
-		JavaProjectHelper.addRTJar(jproject);
-	
-		NewClassCreationWizard wizard = new NewClassCreationWizard();
-		wizard.init(getWorkbench(), new StructuredSelection(pack));
-		wizard.setForcePreviousAndNextButtons(true);
-		WizardDialog dialog = new WizardDialog(getShell(), wizard);
-		dialog.create();
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);
-	}
-	
-	public void testInterfaceWizard() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(jproject, "src1");
-		IPackageFragment pack= root.createPackageFragment("org.eclipse.jdt.internal.ui.hello", true, null);
-		JavaProjectHelper.addRTJar(jproject);
-	
-		NewInterfaceCreationWizard wizard = new NewInterfaceCreationWizard();
-		wizard.init(getWorkbench(), new StructuredSelection(pack));
-		wizard.setForcePreviousAndNextButtons(true);
-		WizardDialog dialog = new WizardDialog(getShell(), wizard);
-		dialog.create();
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);
-	}
-		
-	public void testJarPackageWizard() throws Exception {
-		IJavaProject jproject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin");
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(jproject, "src1");
-		JavaProjectHelper.addRTJar(jproject);
-		IPackageFragment pack= root.createPackageFragment("org.eclipse.jdt.internal.ui.hello", true, null);
-		ICompilationUnit cu= pack.getCompilationUnit("HelloWorld.java");
-		cu.createType("public class HelloWorld {\npublic static void main(String[] args) {}\n}\n", null, true, null);	
-	
-		JarPackageWizard wizard = new JarPackageWizard();
-		wizard.init(getWorkbench(), new StructuredSelection(root));
-		wizard.setForcePreviousAndNextButtons(true);
-		WizardDialog dialog = new WizardDialog(getShell(), wizard);
-		dialog.create();
-		DialogCheck.assertDialog(dialog);
-		
-		JavaProjectHelper.delete(jproject);
-	}				
-	
-}
-

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests1.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests1.java
deleted file mode 100644
index e4af0f2..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests1.java
+++ /dev/null

@@ -1,451 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.packageview;
-
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-/**
- * Tests for the PackageExplorerContentProvider.
- * 
- * @since 2.1
- */
-public class ContentProviderTests1 extends TestCase {
-
-
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("org.eclipse.jdt.ui.ContentProviderTests1"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-	   suite.addTestSuite(ContentProviderTests1.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-	private IJavaProject fJProject1;
-	private IJavaProject fJProject2;
-	
-	private IPackageFragmentRoot fRoot1;
-	private IPackageFragment fPack1;
-	private IPackageFragment fPack2;
-	private IPackageFragment fPack4;
-	private IPackageFragment fPack3;
-	private IWorkspace fWorkspace;
-	private IWorkbench fWorkbench;
-	private MockPluginView fMyPart;
-	
-	private ITreeContentProvider fProvider;
-	private IPackageFragmentRoot fArchiveFragmentRoot;
-	private IPackageFragment fPackJunit;
-	private IPackageFragment fPackJunitSamples;
-	private IPackageFragment fPackJunitSamplesMoney;
-
-	private IPackageFragment fPack5;
-	private IPackageFragment fPack6;
-	private IFile fFile1;
-	private IFile fFile2;
-	private ICompilationUnit fCUIMoney;
-	private ICompilationUnit fCUMoney;
-	private ICompilationUnit fCUMoneyBag;
-	private ICompilationUnit fCUMoneyTest;
-	
-	private ICompilationUnit fCU1;
-	private ICompilationUnit fCU2;
-	
-	private IWorkbenchPage page;
-	private ICompilationUnit fCUAllTests;
-	private ICompilationUnit fCUVectorTest;
-	private ICompilationUnit fCUSimpleTest;
-	private boolean fEnableAutoBuildAfterTesting;
-	private ICompilationUnit fCU3;
-	
-	public ContentProviderTests1(String name) {
-		super(name);
-	}
-	
-	//---------Test for getChildren-------------------
-
-	public void testGetChildrenProjectWithSourceFolders() throws Exception{
-		Object[] expectedChildren= new Object[]{fRoot1, fFile1, fFile2};
-		Object[] children= fProvider.getChildren(fJProject2);
-		assertTrue("Wrong children found for project", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	
-	public void testGetChildrentMidLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{fPack4, fPack5};
-		Object[] children= fProvider.getChildren(fPack3);
-		assertTrue("Wrong children found for PackageFragment",compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{fCU1};
-		Object[] children= fProvider.getChildren(fPack2);
-		assertTrue("Wrong children found for PackageFragment",compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-
-	public void testGetChildrenMidLevelFragmentInArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{fPackJunitSamplesMoney, fCUAllTests, fCUSimpleTest, fCUVectorTest };
-		Object[] children= fProvider.getChildren(fPackJunitSamples);
-		assertTrue("wrong chidren found for mid level PackageFragment in Archive", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-
-	public void testGetChildrenBottomLevelFragmentInArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{fCUIMoney, fCUMoney, fCUMoneyBag, fCUMoneyTest};
-		Object[] children= fProvider.getChildren(fPackJunitSamplesMoney);
-		assertTrue("wrong children found for a bottom PackageFragment in PackageFragmentRoot Archive", compareArrays(children, expectedChildren));	//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenSourceFolder() throws Exception {
-		Object[] expectedChildren = new Object[] { fPack1, fPack2, fPack3, fRoot1.getPackageFragment("")};//$NON-NLS-1$
-		Object[] children = fProvider.getChildren(fRoot1);
-		assertTrue("Wrong children found for PackageFragmentRoot", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenArchive(){	Object[] expectedChildren= new Object[]{fPackJunit, fArchiveFragmentRoot.getPackageFragment("")};//$NON-NLS-1$
-		Object[] children= fProvider.getChildren(fArchiveFragmentRoot);
-		assertTrue("Wrong child found for PackageFragmentRoot Archive", compareArrays(children,expectedChildren));//$NON-NLS-1$
-	}
-	
-	//---------------Get Parent Tests-----------------------------
-	
-	public void testGetParentArchive() throws Exception{
-		Object parent= fProvider.getParent(fArchiveFragmentRoot);
-		assertTrue("Wrong parent found for PackageFragmentRoot Archive", parent==fJProject1);//$NON-NLS-1$
-	}
-
-	public void testGetParentMidLevelFragmentInArchive() throws Exception{
-		Object expectedParent= fPackJunitSamples;
-		Object parent= fProvider.getParent(fPackJunitSamplesMoney);
-		assertTrue("Wrong parent found for a NON top level PackageFragment in an Archive", expectedParent.equals(parent));//$NON-NLS-1$
-	}	
-	
-	public void testGetParentTopLevelFragmentInArchive() throws Exception{
-		Object expectedParent= fPackJunit;
-		Object parent= fProvider.getParent(fPackJunitSamples);
-		assertTrue("Wrong parent found for a top level PackageFragment in an Archive", expectedParent.equals(parent));	//$NON-NLS-1$
-	}
-	
-	public void testGetParentTopLevelFragment() throws Exception{
-		Object expectedParent= fRoot1;
-		Object parent= fProvider.getParent(fPack3);
-		assertTrue("Wrong parent found for a top level PackageFragment", expectedParent.equals(parent));//$NON-NLS-1$
-	}
-	
-	public void testGetParentMidLevelFragment() throws Exception{
-		Object expectedParent= fPack3;
-		Object parent= fProvider.getParent(fPack4);
-		assertTrue("Wrong parent found for a NON top level PackageFragment", expectedParent.equals(parent));//$NON-NLS-1$
-	}
-	
-	
-	public void testDeleteBottomLevelFragment() throws Exception{
-		
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener)fProvider;
-		IJavaElementDelta delta= TestDelta.createDelta(fPack4, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-		
-		//force events from dispaly
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch());
-		
-		assertTrue("Remove happened", fMyPart.hasRemoveHappened());//$NON-NLS-1$
-		assertTrue("Correct Remove", fMyPart.getRemovedObject().contains(fPack4));//$NON-NLS-1$
-		assertEquals("No refreshes", 0, fMyPart.getRefreshedObject().size());//$NON-NLS-1$
-	}
-	
-	public void testAddBottomLevelFragment() throws Exception {
-		IPackageFragment test= fRoot1.createPackageFragment("test", true, null);//$NON-NLS-1$
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createDelta(test, IJavaElementDelta.ADDED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from dispaly
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch());
-
-		assertTrue("Add happened", fMyPart.hasAddHappened()); //$NON-NLS-1$
-		assertTrue("Correct Add", test.equals(fMyPart.getAddedObject())); //$NON-NLS-1$
-		assertEquals("No refreshes", 0, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-
-	public void testChangedTopLevelPackageFragment() throws Exception {
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createDelta(fPack3, IJavaElementDelta.CHANGED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch());
-
-		assertEquals("No refresh happened", 0, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-	
-	public void testChangeBottomLevelPackageFragment() throws Exception{
-		//send a delta indicating fragment deleted
-		fMyPart.fRefreshedObjects= new ArrayList();
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createDelta(fPack6, IJavaElementDelta.CHANGED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-		
-		//force events from display
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch());
-
-		assertEquals("No refresh happened", 0, fMyPart.getRefreshedObject().size());//$NON-NLS-1$
-	}
-		
-	public void testRemoveCUsFromPackageFragment() throws Exception{
-		
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[] { fCU2, fCU3 }, fPack6, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-		
-		//force events from display
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch());
-
-		// removing more than one CU now results in a refresh.
-		assertEquals("No refreshes", 1, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-	
-	public void testRemoveCUFromPackageFragment() throws Exception {
-		
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[]{fCU2}, fPack6, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display			
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch());
-
-		assertTrue("Remove happened", fMyPart.hasRemoveHappened()); //$NON-NLS-1$
-		assertTrue("Correct refresh", fMyPart.getRemovedObject().contains(fCU2)); //$NON-NLS-1$
-		assertEquals("No refreshes", 0, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-	
-
-	/**
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		fWorkspace= ResourcesPlugin.getWorkspace();
-		assertNotNull(fWorkspace);
-		IWorkspaceDescription workspaceDesc= fWorkspace.getDescription();
-		fEnableAutoBuildAfterTesting= workspaceDesc.isAutoBuilding();
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(false);
-		
-		assertNotNull(fWorkspace);	
-		
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		fJProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		
-		assertNotNull("project1 null", fJProject1);//$NON-NLS-1$
-		assertNotNull("project2 null", fJProject2);//$NON-NLS-1$
-		
-		fJProject1.setRawClasspath(new IClasspathEntry[0], null);
-
-		Object[] resource= fJProject2.getNonJavaResources();
-		for (int i = 0; i < resource.length; i++) {
-			Object object = resource[i];
-			if(object instanceof IFile){
-				IFile file = (IFile) object;
-				if(".classpath".equals(file.getName()))//$NON-NLS-1$
-					fFile1= file;
-				else if (".project".equals(file.getName()))//$NON-NLS-1$
-					fFile2= file;
-			}
-		}
-		assertNotNull(fFile1);
-		assertNotNull(fFile2);
-		
-		//set up project #1 : External Jar and zip file
-		IPackageFragmentRoot jdk= JavaProjectHelper.addVariableRTJar(fJProject1, "JRE_LIB_TEST", null, null);//$NON-NLS-1$
-		assertTrue("jdk not found", jdk != null);//$NON-NLS-1$
-
-		java.io.File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());//$NON-NLS-1$
-
-		fArchiveFragmentRoot= JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);//$NON-NLS-1$
-		assertTrue("Unable to create zipfile archive",fArchiveFragmentRoot.exists());//$NON-NLS-1$
-		
-		fPackJunit= fArchiveFragmentRoot.getPackageFragment("junit");//$NON-NLS-1$
-		fPackJunitSamples= fArchiveFragmentRoot.getPackageFragment("junit.samples");//$NON-NLS-1$
-		fPackJunitSamplesMoney= fArchiveFragmentRoot.getPackageFragment("junit.samples.money");//$NON-NLS-1$
-		
-		assertNotNull("creating fPackJunit", fPackJunit);//$NON-NLS-1$
-		assertNotNull("creating fPackJunitSamples", fPackJunitSamples);//$NON-NLS-1$
-		assertNotNull("creating fPackJunitSamplesMoney",fPackJunitSamplesMoney);//$NON-NLS-1$
-		
-		fCUIMoney= fPackJunitSamplesMoney.getCompilationUnit("IMoney.java");//$NON-NLS-1$
-		fCUMoney= fPackJunitSamplesMoney.getCompilationUnit("Money.java");//$NON-NLS-1$
-		fCUMoneyBag= fPackJunitSamplesMoney.getCompilationUnit("MoneyBag.java");//$NON-NLS-1$
-		fCUMoneyTest= fPackJunitSamplesMoney.getCompilationUnit("MoneyTest.java");//$NON-NLS-1$
-		
-		fCUAllTests= fPackJunitSamples.getCompilationUnit("AllTests.java");//$NON-NLS-1$
-		fCUVectorTest= fPackJunitSamples.getCompilationUnit("VectorTest.java");//$NON-NLS-1$
-		fCUSimpleTest= fPackJunitSamples.getCompilationUnit("SimpleTest.java");//$NON-NLS-1$
-		//set up project #2: file system structure with in a source folder
-
-	//	JavaProjectHelper.addVariableEntry(fJProject2, new Path("JRE_LIB_TEST"), null, null);
-
-		fRoot1= JavaProjectHelper.addSourceContainer(fJProject2, "src1");//$NON-NLS-1$
-		fPack1= fRoot1.createPackageFragment("pack1", true, null);//$NON-NLS-1$
-		fPack2= fRoot1.createPackageFragment("pack2", true, null);//$NON-NLS-1$
-		fPack3= fRoot1.createPackageFragment("pack3",true,null);//$NON-NLS-1$
-		fPack4= fRoot1.createPackageFragment("pack3.pack4", true,null);//$NON-NLS-1$
-		fPack5= fRoot1.createPackageFragment("pack3.pack5",true,null);//$NON-NLS-1$
-		fPack6= fRoot1.createPackageFragment("pack3.pack5.pack6", true, null);//$NON-NLS-1$
-		
-		fCU1= fPack2.createCompilationUnit("Object.java", "", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fCU2= fPack6.createCompilationUnit("Object.java","", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fCU3= fPack6.createCompilationUnit("Jen.java","", true,null);//$NON-NLS-1$//$NON-NLS-2$
-		
-		//set up the mock view
-		setUpMockView();
-	}
-	
-	public void setUpMockView() throws Exception{
-		
-		fWorkbench= PlatformUI.getWorkbench();
-		assertNotNull(fWorkbench);
-		
-		page= fWorkbench.getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(page);
-		
-		//just testing to make sure my part can be created
-		IViewPart myPart= new MockPluginView();
-		assertNotNull(myPart);
-		
-		myPart= page.showView("org.eclipse.jdt.ui.tests.packageview.MockPluginView");//$NON-NLS-1$
-		if (myPart instanceof MockPluginView) {
-			fMyPart= (MockPluginView) myPart;
-			fMyPart.setFolding(false);
-			// above call might cause a property change event being sent
-			fMyPart.fRefreshedObjects.clear();
-			fProvider= (ITreeContentProvider)fMyPart.getTreeViewer().getContentProvider();
-		}else assertTrue("Unable to get view",false);//$NON-NLS-1$
-	
-		assertNotNull(fProvider);		
-	}
-
-	/**
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		fArchiveFragmentRoot.close();
-			
-		JavaProjectHelper.delete(fJProject1);
-		JavaProjectHelper.delete(fJProject2);
-		page.hideView(fMyPart);
-		fMyPart.dispose();
-		
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-		
-		super.tearDown();
-	}
-	
-	/**
-	 * Method compareArrays. Both arrays must be of IPackageFragments or compare will fail.
-	 * @param children
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean compareArrays(Object[] children, Object[] expectedChildren) {
-		if(children.length!=expectedChildren.length)
-			return false;
-		for (int i= 0; i < children.length; i++) {
-			Object child= children[i];
-			if (child instanceof IJavaElement) {
-				IJavaElement el= (IJavaElement) child;
-				if(!contains(el, expectedChildren))
-					return false;
-			} else if(child instanceof IResource){
-				IResource res = (IResource) child;	
-				if(!contains(res, expectedChildren)){
-					return false;	
-				}
-			}
-		}
-		return true;
-	}
-	/**
-	 * Method contains.
-	 * @param res
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean contains(IResource res, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IResource) {
-				IResource expres= (IResource) object;
-				if(expres.equals(res))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Method contains.
-	 * @param fragment
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean contains(IJavaElement fragment, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IJavaElement) {
-				IJavaElement expfrag= (IJavaElement) object;
-				if(expfrag.equals(fragment))
-					return true;
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests2.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests2.java
deleted file mode 100644
index e14ffc8..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests2.java
+++ /dev/null

@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.packageview;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-/**
- * Tests for the PackageExplorerContentProvider.
- * 
- * @since 2.1
- */
-public class ContentProviderTests2 extends TestCase{
-
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("org.eclipse.jdt.ui.ContentProviderTests2"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-	   suite.addTestSuite(ContentProviderTests2.class);
-		//$JUnit-END$
-		return suite;
-	}
-	
-	private IPackageFragmentRoot fRoot1;
-	private IPackageFragment fPack1;
-	private IPackageFragment fPack2;
-	private IPackageFragment fPack4;
-	private IPackageFragment fPack3;
-	private IWorkspace fWorkspace;
-	private IWorkbench fWorkbench;
-	private MockPluginView fMyPart;
-	
-	private ITreeContentProvider fProvider;
-	
-	private IPackageFragmentRoot jdk;
-
-	private IPackageFragment fPack5;
-	private IJavaProject fJProject3;
-	private IPackageFragment fPack6;
-	private IPackageFragmentRoot fInternalRoot1;
-	private IPackageFragment fA;
-	private IPackageFragment fX;
-	private IPackageFragment fB;
-	private IPackageFragment fC;
-	private IPackageFragment fY;
-	private IFile fFile1;
-	private IFile fFile2;
-	private ICompilationUnit fCU1;
-	private ICompilationUnit fCU2;
-	private IClassFile fYClassFile;
-	
-	private IWorkbenchPage page;
-	private boolean fEnableAutoBuildAfterTesting;
-	
-	public ContentProviderTests2(String name) {
-		super(name);
-	}
-	
-	public void testGetChildrenProject() throws Exception{
-		Object[] expectedChildren= new Object[]{fPack1, fPack2, fPack3, fRoot1.getPackageFragment(""), fFile1, fFile2,fInternalRoot1,jdk}; //$NON-NLS-1$
-		Object[] children= fProvider.getChildren(fJProject3);
-		assertTrue("Wrong children found for project", compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrentMidLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{fPack4, fPack5};
-		Object[] children= fProvider.getChildren(fPack3);
-		assertTrue("Wrong children found for PackageFragment",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{};
-		Object[] children= fProvider.getChildren(fPack1);
-		assertTrue("Wrong children found for PackageFragment",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragmentWithCU() throws Exception{
-		Object[] expectedChildren= new Object[]{fCU1};
-		Object[] children= fProvider.getChildren(fPack2);
-		assertTrue("Wrong children found for PackageFragment with CU",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragmentFile() throws Exception{
-		Object[] expectedChildren= new Object[]{};
-		Object[] children= fProvider.getChildren(fPack1);
-		assertTrue("Wrong children found for PackageFragment with File",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragment2() throws Exception{
-		Object[] expectedChildren= new Object[]{fCU2};
-		Object[] children= fProvider.getChildren(fPack6);
-		assertTrue("Wrong children found for PackageFragment",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-
-	public void testGetChildrenMidLevelFragmentInInternalArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{fC};
-		Object[] children= fProvider.getChildren(fB);
-		assertTrue("wrong children found for a NON bottom PackageFragment in PackageFragmentRoot Internal Archive", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-
-	public void testGetChildrenBottomLevelFragmentInInternalArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{fYClassFile};
-		Object[] children= fProvider.getChildren(fY);
-		assertTrue("wrong children found for a bottom PackageFragment in PackageFragmentRoot Internal Archive", compareArrays(children, expectedChildren));	//$NON-NLS-1$
-	}
-	
-	public void getChildrenInternalArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{fX,fA, fInternalRoot1.getPackageFragment("")}; //$NON-NLS-1$
-		Object[] children= fProvider.getChildren(fInternalRoot1);	
-		assertTrue("Wrong child found for PackageFragmentRoot Internal Archive", compareArrays(children,expectedChildren));//$NON-NLS-1$
-	}
-	
-	//---------------Get Parent Tests-----------------------------
-	
-	public void testGetParentArchive() throws Exception{
-		Object parent= fProvider.getParent(fInternalRoot1);
-		assertTrue("Wrong parent found for PackageFragmentRoot Archive", parent==fJProject3); //$NON-NLS-1$
-	}
-
-	public void testGetParentMidLevelFragmentInArchive() throws Exception{
-		Object expectedParent= fB;
-		Object parent= fProvider.getParent(fC);
-		assertTrue("Wrong parent found for a NON top level PackageFragment in an Archive", expectedParent.equals(parent)); //$NON-NLS-1$
-	}	
-	
-	public void testGetParentTopLevelFragmentInArchive() throws Exception{
-		Object expectedParent= fInternalRoot1;
-		Object parent= fProvider.getParent(fA);
-		assertTrue("Wrong parent found for a top level PackageFragment in an Archive", expectedParent.equals(parent));	 //$NON-NLS-1$
-	}
-	
-	public void testGetParentTopLevelFragment() throws Exception{
-		Object expectedParent= fJProject3;
-		Object parent= fProvider.getParent(fPack3);
-		assertTrue("Wrong parent found for a top level PackageFragment", expectedParent.equals(parent)); //$NON-NLS-1$
-	}
-	
-	public void testGetParentMidLevelFragment() throws Exception{
-		Object expectedParent= fPack3;
-		Object parent= fProvider.getParent(fPack5);
-		assertTrue("Wrong parent found for a NON top level PackageFragment", expectedParent.equals(parent)); //$NON-NLS-1$
-	}
-	
-	
-	//-------------------Set up methods--------------------------------
-	/**
-	 * @see TestCase#setUp()
-	 */
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-			
-		fWorkspace= ResourcesPlugin.getWorkspace();
-		assertNotNull(fWorkspace);
-		IWorkspaceDescription workspaceDesc= fWorkspace.getDescription();
-		fEnableAutoBuildAfterTesting= workspaceDesc.isAutoBuilding();
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(false);
-		
-		//create project
-		fJProject3= JavaProjectHelper.createJavaProject("TestProject3", "bin"); //$NON-NLS-1$ //$NON-NLS-2$
-		assertNotNull("project3 null", fJProject3); //$NON-NLS-1$
-		
-		Object[] resource= fJProject3.getNonJavaResources();
-		for (int i = 0; i < resource.length; i++) {
-			Object object = resource[i];
-			if(object instanceof IFile){
-				IFile file = (IFile) object;
-				if(".classpath".equals(file.getName())) //$NON-NLS-1$
-					fFile1= file;
-				else if (".project".equals(file.getName())) //$NON-NLS-1$
-					fFile2= file;
-			}
-		}
-		assertNotNull(fFile1);
-		assertNotNull(fFile2);
-
-		//add rt.jar
-		jdk= JavaProjectHelper.addVariableRTJar(fJProject3, "JRE_LIB_TEST", null, null); //$NON-NLS-1$
-		assertTrue("jdk not found", jdk != null); //$NON-NLS-1$
-		
-		//create the PackageFragmentRoot that represents the project as source folder
-		fRoot1= JavaProjectHelper.addSourceContainer(fJProject3, ""); //$NON-NLS-1$
-		assertNotNull("getting default package", fRoot1); //$NON-NLS-1$
-		
-		//set up project #3: file system structure with project as source folder
-		//add an internal jar
-		File myInternalLibJar= JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/myinternallib.jar")); //$NON-NLS-1$
-		assertTrue("lib not found", myInternalLibJar != null && myInternalLibJar.exists()); //$NON-NLS-1$
-		fInternalRoot1= JavaProjectHelper.addLibraryWithImport(fJProject3, new Path(myInternalLibJar.getPath()), null, null);
-	
-		//create internal PackageFragments
-		fA= fInternalRoot1.getPackageFragment("a"); //$NON-NLS-1$
-		fX= fInternalRoot1.getPackageFragment("x"); //$NON-NLS-1$
-		fB= fInternalRoot1.getPackageFragment("a.b"); //$NON-NLS-1$
-		fC= fInternalRoot1.getPackageFragment("a.b.c"); //$NON-NLS-1$
-		fInternalRoot1.getPackageFragment("a.d"); //$NON-NLS-1$
-		fY= fInternalRoot1.getPackageFragment("x.y"); //$NON-NLS-1$
-		
-		fYClassFile= fY.getClassFile("Y.class"); //$NON-NLS-1$
-		
-		//create PackageFragments
-		fPack1= fRoot1.createPackageFragment("pack1", true, null); //$NON-NLS-1$
-		fPack2= fRoot1.createPackageFragment("pack2", true, null); //$NON-NLS-1$
-		fPack3= fRoot1.createPackageFragment("pack3",true,null); //$NON-NLS-1$
-		fPack4= fRoot1.createPackageFragment("pack3.pack4", true,null); //$NON-NLS-1$
-		fPack5= fRoot1.createPackageFragment("pack3.pack5",true,null); //$NON-NLS-1$
-		fPack6= fRoot1.createPackageFragment("pack3.pack5.pack6", true, null); //$NON-NLS-1$
-		
-		fCU1= fPack2.createCompilationUnit("Object.java", "", true, null); //$NON-NLS-1$ //$NON-NLS-2$
-		fCU2= fPack6.createCompilationUnit("Object.java","", true, null); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		//set up the mock view
-		setUpMockView();
-	}
-	
-	public void setUpMockView() throws Exception {
-//		fWorkspace = ResourcesPlugin.getWorkspace();
-//		assertNotNull(fWorkspace);
-
-		fWorkbench = PlatformUI.getWorkbench();
-		assertNotNull(fWorkbench);
-
-		page = fWorkbench.getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(page);
-
-		//just testing to make sure my part can be created
-		IViewPart myPart = new MockPluginView();
-		assertNotNull(myPart);
-
-		myPart = page.showView("org.eclipse.jdt.ui.tests.packageview.MockPluginView"); //$NON-NLS-1$
-		if (myPart instanceof MockPluginView) {
-			fMyPart = (MockPluginView) myPart;
-			fMyPart.setFolding(false);
-			// above call might cause a property change event being sent
-			fMyPart.fRefreshedObjects.clear();
-			fProvider = (ITreeContentProvider) fMyPart.getTreeViewer().getContentProvider();
-		} else
-			assertTrue("Unable to get view", false); //$NON-NLS-1$
-
-		assertNotNull(fProvider);
-	}
-	
-	/**
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		fInternalRoot1.close();
-		JavaProjectHelper.delete(fJProject3);
-		page.hideView(fMyPart);
-		fMyPart.dispose();
-		
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-
-		super.tearDown();
-	}
-	
-	/**
-	 * Method compareArrays. Both arrays must be of IPackageFragments or compare will fail.
-	 * @param children
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean compareArrays(Object[] children, Object[] expectedChildren) {
-		if(children.length!=expectedChildren.length)
-			return false;
-		for (int i= 0; i < children.length; i++) {
-			Object child= children[i];
-			if (child instanceof IJavaElement) {
-				IJavaElement el= (IJavaElement) child;
-				if(!contains(el, expectedChildren))
-					return false;
-			} else if(child instanceof IResource){
-				IResource res = (IResource) child;	
-				if(!contains(res, expectedChildren)){
-					return false;	
-				}
-			}
-		}
-		return true;
-	}
-	/**
-	 * Method contains.
-	 * @param res
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean contains(IResource res, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IResource) {
-				IResource expres= (IResource) object;
-				if(expres.equals(res))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Method contains.
-	 * @param fragment
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean contains(IJavaElement fragment, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IJavaElement) {
-				IJavaElement expfrag= (IJavaElement) object;
-				if(expfrag.equals(fragment))
-					return true;
-			}
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests3.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests3.java
deleted file mode 100644
index 92fedb0..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests3.java
+++ /dev/null

@@ -1,474 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.packageview;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-/**
- * Tests for the PackageExplorerContentProvider.
- * 
- * @since 2.1
- */
-public class ContentProviderTests3 extends TestCase {
-
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("org.eclipse.jdt.ui.tests.ContentProviderTests3"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-	   suite.addTestSuite(ContentProviderTests3.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-
-	private IJavaProject fJProject1;
-	private IJavaProject fJProject2;
-	
-	private IPackageFragmentRoot fRoot1;
-	private IPackageFragment fPack1;
-	private IPackageFragment fPack2;
-	private IPackageFragment fPack4;
-	private IPackageFragment fPack3;
-	private IWorkspace fWorkspace;
-	private IWorkbench fWorkbench;
-	private MockPluginView fMyPart;
-	
-	private ITreeContentProvider fProvider;
-	private IPackageFragmentRoot fArchiveFragmentRoot;
-	private IPackageFragment fPackJunit;
-	private IPackageFragment fPackJunitSamples;
-	private IPackageFragment fPackJunitSamplesMoney;
-
-	private IPackageFragment fPack6;
-	private IPackageFragment fPackJunitExtentions;
-	private IPackageFragment fPackJunitFramework;
-	private IPackageFragment fPackJunitRunner;
-	private IPackageFragment fPackJunitTextUi;
-	private IPackageFragment fPackJunitUi;
-	private IPackageFragment fPackJunitTests;
-	
-	private ICompilationUnit fCUIMoney;
-	private ICompilationUnit fCUMoney;
-	private ICompilationUnit fCUMoneyBag;
-	private ICompilationUnit fCUMoneyTest;
-	private ICompilationUnit fCU1;
-	private ICompilationUnit fCU2;
-	private ICompilationUnit fCU3;
-	private IFile fFile1;
-	private IFile fFile2;
-	
-	private IWorkbenchPage page;
-	private IPackageFragmentRoot jdk;
-	private boolean fEnableAutoBuildAfterTesting;
-	
-	public ContentProviderTests3(String name) {
-		super(name);
-	}
-	
-	//---------Test for getChildren-------------------
-
-	public void testGetChildrenProjectWithSourceFolders() throws Exception{
-		Object[] expectedChildren= new Object[]{fRoot1, fFile1, fFile2, jdk};
-		Object[] children= fProvider.getChildren(fJProject2);
-		assertTrue("Wrong children found for project with folding", compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	
-	public void testGetChildrentMidLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{fPack4, fPack6};
-		Object[] children= fProvider.getChildren(fPack3);
-		assertTrue("Wrong children found for PackageFragment with folding",compareArrays(children, expectedChildren));//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{};
-		Object[] children= fProvider.getChildren(fPack1);
-		assertTrue("Wrong children found for PackageFragment with folding",compareArrays(children, expectedChildren));//$NON-NLS-1$
-		
-	}
-	
-	public void testGetChildrenBottomLevelFragmentWithCU() throws Exception{
-		Object[] expectedChildren= new Object[]{fCU1};
-		Object[] children= fProvider.getChildren(fPack2);
-		assertTrue("Wrong children found for PackageFragment with folding",compareArrays(children, expectedChildren));	//$NON-NLS-1$
-	}
-
-	public void testGetChildrenBottomLevelFragmentInArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{fCUIMoney, fCUMoney, fCUMoneyBag, fCUMoneyTest};
-		Object[] children= fProvider.getChildren(fPackJunitSamplesMoney);
-		assertTrue("wrong children found for a bottom PackageFragment in PackageFragmentRoot Archive with folding", compareArrays(children, expectedChildren));	//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenSource() throws Exception{
-		Object[] expectedChildren= new Object[]{fPack1,fPack2,fPack3, fRoot1.getPackageFragment("")};//$NON-NLS-1$
-		Object[] children= fProvider.getChildren(fRoot1);
-		assertTrue("Wrong children found for PackageFragmentRoot with folding", compareArrays(children, expectedChildren));	//$NON-NLS-1$
-	}
-	
-	public void testGetChildrenArchive(){
-		Object[] expectedChildren= new Object[]{fPackJunit, fArchiveFragmentRoot.getPackageFragment("")};//$NON-NLS-1$
-		Object[] children= fProvider.getChildren(fArchiveFragmentRoot);
-		assertTrue("Wrong child found for PackageFragmentRoot Archive with folding", compareArrays(children,expectedChildren));//$NON-NLS-1$
-		
-	}
-	
-	//---------------Get Parent Tests-----------------------------
-	
-	public void testGetParentArchive() throws Exception{
-		Object parent= fProvider.getParent(fArchiveFragmentRoot);
-		assertTrue("Wrong parent found for PackageFragmentRoot Archive with folding", parent==fJProject1);//$NON-NLS-1$
-	}	
-	
-	public void testGetParentTopLevelFragmentInArchive() throws Exception{
-		Object expectedParent= fPackJunit;
-		Object parent= fProvider.getParent(fPackJunitSamples);
-		assertTrue("Wrong parent found for a top level PackageFragment in an Archive with folding", expectedParent.equals(parent));	//$NON-NLS-1$
-	}
-	
-	public void testGetParentTopLevelFragment() throws Exception{
-		Object expectedParent= fRoot1;
-		Object parent= fProvider.getParent(fPack3);
-		assertTrue("Wrong parent found for a top level PackageFragment with folding", expectedParent.equals(parent)); //$NON-NLS-1$
-	}
-	
-	public void testGetParentFoldedBottomFragment() throws Exception{
-		Object expectedParent= fRoot1;
-		Object parent= fProvider.getParent(fPack3);
-		assertTrue("Wrong parent found for a top level PackageFragment with folding", expectedParent.equals(parent));//$NON-NLS-1$
-		
-	}
-	
-	public void testGetParentMidLevelFragment() throws Exception{
-		Object expectedParent= fPack3;
-		Object parent= fProvider.getParent(fPack4);
-		assertTrue("Wrong parent found for a NON top level PackageFragment with folding", expectedParent.equals(parent));//$NON-NLS-1$
-	}
-	
-	public void testDeleteBottomLevelFragmentFolding() throws Exception {
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createDelta(fPack4, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from dispaly
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch())
-
-		assertTrue("Refresh happened", fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-		assertTrue("Correct Refresh", fMyPart.wasObjectRefreshed(fRoot1)); //$NON-NLS-1$
-		assertTrue("Single refresh", fMyPart.getRefreshedObject().size() == 1); //$NON-NLS-1$
-	}
-
-	public void testAddBottomLevelFragmentFolding() throws Exception {
-		IPackageFragment test= fRoot1.createPackageFragment("test", true, null); //$NON-NLS-1$
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createDelta(test, IJavaElementDelta.ADDED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from dispaly
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch()) {
-		}
-
-		assertTrue("Refresh happened", fMyPart.hasRefreshHappened()); //$NON-NLS-1$
-		assertTrue("Correct Refresh", fMyPart.wasObjectRefreshed(fRoot1)); //$NON-NLS-1$
-		assertTrue("Single refreshe", fMyPart.getRefreshedObject().size() == 1); //$NON-NLS-1$
-	}
-
-	public void testChangedTopLevelPackageFragmentFolding() throws Exception {
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createDelta(fPack3, IJavaElementDelta.CHANGED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from dispaly
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch()) {
-		}
-		
-		assertEquals("No refreshs", 0, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-
-	public void testChangeBottomLevelPackageFragmentFolding() throws Exception {
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createDelta(fPack6, IJavaElementDelta.CHANGED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from dispaly
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch()) {
-		}
-		
-		assertEquals("No refreshs",0,  fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-	
-	public void testRemoveCUsFromPackageFragment() throws Exception{
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[] { fCU2, fCU3 }, fPack6, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch()) {
-		}
-
-		// removing more than one CU now results in a refresh.
-		assertEquals("No refreshes", 1, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-
-	public void testRemoveCUFromPackageFragment() throws Exception {
-
-		//send a delta indicating fragment deleted
-		IElementChangedListener listener= (IElementChangedListener) fProvider;
-		IJavaElementDelta delta= TestDelta.createCUDelta(new ICompilationUnit[]{fCU2}, fPack6, IJavaElementDelta.REMOVED);
-		listener.elementChanged(new ElementChangedEvent(delta, ElementChangedEvent.POST_CHANGE));
-
-		//force events from display
-		while(fMyPart.getTreeViewer().getControl().getDisplay().readAndDispatch()) {
-		}
-
-		assertTrue("Remove happened", fMyPart.hasRemoveHappened()); //$NON-NLS-1$
-		assertTrue("Correct refresh", fMyPart.getRemovedObject().contains(fCU2)); //$NON-NLS-1$
-		assertEquals("No refreshes", 0, fMyPart.getRefreshedObject().size()); //$NON-NLS-1$
-	}
-	
-
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		fWorkspace= ResourcesPlugin.getWorkspace();
-		assertNotNull(fWorkspace);
-		IWorkspaceDescription workspaceDesc= fWorkspace.getDescription();
-		fEnableAutoBuildAfterTesting= workspaceDesc.isAutoBuilding();
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(false);
-
-		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		fJProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		
-		assertNotNull("project1 null", fJProject1);//$NON-NLS-1$
-		assertNotNull("project2 null", fJProject2);//$NON-NLS-1$
-		
-		Object[] resource= fJProject2.getNonJavaResources();
-		for (int i = 0; i < resource.length; i++) {
-			Object object = resource[i];
-			if(object instanceof IFile){
-				IFile file = (IFile) object;
-				if(".classpath".equals(file.getName()))//$NON-NLS-1$
-					fFile1= file;
-				else if (".project".equals(file.getName()))//$NON-NLS-1$
-					fFile2= file;
-			}
-		}
-		assertNotNull(fFile1);
-		assertNotNull(fFile2);
-		
-		//set up project #1 : External Jar and zip file
-		jdk= JavaProjectHelper.addVariableRTJar(fJProject1, "JRE_LIB_TEST", null, null);//$NON-NLS-1$
-		assertTrue("jdk not found", jdk != null);//$NON-NLS-1$
-
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		
-		assertTrue("junit src not found", junitSrcArchive != null && junitSrcArchive.exists());//$NON-NLS-1$
-
-		fArchiveFragmentRoot= JavaProjectHelper.addSourceContainerWithImport(fJProject1, "src", junitSrcArchive);//$NON-NLS-1$
-		
-		fPackJunit= fArchiveFragmentRoot.getPackageFragment("junit");//$NON-NLS-1$
-		fPackJunitSamples= fArchiveFragmentRoot.getPackageFragment("junit.samples");//$NON-NLS-1$
-		fPackJunitSamplesMoney= fArchiveFragmentRoot.getPackageFragment("junit.samples.money");//$NON-NLS-1$
-		fPackJunitExtentions= fArchiveFragmentRoot.getPackageFragment("junit.extensions");//$NON-NLS-1$
-		fPackJunitFramework= fArchiveFragmentRoot.getPackageFragment("junit.framework");//$NON-NLS-1$
-		fPackJunitRunner= fArchiveFragmentRoot.getPackageFragment("junit.runner");//$NON-NLS-1$
-		fPackJunitTests= fArchiveFragmentRoot.getPackageFragment("junit.tests");//$NON-NLS-1$
-		fPackJunitTextUi= fArchiveFragmentRoot.getPackageFragment("junit.textui");//$NON-NLS-1$
-		fPackJunitUi= fArchiveFragmentRoot.getPackageFragment("junit.ui");//$NON-NLS-1$
-		
-		assertNotNull("creating fPackJunit", fPackJunit);//$NON-NLS-1$
-		assertNotNull("creating fPackJunitSamples", fPackJunitSamples);//$NON-NLS-1$
-		assertNotNull("creating fPackJunitSamplesMoney",fPackJunitSamplesMoney);//$NON-NLS-1$
-		assertNotNull("", fPackJunitExtentions);//$NON-NLS-1$
-		assertNotNull("",fPackJunitFramework);//$NON-NLS-1$
-		assertNotNull("",fPackJunitRunner);//$NON-NLS-1$
-		assertNotNull("",fPackJunitTests);//$NON-NLS-1$
-		assertNotNull("",fPackJunitTextUi);//$NON-NLS-1$
-		assertNotNull("",fPackJunitUi);//$NON-NLS-1$
-		
-		fCUIMoney= fPackJunitSamplesMoney.getCompilationUnit("IMoney.java");//$NON-NLS-1$
-		fCUMoney= fPackJunitSamplesMoney.getCompilationUnit("Money.java");//$NON-NLS-1$
-		fCUMoneyBag= fPackJunitSamplesMoney.getCompilationUnit("MoneyBag.java");//$NON-NLS-1$
-		fCUMoneyTest= fPackJunitSamplesMoney.getCompilationUnit("MoneyTest.java");//$NON-NLS-1$
-		
-		File mylibJar= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-		assertTrue("lib not found", mylibJar != null && mylibJar.exists());//$NON-NLS-1$
-		JavaProjectHelper.addLibraryWithImport(fJProject1, new Path(mylibJar.getPath()), null, null);
-
-		//set up project #2: file system structure with in a source folder
-
-		JavaProjectHelper.addVariableEntry(fJProject2, new Path("JRE_LIB_TEST"), null, null);//$NON-NLS-1$
-
-		fRoot1= JavaProjectHelper.addSourceContainer(fJProject2, "src1");//$NON-NLS-1$
-		fPack1= fRoot1.createPackageFragment("pack1", true, null);//$NON-NLS-1$
-		fPack2= fRoot1.createPackageFragment("pack2", true, null);//$NON-NLS-1$
-		fPack3= fRoot1.createPackageFragment("pack3",true,null);//$NON-NLS-1$
-		fPack4= fRoot1.createPackageFragment("pack3.pack4", true,null);//$NON-NLS-1$
-		fRoot1.createPackageFragment("pack3.pack5",true,null);//$NON-NLS-1$
-		fPack6= fRoot1.createPackageFragment("pack3.pack5.pack6", true, null);//$NON-NLS-1$
-		
-		fCU1= fPack2.createCompilationUnit("Object.java", "", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fCU2= fPack6.createCompilationUnit("Object.java","", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fCU3= fPack6.createCompilationUnit("Jen.java","", true,null);//$NON-NLS-1$//$NON-NLS-2$
-
-		//set up the mock view
-		setUpMockView();
-	}
-	
-	public void setUpMockView() throws Exception{
-		
-		
-//		fWorkspace= ResourcesPlugin.getWorkspace();
-//		assertNotNull(fWorkspace);	
-		
-		fWorkbench= PlatformUI.getWorkbench();
-		assertNotNull(fWorkbench);
-		
-		page= fWorkbench.getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(page);
-		
-		//just testing to make sure my part can be created
-		IViewPart myPart= new MockPluginView();
-		assertNotNull(myPart);
-		
-		myPart= page.showView("org.eclipse.jdt.ui.tests.packageview.MockPluginView");//$NON-NLS-1$
-		if (myPart instanceof MockPluginView) {
-			fMyPart= (MockPluginView) myPart;
-			//turn on folding
-			fMyPart.setFolding(true);
-			// above call might cause a property change event being sent
-			fMyPart.fRefreshedObjects.clear();
-			fProvider= (ITreeContentProvider)fMyPart.getTreeViewer().getContentProvider();
-	
-		}else assertTrue("Unable to get view",false);//$NON-NLS-1$
-	
-		assertNotNull(fProvider);
-	}
-
-	/**
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		fArchiveFragmentRoot.close();
-		JavaProjectHelper.delete(fJProject1);
-		JavaProjectHelper.delete(fJProject2);
-		page.hideView(fMyPart);
-		fMyPart.dispose();
-		
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-		
-		super.tearDown();
-	}
-	
-	/**
-	 * Method compareArrays. Both arrays must be of IPackageFragments or compare will fail.
-	 * @param children
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean compareArrays(Object[] children, Object[] expectedChildren) {
-		if(children.length!=expectedChildren.length)
-			return false;
-		for (int i= 0; i < children.length; i++) {
-			Object child= children[i];
-			if (child instanceof IJavaElement) {
-				IJavaElement el= (IJavaElement) child;
-				if(!contains(el, expectedChildren))
-					return false;
-			} else if(child instanceof IResource){
-				IResource res = (IResource) child;	
-				if(!contains(res, expectedChildren)){
-					return false;	
-				}
-			}
-		}
-		return true;
-	}
-	/**
-	 * Method contains.
-	 * @param res
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean contains(IResource res, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IResource) {
-				IResource expres= (IResource) object;
-				if(expres.equals(res))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Method contains.
-	 * @param fragment
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean contains(IJavaElement fragment, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IJavaElement) {
-				IJavaElement expfrag= (IJavaElement) object;
-				if(expfrag.equals(fragment))
-					return true;
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests4.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests4.java
deleted file mode 100644
index acfd8ee..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests4.java
+++ /dev/null

@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.packageview;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-
-/**
- * Tests for the PackageExplorerContentProvider.
- * 
- * @since 2.1
- */
-public class ContentProviderTests4 extends TestCase{
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("org.eclipse.jdt.ui.tests.ContentProviderTests4"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-	   suite.addTestSuite(ContentProviderTests4.class);
-		//$JUnit-END$
-		return suite;
-	}
-
-	
-	private IPackageFragmentRoot fRoot1;
-	private IPackageFragment fPack1;
-	private IPackageFragment fPack2;
-	private IPackageFragment fPack4;
-	private IPackageFragment fPack3;
-	private IWorkspace fWorkspace;
-	private IWorkbench fWorkbench;
-	private MockPluginView fMyPart;
-	
-	private ITreeContentProvider fProvider;
-	
-	private IPackageFragment fPack5;
-	private IJavaProject fJProject3;
-	private IPackageFragment fPack6;
-	private IPackageFragmentRoot fInternalRoot1;
-	private IPackageFragment fA;
-	private IPackageFragment fX;
-	private IPackageFragment fC;
-	private IPackageFragment fD;
-	private IPackageFragment fY;
-	private IPackageFragment fDefaultPackage;
-	private ICompilationUnit fCU1;
-	private ICompilationUnit fCU2;
-	private IClassFile fYClassFile;
-	
-	private IPackageFragmentRoot jdk;
-	private IFile fFile1;
-	private IFile fFile2;
-	private IClassFile fAClassFile;
-	
-	private IWorkbenchPage page;
-	private ICompilationUnit fCUinDefault;
-	private File myInternalLibJar;
-	private boolean fEnableAutoBuildAfterTesting;
-	
-	public ContentProviderTests4(String name) {
-		super(name);
-	}
-	
-	public void testGetChildrenProject() throws Exception{
-		Object[] expectedChildren= new Object[]{fPack1, fPack2, fPack3, fDefaultPackage, fFile1, fFile2,fInternalRoot1,jdk};
-		Object[] children= fProvider.getChildren(fJProject3);
-		assertTrue("Wrong children found for project with folding", compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrenDefaultProject(){
-		Object[] expectedChildren= new Object[]{fCUinDefault};
-		Object[] children= fProvider.getChildren(fDefaultPackage);
-		assertTrue("Wrong children found for default package with folding", compareArrays(children, expectedChildren));	 //$NON-NLS-1$
-	}
-	
-	public void testGetChildrentMidLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{fPack4, fPack6};
-		Object[] children= fProvider.getChildren(fPack3);
-		assertTrue("Wrong children found for PackageFragment with folding",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragment() throws Exception{
-		Object[] expectedChildren= new Object[]{};
-		Object[] children= fProvider.getChildren(fPack1);
-		assertTrue("Wrong children found for PackageFragment with folding",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragmentWithCU() throws Exception{
-		Object[] expectedChildren= new Object[]{fCU1};
-		Object[] children= fProvider.getChildren(fPack2);
-		assertTrue("Wrong children found for PackageFragment with folding",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-	
-	public void testGetChildrenBottomLevelFragmenWithCU2() throws Exception{
-		Object[] expectedChildren= new Object[]{fCU2};
-		Object[] children= fProvider.getChildren(fPack6);
-		assertTrue("Wrong children found for PackageFragment with folding",compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-
-	public void testGetChildrenMidLevelFragmentInInternalArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{fC, fD, fAClassFile};
-		Object[] children= fProvider.getChildren(fA);
-		assertTrue("wrong children found for a NON bottom PackageFragment in PackageFragmentRoot Internal Archive with folding", compareArrays(children, expectedChildren)); //$NON-NLS-1$
-	}
-
-	public void testGetChildrenBottomLevelFragmentInInternalArchive() throws Exception{
-		Object[] expectedChildren= new Object[]{fYClassFile};
-		Object[] children= fProvider.getChildren(fY);
-		assertTrue("wrong children found for a bottom PackageFragment in PackageFragmentRoot Internal Archive with folding", compareArrays(children, expectedChildren));	 //$NON-NLS-1$
-	}
-	
-	public void getChildrenInternalArchive() throws Exception{	
-		Object[] expectedChildren= new Object[]{fX,fA, fInternalRoot1.getPackageFragment("")}; //$NON-NLS-1$
-		Object[] children= fProvider.getChildren(fInternalRoot1);	
-		assertTrue("Wrong child found for PackageFragmentRoot Internal Archive with folding", compareArrays(children,expectedChildren)); //$NON-NLS-1$
-	}
-	
-	//---------------Get Parent Tests-----------------------------
-	
-	public void testGetParentArchive() throws Exception{
-		Object parent= fProvider.getParent(fInternalRoot1);
-		assertTrue("Wrong parent found for PackageFragmentRoot Archive with folding", parent==fJProject3);//$NON-NLS-1$
-	}
-
-	public void testGetParentMidLevelFragmentInArchive() throws Exception{
-		Object expectedParent= fA;
-		Object parent= fProvider.getParent(fC);
-		assertTrue("Wrong parent found for a NON top level PackageFragment in an Archive with folding", expectedParent.equals(parent));//$NON-NLS-1$
-	}	
-	
-	public void testGetParentTopLevelFragmentInArchive() throws Exception{
-		Object expectedParent= fInternalRoot1;
-		Object parent= fProvider.getParent(fA);
-		assertTrue("Wrong parent found for a top level PackageFragment in an Archive with folding", expectedParent.equals(parent));	//$NON-NLS-1$
-	}
-	
-	public void testGetParentTopLevelFragment() throws Exception{
-		Object expectedParent= fJProject3;
-		Object parent= fProvider.getParent(fPack3);
-		assertTrue("Wrong parent found for a top level PackageFragment with folding", expectedParent.equals(parent));//$NON-NLS-1$
-	}
-	
-	public void testGetParentMidLevelFragment() throws Exception{
-		Object expectedParent= fPack3;
-		Object parent= fProvider.getParent(fPack6);
-		assertTrue("Wrong parent found for a NON top level PackageFragment with folding", expectedParent.equals(parent));//$NON-NLS-1$
-	}
-	
-	public void testGetParentMidLevelFragment2() throws Exception{
-		Object expectedParent= fPack3;
-		Object parent= fProvider.getParent(fPack5);
-		assertTrue("Wrong parent found for a NON top level PackageFragment with folding", expectedParent.equals(parent));//$NON-NLS-1$
-	}
-	
-	
-	//-------------------Set up methods--------------------------------
-	/**
-	 * @see TestCase#setUp()
-	 */
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		fWorkspace= ResourcesPlugin.getWorkspace();
-		assertNotNull(fWorkspace);
-		IWorkspaceDescription workspaceDesc= fWorkspace.getDescription();
-		fEnableAutoBuildAfterTesting= workspaceDesc.isAutoBuilding();
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(false);
-		
-		//create project
-		fJProject3 = JavaProjectHelper.createJavaProject("TestProject3", "bin");//$NON-NLS-1$//$NON-NLS-2$
-		assertNotNull("project3 null", fJProject3);//$NON-NLS-1$
-
-		Object[] resource = fJProject3.getNonJavaResources();
-		for (int i = 0; i < resource.length; i++) {
-			Object object = resource[i];
-			if (object instanceof IFile) {
-				IFile file = (IFile) object;
-				if (".classpath".equals(file.getName()))//$NON-NLS-1$
-					fFile1 = file;
-				else if (".project".equals(file.getName()))//$NON-NLS-1$
-					fFile2 = file;
-			}
-		}
-		assertNotNull(fFile1);
-		assertNotNull(fFile2);
-
-		//add rt.jar
-		jdk= JavaProjectHelper.addVariableRTJar(fJProject3, "JRE_LIB_TEST", null, null);//$NON-NLS-1$
-		assertTrue("jdk not found", jdk != null);//$NON-NLS-1$
-		
-		//create the PackageFragmentRoot that represents the project as source folder
-		fRoot1= JavaProjectHelper.addSourceContainer(fJProject3, "");//$NON-NLS-1$
-		assertNotNull("getting default package", fRoot1);//$NON-NLS-1$
-		
-		fDefaultPackage= fRoot1.createPackageFragment("",true,null);//$NON-NLS-1$
-		fCUinDefault= fDefaultPackage.createCompilationUnit("Object.java","",true, null);//$NON-NLS-1$//$NON-NLS-2$
-		
-		//set up project #3: file system structure with project as source folder
-		//add an internal jar
-		myInternalLibJar = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/myinternallib.jar"));//$NON-NLS-1$
-		assertTrue("lib not found", myInternalLibJar != null && myInternalLibJar.exists()); //$NON-NLS-1$
-		fInternalRoot1= JavaProjectHelper.addLibraryWithImport(fJProject3, new Path(myInternalLibJar.getPath()), null, null);
-	
-		//create internal PackageFragments
-		fA= fInternalRoot1.getPackageFragment("a");//$NON-NLS-1$
-		fX= fInternalRoot1.getPackageFragment("x");//$NON-NLS-1$
-		fInternalRoot1.getPackageFragment("a.b");//$NON-NLS-1$
-		fC= fInternalRoot1.getPackageFragment("a.b.c");//$NON-NLS-1$
-		fD= fInternalRoot1.getPackageFragment("a.d");//$NON-NLS-1$
-		fY= fInternalRoot1.getPackageFragment("x.y");//$NON-NLS-1$
-		
-		fYClassFile= fY.getClassFile("Y.class");//$NON-NLS-1$
-		fAClassFile= fA.getClassFile("A.class");//$NON-NLS-1$
-		
-		//create PackageFragments
-		fPack1= fRoot1.createPackageFragment("pack1", true, null);//$NON-NLS-1$
-		fPack2= fRoot1.createPackageFragment("pack2", true, null);//$NON-NLS-1$
-		fPack3= fRoot1.createPackageFragment("pack3",true,null);//$NON-NLS-1$
-		fPack4= fRoot1.createPackageFragment("pack3.pack4", true,null);//$NON-NLS-1$
-		fPack5= fRoot1.createPackageFragment("pack3.pack5",true,null);//$NON-NLS-1$
-		fPack6= fRoot1.createPackageFragment("pack3.pack5.pack6", true, null);//$NON-NLS-1$
-		
-		fCU1= fPack2.createCompilationUnit("Object.java", "", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		fCU2= fPack6.createCompilationUnit("Object.java","", true, null);//$NON-NLS-1$//$NON-NLS-2$
-		
-		//set up the mock view
-		setUpMockView();
-	}
-	
-	public void setUpMockView() throws Exception {
-//		fWorkspace = ResourcesPlugin.getWorkspace();
-//		assertNotNull(fWorkspace);
-
-		fWorkbench = PlatformUI.getWorkbench();
-		assertNotNull(fWorkbench);
-
-		page = fWorkbench.getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(page);
-
-		//just testing to make sure my part can be created
-		IViewPart myPart = new MockPluginView();
-		assertNotNull(myPart);
-
-		myPart = page.showView("org.eclipse.jdt.ui.tests.packageview.MockPluginView");//$NON-NLS-1$
-		if (myPart instanceof MockPluginView) {
-			fMyPart = (MockPluginView) myPart;
-			fMyPart.setFolding(true);
-			// above call might cause a property change event being sent
-			fMyPart.fRefreshedObjects.clear();
-			fProvider = (ITreeContentProvider) fMyPart.getTreeViewer().getContentProvider();
-		} else
-			assertTrue("Unable to get view", false);//$NON-NLS-1$
-
-		assertNotNull(fProvider);
-	}
-	
-	/**
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-	   
-		fInternalRoot1.close();
-		JavaProjectHelper.delete(fJProject3);
-		page.hideView(fMyPart);
-		fMyPart.dispose();
-		
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-		
-		super.tearDown();
-	}
-	
-	/**
-	 * Method compareArrays. Both arrays must be of IPackageFragments or compare will fail.
-	 * @param children
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean compareArrays(Object[] children, Object[] expectedChildren) {
-		if(children.length!=expectedChildren.length)
-			return false;
-		for (int i= 0; i < children.length; i++) {
-			Object child= children[i];
-			if (child instanceof IJavaElement) {
-				IJavaElement el= (IJavaElement) child;
-				if(!contains(el, expectedChildren))
-					return false;
-			} else if(child instanceof IResource){
-				IResource res = (IResource) child;	
-				if(!contains(res, expectedChildren)){
-					return false;	
-				}
-			}
-		}
-		return true;
-	}
-	/**
-	 * Method contains.
-	 * @param res
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean contains(IResource res, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IResource) {
-				IResource expres= (IResource) object;
-				if(expres.equals(res))
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Method contains.
-	 * @param fragment
-	 * @param expectedChildren
-	 * @return boolean
-	 */
-	private boolean contains(IJavaElement fragment, Object[] expectedChildren) {
-		for (int i= 0; i < expectedChildren.length; i++) {
-			Object object= expectedChildren[i];
-			if (object instanceof IJavaElement) {
-				IJavaElement expfrag= (IJavaElement) object;
-				if(expfrag.equals(fragment))
-					return true;
-			}
-		}
-		return false;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests5.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests5.java
deleted file mode 100644
index b438e50..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/ContentProviderTests5.java
+++ /dev/null

@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.packageview;
-
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jdt.internal.ui.util.CoreUtility;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-/**
- * Tests for the PackageExplorerContentProvider. Bugs:
- * <ul>
- * <li>66694 PackageExplorer shows elements twice</li>
- * <li>35851 Content of folders with illegal package name are no shown in package explorer</li>
- * <li>35851 Content of folders with illegal package name are no shown in package explorer</li>
- * <li>35851 Content of folders with illegal package name are no shown in package explorer</li>
- * </ul>
- * 
- * @since 3.0+
- */
-public class ContentProviderTests5 extends TestCase{
-	private boolean fEnableAutoBuildAfterTesting;
-	private ITreeContentProvider fProvider;
-
-	private IJavaProject fJProject;
-	private IFile fDotClasspath;
-	private IFile fDotProject;
-	private IPackageFragmentRoot jdk;
-	
-	public ContentProviderTests5(String name) {
-		super(name);
-	}
-	
-	public static Test suite() {
-		return new TestSuite(ContentProviderTests5.class);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		assertNotNull(workspace);
-		IWorkspaceDescription workspaceDesc= workspace.getDescription();
-		fEnableAutoBuildAfterTesting= workspaceDesc.isAutoBuilding();
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(false);
-		
-		//create project
-		fJProject= JavaProjectHelper.createJavaProject("TestProject", "bin");
-		assertNotNull(fJProject);
-
-		Object[] resource = fJProject.getNonJavaResources();
-		for (int i = 0; i < resource.length; i++) {
-			Object object = resource[i];
-			if (object instanceof IFile) {
-				IFile file = (IFile) object;
-				if (".classpath".equals(file.getName()))
-					fDotClasspath = file;
-				else if (".project".equals(file.getName()))
-					fDotProject = file;
-			}
-		}
-		assertNotNull(fDotClasspath);
-		assertNotNull(fDotProject);
-
-		//add rt.jar
-		jdk= JavaProjectHelper.addVariableRTJar(fJProject, "JRE_LIB_TEST", null, null);
-		assertTrue("jdk not found", jdk != null);
-		
-		setUpView();
-	}
-	
-	private void setUpView() throws PartInitException {
-		IWorkbench workbench= PlatformUI.getWorkbench();
-		assertNotNull(workbench);
-
-		IWorkbenchPage page= workbench.getActiveWorkbenchWindow().getActivePage();
-		assertNotNull(page);
-		
-		IViewPart myPart= page.showView("org.eclipse.jdt.ui.PackageExplorer"); 
-		if (myPart instanceof PackageExplorerPart) {
-			PackageExplorerPart packageExplorerPart= (PackageExplorerPart) myPart;
-			fProvider= (ITreeContentProvider) packageExplorerPart.getTreeViewer().getContentProvider();
-			setFolding(false);
-		} else {
-			assertTrue("Unable to get view", false); 
-		}
-		assertNotNull(fProvider);
-	}
-
-	private void setFolding(boolean fold) {
-		JavaPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, fold);
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		JavaProjectHelper.delete(fJProject);
-		
-		if (fEnableAutoBuildAfterTesting)
-			JavaProjectHelper.setAutoBuilding(true);
-	}
-	
-	private ByteArrayInputStream asInputStream(String string) throws UnsupportedEncodingException {
-		return new ByteArrayInputStream(string.getBytes(ResourcesPlugin.getEncoding()));
-	}
-
-	public void testProjectSource1() throws Exception { //bug 35851, 66694
-		IPath[] inclusionFilters= {new Path("**"), new Path("excl/incl/")};
-		IPath[] exclusionFilters= {new Path("excl/*"), new Path("x/*.java"), new Path("y/")};
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(fJProject, "", inclusionFilters, exclusionFilters); 
-		
-		IPackageFragment defaultPackage= root.createPackageFragment("", true, null); 
-		
-		IFolder ab= fJProject.getProject().getFolder("a-b"); 
-		CoreUtility.createFolder(ab, true, true, null);
-		IFile description= ab.getFile("description.txt"); 
-		description.create(asInputStream("description"), true, null); 
-		
-		IPackageFragment exclInclPackage= root.createPackageFragment("excl.incl", true, null); 
-		ICompilationUnit In= exclInclPackage.createCompilationUnit("In.java", "package excl.incl;\r\n" + 
-				"public class In {\r\n" + 
-				"}\r\n", true, null);
-		
-		IFolder excl= fJProject.getProject().getFolder("excl");
-		IFile Ex= excl.getFile("Ex.java"); 
-		Ex.create(asInputStream("package excl;\npublic class Ex{}"), false, null);
-		
-		IPackageFragment xPackage= root.createPackageFragment("x", true, null);
-		IFolder x= fJProject.getProject().getFolder("x");
-		IFile xhidden= x.getFile(".hidden");
-		xhidden.create(asInputStream(""), true, null);
-		IFile X= x.getFile("X.java");
-		X.create(asInputStream("package x;\r\npublic class X {\r\n\t\r\n}\r\n"), true, null);
-		
-		x.copy(new Path("y"), true, null);
-		IFolder y= fJProject.getProject().getFolder("y");
-		IFile yX= y.getFile("X.java");
-		IFile yhidden= y.getFile(".hidden");
-		
-		IPackageFragment zPackage= root.createPackageFragment("z", true, null);
-		ICompilationUnit Z= zPackage.createCompilationUnit("Z.java", "package z;public class Z{}", true, null);
-		
-		assertEqualElements(new Object[] {defaultPackage, exclInclPackage, xPackage, zPackage, jdk, ab, excl, y, fDotClasspath, fDotProject},
-				fProvider.getChildren(fJProject));
-		assertEqualElements(new Object[0], fProvider.getChildren(defaultPackage));
-		assertEqualElements(new Object[] {In},	fProvider.getChildren(exclInclPackage));
-		assertEqualElements(new Object[] {Ex},	fProvider.getChildren(excl));
-		assertEqualElements(new Object[] {X, xhidden},	fProvider.getChildren(xPackage));
-		assertEquals(xPackage,	fProvider.getParent(X));
-		assertEquals(xPackage,	fProvider.getParent(xhidden));
-		assertEqualElements(new Object[] {Z},	fProvider.getChildren(zPackage));
-		assertEqualElements(new Object[] {description},	fProvider.getChildren(ab));
-		assertEqualElements(new Object[] {Ex},	fProvider.getChildren(excl));
-		assertEqualElements(new Object[] {yX, yhidden},	fProvider.getChildren(y));
-	}
-	
-	public void testNestedSource1() throws Exception { //bug 35851, 66694
-//		<classpathentry excluding="a-b/a/b/" kind="src" path="src"/>
-//		<classpathentry kind="src" path="src/a-b/a/b"/>
-		IPath[] inclusionFilters= {};
-		IPath[] exclusionFilters= {new Path("a-b/a/b/")};
-		IPackageFragmentRoot src= JavaProjectHelper.addSourceContainer(fJProject, "src", inclusionFilters, exclusionFilters); 
-		IPackageFragmentRoot srcabab= JavaProjectHelper.addSourceContainer(fJProject, "src/a-b/a/b", new IPath[0], new IPath[0]);
-		
-		IPackageFragment defaultSrc= src.createPackageFragment("", true, null);
-		IPackageFragment p= src.createPackageFragment("p", true, null);
-		IFile file= ((IFolder) p.getCorrespondingResource()).getFile("file.txt");
-		file.create(asInputStream("f"), true, null); 
-		
-		IFolder ab= ((IFolder) src.getUnderlyingResource()).getFolder("a-b");
-		CoreUtility.createFolder(ab, true, true, null);
-		IFolder aba= ab.getFolder("a");
-		CoreUtility.createFolder(aba, true, true, null);
-		IFile abaTxt= aba.getFile("aba.txt");
-		abaTxt.create(asInputStream("x"), true, null); 
-		
-		IPackageFragment defaultAbab= srcabab.createPackageFragment("", true, null);
-		ICompilationUnit b= defaultAbab.createCompilationUnit("B.java", "public class B {}", true, null);
-		
-		
-		assertEqualElements(new Object[] {src, srcabab, jdk, fDotClasspath, fDotProject}, fProvider.getChildren(fJProject));
-		assertEqualElements(new Object[] {defaultSrc, p, ab}, fProvider.getChildren(src));
-		assertEqualElements(new Object[] {}, fProvider.getChildren(defaultSrc));
-		assertEqualElements(new Object[] {file}, fProvider.getChildren(p));
-		assertEqualElements(new Object[] {aba}, fProvider.getChildren(ab));
-		assertEqualElements(new Object[] {abaTxt}, fProvider.getChildren(aba));
-		
-		assertEqualElements(new Object[] {defaultAbab}, fProvider.getChildren(srcabab));
-		assertEqualElements(new Object[] {b}, fProvider.getChildren(defaultAbab));
-	}
-	
-	public void testInclExcl1() throws Exception { //bug 35851, 66694
-//		<classpathentry including="a/b/c/" excluding="a/b/c/d/" kind="src" path="src2"/>
-		IPath[] inclusionFilters= {new Path("a/b/c/")};
-		IPath[] exclusionFilters= {new Path("a/b/c/d/")};
-		IPackageFragmentRoot src= JavaProjectHelper.addSourceContainer(fJProject, "src", inclusionFilters, exclusionFilters); 
-		
-		IPackageFragment abc= src.createPackageFragment("a.b.c", true, null);
-		ICompilationUnit x= abc.createCompilationUnit("X.java", "", true, null);
-		IFolder d= ((IFolder) abc.getUnderlyingResource()).getFolder("d");
-		CoreUtility.createFolder(d, false, true, null);
-		IFile dTxt= d.getFile("d.txt");
-		dTxt.create(asInputStream(""), true, null);
-		
-		IContainer b= d.getParent().getParent();
-		IContainer a= b.getParent();
-		
-		assertEqualElements(new Object[] {src, jdk, fDotClasspath, fDotProject}, fProvider.getChildren(fJProject));
-		assertEqualElements(new Object[] {abc, a}, fProvider.getChildren(src));
-		assertEqualElements(new Object[] {x, d}, fProvider.getChildren(abc));
-		assertEqualElements(new Object[] {dTxt}, fProvider.getChildren(d));
-		assertEqualElements(new Object[] {b}, fProvider.getChildren(a));
-	}
-	
-	private void assertEqualElements(Object[] expected, Object[] actual) {
-		assertEquals("array length", expected.length, actual.length);
-		exp: for (int i= 0; i < expected.length; i++) {
-			Object e= expected[i];
-			for (int j= 0; j < actual.length; j++) {
-				Object a= actual[j];
-				if (e.equals(a))
-					continue exp;
-			}
-			fail("expected[" + i + "] not found in actual:" + Arrays.asList(actual).toString());
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/MockPluginView.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/MockPluginView.java
deleted file mode 100644
index 9f6c632..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/MockPluginView.java
+++ /dev/null

@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.packageview;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
-import org.eclipse.jdt.internal.ui.viewsupport.ProblemTreeViewer;
-
-/**
- * Helper to test the PackageExplorerContentProvider.
- * 
- * @since 2.1
- */
-public class MockPluginView extends PackageExplorerPart {
-
-	TreeViewer fViewer;
-	private ITreeContentProvider contentProvider;
-	private boolean fRefreshHappened;
-	public List fRefreshedObjects;
-	private boolean fRemoveHappened;
-	private boolean fAddHappened;
-	
-	private List fRemovedObject;
-	private Object fAddedObject;
-	private Object fAddedParentObject;
-
-	/**
-	 * Constructor for MockPluginView.
-	 */
-	public MockPluginView() {
-		super();
-		fRefreshedObjects= new ArrayList();
-		fRemovedObject= new ArrayList();
-	}
-	
-	/**
-	 * Creates only the viewer and the content provider.
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-	
-		//create viewer
-		fViewer= createViewer(parent);
-		
-		//create my contentProvider
-		contentProvider= createContentProvider();
-		contentProvider.inputChanged(fViewer, null, null);
-		
-		//set content provider
-		fViewer.setContentProvider(contentProvider);
-		
-	}
-	
-	private TreeViewer createViewer(Composite parent) {
-		return new TestProblemTreeViewer(parent, SWT.MULTI);
-	}
-
-	public void dispose() {
-		if (fViewer != null) {
-			IContentProvider p = fViewer.getContentProvider();
-			if(p!=null)	
-				p.dispose();
-		}
-		
-		super.dispose();
-	}
-
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-	}
-	
-	public TreeViewer getTreeViewer(){
-		return fViewer;
-	}
-	
-
-	protected IJavaElement findElementToSelect(IJavaElement je) {
-		return null;
-	}
-
-	protected String getHelpContextId() {
-		return null;
-	}
-
-	protected boolean isValidInput(Object element) {
-		return false;
-	}
-	
-	private class TestProblemTreeViewer extends ProblemTreeViewer{
-		
-		public TestProblemTreeViewer(Composite parent, int flag){
-			super(parent,flag);
-		}
-		
-		public void refresh(Object object){
-			fRefreshHappened= true;
-			fRefreshedObjects.add(object);
-		}
-		
-		public void refresh(final Object element, final boolean updateLabels) {
-			fRefreshHappened= true;
-			fRefreshedObjects.add(element);
-		}
-		
-		public void remove(Object object) {
-			fRemoveHappened= true;
-			fRemovedObject.add(object);
-		}
-		
-		public void add(Object parentObject, Object object){
-			fAddHappened= true;
-			fAddedObject= object;
-			fAddedParentObject= parentObject;
-		}
-	}
-
-	/**
-	 * Returns the refreshed object.
-	 * @return Object
-	 */
-	public boolean wasObjectRefreshed(Object c) {
-		return fRefreshedObjects.contains(c);
-	}
-	
-	public List getRefreshedObject(){
-		return fRefreshedObjects;	
-	}
-
-	/**
-	 * Returns the object added to the tree viewer
-	 * @return Object
-	 */
-	public Object getParentOfAddedObject() {
-		return fAddedParentObject;
-	}
-
-	/**
-	 * Returns true if something was added to the viewer
-	 * @return boolean
-	 */
-	public boolean hasAddHappened() {
-		return fAddHappened;
-	}
-
-	/**
-	 * Returns true if an object was removed from the viewer
-	 * @return boolean
-	 */
-	public boolean hasRemoveHappened() {
-		return fRemoveHappened;
-	}	
-	/**
-	 * Returns the object removed from the viewer
-	 * @return Object
-	 */
-	public List getRemovedObject() {
-		return fRemovedObject;
-	}
-
-	/**
-	 * Returns the object added to the viewer
-	 * @return Object
-	 */
-	public Object getAddedObject() {
-		return fAddedObject;
-	}
-	
-	/**
-	 * Returns true if a refresh happened
-	 * @return boolean
-	 */
-	public boolean hasRefreshHappened() {
-		return fRefreshHappened;
-	}
-	
-	/**
-	 * Sets the folding preference.
-	 * @param fold
-	 */
-	public void setFolding(boolean fold) {
-		JavaPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.APPEARANCE_FOLD_PACKAGES_IN_PACKAGE_EXPLORER, fold);
-	}		
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageExplorerContentProviderTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageExplorerContentProviderTests.java
deleted file mode 100644
index 93f6170..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageExplorerContentProviderTests.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.packageview;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class PackageExplorerContentProviderTests {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite("Test for org.eclipse.jdt.ui.tests.packageview");
-		//$JUnit-BEGIN$
-		suite.addTest(ContentProviderTests1.suite());
-		suite.addTest(ContentProviderTests2.suite());
-		suite.addTest(ContentProviderTests3.suite());
-		suite.addTest(ContentProviderTests4.suite());
-		suite.addTest(ContentProviderTests5.suite());
-		//$JUnit-END$
-		return suite;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/TestDelta.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/TestDelta.java
deleted file mode 100644
index 5cf53ce..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/TestDelta.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.packageview;
-
-import org.eclipse.core.resources.IResourceDelta;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-
-/**
- * @author Jen's account
- *
- */
-public class TestDelta implements IJavaElementDelta {
-
-	private int fKind;
-	private IJavaElement fElement;
-
-	private IJavaElementDelta[] fAffectedChildren;
-
-	public TestDelta(int kind, IJavaElement element) {
-		fKind= kind;
-		fElement= element;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getAddedChildren()
-		*/
-	public IJavaElementDelta[] getAddedChildren() {
-		return null;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getAffectedChildren()
-		*/
-	public IJavaElementDelta[] getAffectedChildren() {
-		if (fAffectedChildren == null)
-			return new IJavaElementDelta[0];
-		else
-			return fAffectedChildren;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getChangedChildren()
-		*/
-	public IJavaElementDelta[] getChangedChildren() {
-		return null;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getElement()
-		*/
-	public IJavaElement getElement() {
-		return fElement;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getFlags()
-		*/
-	public int getFlags() {
-		return 0;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getKind()
-		*/
-	public int getKind() {
-		return fKind;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getMovedFromElement()
-		*/
-	public IJavaElement getMovedFromElement() {
-		return null;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getMovedToElement()
-		*/
-	public IJavaElement getMovedToElement() {
-		return null;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getRemovedChildren()
-		*/
-	public IJavaElementDelta[] getRemovedChildren() {
-		return null;
-	}
-	/**
-		* @see org.eclipse.jdt.core.IJavaElementDelta#getResourceDeltas()
-		*/
-	public IResourceDelta[] getResourceDeltas() {
-		return null;
-	}
-
-	public void setAffectedChildren(IJavaElementDelta[] children) {
-		fAffectedChildren= children;
-	}
-	
-	public static TestDelta createParentDeltas(IPackageFragment frag, TestDelta delta) {
-		IJavaElement root= frag.getParent();
-		TestDelta rootDelta= new TestDelta(IJavaElementDelta.CHANGED, root);
-
-		IJavaProject proj= root.getJavaProject();
-		TestDelta projectDelta= new TestDelta(IJavaElementDelta.CHANGED, proj);
-
-		IJavaModel model= proj.getJavaModel();
-		TestDelta modelDelta= new TestDelta(IJavaElementDelta.CHANGED, model);
-
-		//set affected children
-		modelDelta.setAffectedChildren(new IJavaElementDelta[] { projectDelta });
-		projectDelta.setAffectedChildren(new IJavaElementDelta[] { rootDelta });
-		rootDelta.setAffectedChildren(new IJavaElementDelta[] { delta });
-		return modelDelta;
-	}
-
-	public static IJavaElementDelta createCUDelta(ICompilationUnit[] cu, IPackageFragment parent, int action) {
-		TestDelta fragmentDelta= new TestDelta(IJavaElementDelta.CHANGED, parent);
-
-		TestDelta[] deltas= new TestDelta[cu.length];
-		for (int i= 0; i < cu.length; i++) {
-			deltas[i]= new TestDelta(action, cu[i]);
-		}
-
-		fragmentDelta.setAffectedChildren(deltas);
-		return createParentDeltas(parent, fragmentDelta);
-	}
-
-	public static IJavaElementDelta createDelta(IPackageFragment frag, int action) {
-		TestDelta delta= new TestDelta(action, frag);
-		return createParentDeltas(frag, delta);
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AdvancedQuickAssistTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AdvancedQuickAssistTest.java
deleted file mode 100644
index 312912e..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AdvancedQuickAssistTest.java
+++ /dev/null

@@ -1,627 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   Konstantin Scheglov (scheglov_ke@nlmk.ru) - initial API and implementation 
- *          (report 71244: New Quick Assist's [quick assist])
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.core.runtime.Preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-
-public class AdvancedQuickAssistTest extends QuickFixTest {
-
-	private static final Class THIS= AdvancedQuickAssistTest.class;
-
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-
-	public AdvancedQuickAssistTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test setUpTest(Test test) {
-		return new ProjectTestSetup(test);
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		}
-		return setUpTest(new AdvancedQuickAssistTest("testAssignToLocal1"));
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-
-		JavaCore.setOptions(options);
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		store.setValue(PreferenceConstants.CODEGEN_KEYWORD_THIS, false);
-
-		TemplateStore codeTemplateStore= JavaPlugin.getDefault().getCodeTemplateStore();
-		codeTemplateStore.findTemplate(CodeTemplateContextType.METHODSTUB).setPattern("//TODO\n${body_statement}");
-
-		Preferences corePrefs= JavaCore.getPlugin().getPluginPreferences();
-		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_PREFIXES, "");
-		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_PREFIXES, "");
-		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_SUFFIXES, "");
-		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_SUFFIXES, "");
-
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	public void testSplitIfCondition1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b) {\n");
-		buf.append("        if (a && (b == 0)) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("&&");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b) {\n");
-		buf.append("        if (a) {\n");
-		buf.append("            if (b == 0) {\n");
-		buf.append("                b= 9;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testSplitIfCondition2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a && (b == 0) && c) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("&& (");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a) {\n");
-		buf.append("            if (b == 0 && c) {\n");
-		buf.append("                b= 9;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testSplitIfCondition3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a && (b == 0) && c) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("&& c");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a && (b == 0)) {\n");
-		buf.append("            if (c) {\n");
-		buf.append("                b= 9;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testJoinAndIfStatements1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a && (b == 0)) {\n");
-		buf.append("            if (c) {\n");
-		buf.append("                b= 9;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("if (a");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a && (b == 0) && c) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testJoinAndIfStatements2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a && (b == 0)) {\n");
-		buf.append("            if (c) {\n");
-		buf.append("                b= 9;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("if (a");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a && (b == 0) && c) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testJoinOrIfStatements1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a)\n");
-		buf.append("            return;\n");
-		buf.append("        if (b == 5)\n");
-		buf.append("            return;\n");
-		buf.append("        b= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset1= buf.toString().indexOf("if (a");
-		int offset2= buf.toString().lastIndexOf("b= 9;");
-		AssistContext context= getCorrectionContext(cu, offset1, offset2 - offset1);
-		List proposals= collectAssists(context, false);
-
-		for (Iterator I= proposals.iterator(); I.hasNext();) {
-			Object o= I.next();
-			if (!(o instanceof CUCorrectionProposal))
-				I.remove();
-		}
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a || b == 5)\n");
-		buf.append("            return;\n");
-		buf.append("        b= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testSplitOrCondition1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a || b == 5)\n");
-		buf.append("            return;\n");
-		buf.append("        b= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("||");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		for (Iterator I= proposals.iterator(); I.hasNext();) {
-			Object o= I.next();
-			if (!(o instanceof CUCorrectionProposal))
-				I.remove();
-		}
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, boolean c) {\n");
-		buf.append("        if (a)\n");
-		buf.append("            return;\n");
-		buf.append("        if (b == 5)\n");
-		buf.append("            return;\n");
-		buf.append("        b= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testIfReturnIntoIfElseAtEndOfVoidMethod1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b) {\n");
-		buf.append("        if (a) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("            return;\n");
-		buf.append("        }\n");
-		buf.append("        b= 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("if (");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b) {\n");
-		buf.append("        if (a) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        } else {\n");
-		buf.append("            b= 0;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testInverseIfContinueIntoIfThenInLoops1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, ArrayList list) {\n");
-		buf.append("        for (Iterator I = list.iterator(); I.hasNext();) {\n");
-		buf.append("            if (a) {\n");
-		buf.append("                b= 9;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("if (");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, ArrayList list) {\n");
-		buf.append("        for (Iterator I = list.iterator(); I.hasNext();) {\n");
-		buf.append("            if (!a)\n");
-		buf.append("                continue;\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testInverseIfIntoContinueInLoops1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, ArrayList list) {\n");
-		buf.append("        for (Iterator I = list.iterator(); I.hasNext();) {\n");
-		buf.append("            if (!a)\n");
-		buf.append("                continue;\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("if (");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, ArrayList list) {\n");
-		buf.append("        for (Iterator I = list.iterator(); I.hasNext();) {\n");
-		buf.append("            if (a) {\n");
-		buf.append("                b= 9;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testRemoveExtraParenthesis1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, Object o) {\n");
-		buf.append("        if (a && (b == 0) && (o instanceof Integer) && (a || b)) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset1= buf.toString().indexOf("if (");
-		int offset2= buf.toString().indexOf(") {", offset1);
-		AssistContext context= getCorrectionContext(cu, offset1, offset2 - offset1);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, Object o) {\n");
-		buf.append("        if (a && b == 0 && o instanceof Integer && (a || b)) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testAddParanoidalParenthesis1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, int c, Object o) {\n");
-		buf.append("        if (a && b == 0 && b + c > 3 && o instanceof Integer) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset1= buf.toString().indexOf("if (");
-		int offset2= buf.toString().indexOf(") {", offset1);
-		AssistContext context= getCorrectionContext(cu, offset1, offset2 - offset1);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b, int c, Object o) {\n");
-		buf.append("        if (a && (b == 0) && (b + c > 3) && (o instanceof Integer)) {\n");
-		buf.append("            b= 9;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testInverseIfCondition1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b) {\n");
-		buf.append("        if (a && (b == 0)) {\n");
-		buf.append("            return;\n");
-		buf.append("        } else {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("if (");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, int b) {\n");
-		buf.append("        if (!a || (b != 0)) {\n");
-		buf.append("        } else {\n");
-		buf.append("            return;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-	public void testInverseIfCondition2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, boolean b, boolean c) {\n");
-		buf.append("        if (a || b && c) {\n");
-		buf.append("            return;\n");
-		buf.append("        } else {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		int offset= buf.toString().indexOf("if (");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		assertCorrectLabels(proposals);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(boolean a, boolean b, boolean c) {\n");
-		buf.append("        if (!a && (!b || !c)) {\n");
-		buf.append("        } else {\n");
-		buf.append("            return;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertExpectedExistInProposals(proposals, new String[] {expected1});
-
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java
deleted file mode 100644
index f1d57d1..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java
+++ /dev/null

@@ -1,2515 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids <sdavids@gmx.de> - testInvertEquals1-23
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.Hashtable;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.core.runtime.Preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.AssignToVariableAssistProposal;
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.LinkedNamesAssistProposal;
-
-public class AssistQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= AssistQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-
-	public AssistQuickFixTest(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new AssistQuickFixTest("testAssignToLocal7"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		store.setValue(PreferenceConstants.CODEGEN_KEYWORD_THIS, false);
-		
-		TemplateStore codeTemplateStore= JavaPlugin.getDefault().getCodeTemplateStore();
-		codeTemplateStore.findTemplate(CodeTemplateContextType.METHODSTUB).setPattern("//TODO\n${body_statement}");
-		
-		Preferences corePrefs= JavaCore.getPlugin().getPluginPreferences();
-		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_PREFIXES, "");
-		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_PREFIXES, "");
-		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_SUFFIXES, "");
-		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_SUFFIXES, "");		
-		
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-	
-	public void testAssignToLocal() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        getClass();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("getClass()");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private Class class1;\n");
-		buf.append("\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        class1 = getClass();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Class class1 = getClass();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-		
-	}
-
-	public void testAssignToLocal2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        goo().iterator();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("goo().iterator()");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");
-		buf.append("import java.util.Vector;\n");				
-		buf.append("public class E {\n");
-		buf.append("    private Iterator iterator;\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        iterator = goo().iterator();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");
-		buf.append("import java.util.Vector;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        Iterator iterator = goo().iterator();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testAssignToLocal3() throws Exception {
-		// test prefixes and this qualification
-		
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_KEYWORD_THIS, true);
-		Preferences corePrefs= JavaCore.getPlugin().getPluginPreferences();
-		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_PREFIXES, "f");
-		corePrefs.setValue(JavaCore.CODEASSIST_LOCAL_PREFIXES, "_");
-			
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int fCount;\n");
-		buf.append("\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        System.getSecurityManager();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("System");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int fCount;\n");
-		buf.append("    private SecurityManager fSecurityManager;\n");
-		buf.append("\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        this.fSecurityManager = System.getSecurityManager();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int fCount;\n");
-		buf.append("\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        SecurityManager _securityManager = System.getSecurityManager();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testAssignToLocal4() throws Exception {
-		// test name conflict
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int f;\n");
-		buf.append("\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Math.min(1.0f, 2.0f);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("Math");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int f;\n");
-		buf.append("    private float g;\n");
-		buf.append("\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        g = Math.min(1.0f, 2.0f);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int f;\n");
-		buf.append("\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        float g = Math.min(1.0f, 2.0f);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-
-	public void testAssignToLocal5() throws Exception {
-		// test prefixes and this qualification on static method
-		
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_KEYWORD_THIS, true);
-		Preferences corePrefs= JavaCore.getPlugin().getPluginPreferences();
-		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_PREFIXES, "f");
-		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_PREFIXES, "fg");
-		corePrefs.setValue(JavaCore.CODEASSIST_LOCAL_PREFIXES, "_");
-			
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int fCount;\n");
-		buf.append("\n");
-		buf.append("    public static void foo() {\n");
-		buf.append("        System.getSecurityManager();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("System");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int fCount;\n");
-		buf.append("    private static SecurityManager fgSecurityManager;\n");
-		buf.append("\n");				
-		buf.append("    public static void foo() {\n");
-		buf.append("        E.fgSecurityManager = System.getSecurityManager();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    private int fCount;\n");
-		buf.append("\n");
-		buf.append("    public static void foo() {\n");
-		buf.append("        SecurityManager _securityManager = System.getSecurityManager();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-
-	public void testAssignToLocal6() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    static {\n");
-		buf.append("        getClass(); // comment\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		int offset= buf.toString().indexOf("getClass()");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static Class class1;\n");
-		buf.append("\n");
-		buf.append("    static {\n");
-		buf.append("        class1 = getClass(); // comment\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    static {\n");
-		buf.append("        Class class1 = getClass(); // comment\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testAssignToLocal7() throws Exception {
-		// test name conflict: name used later
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        goo().iterator();\n");
-		buf.append("        Iterator iterator= null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("goo().iterator()");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");
-		buf.append("import java.util.Vector;\n");				
-		buf.append("public class E {\n");
-		buf.append("    private Iterator iterator2;\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        iterator2 = goo().iterator();\n");
-		buf.append("        Iterator iterator= null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");
-		buf.append("import java.util.Vector;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        Iterator iterator2 = goo().iterator();\n");
-		buf.append("        Iterator iterator= null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-
-
-	
-	public void testAssignParamToField() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public  E(int count) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("count");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private final int count;\n");
-		buf.append("\n");
-		buf.append("    public  E(int count) {\n");
-		buf.append("        this.count = count;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testAssignParamToField2() throws Exception {
-		Preferences corePrefs= JavaCore.getPlugin().getPluginPreferences();
-		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_PREFIXES, "f");
-
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public  E(int count, Vector vec[]) {\n");
-		buf.append("        super();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("vec");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    private final Vector[] fVec;\n");
-		buf.append("\n");
-		buf.append("    public  E(int count, Vector vec[]) {\n");
-		buf.append("        super();\n");
-		buf.append("        fVec = vec;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-
-	public void testAssignParamToField3() throws Exception {
-		Preferences corePrefs= JavaCore.getPlugin().getPluginPreferences();
-		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_PREFIXES, "fg");
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_KEYWORD_THIS, true);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fgVec;\n");
-		buf.append("\n");
-		buf.append("    public static void foo(int count, Vector vec[]) {\n");
-		buf.append("        count++;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("vec[]");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fgVec;\n");
-		buf.append("    private static Vector[] fgVec2;\n");
-		buf.append("\n");
-		buf.append("    public static void foo(int count, Vector vec[]) {\n");
-		buf.append("        E.fgVec2 = vec;\n");
-		buf.append("        count++;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testAssignParamToField4() throws Exception {
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_KEYWORD_THIS, true);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private long count;\n");
-		buf.append("\n");
-		buf.append("    public void foo(int count) {\n");
-		buf.append("        count++;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("int count");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private long count;\n");
-		buf.append("    private int count2;\n");
-		buf.append("\n");
-		buf.append("    public void foo(int count) {\n");
-		buf.append("        this.count2 = count;\n");
-		buf.append("        count++;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testAssignParamToField5() throws Exception {
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_KEYWORD_THIS, true);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int p1;\n");
-		buf.append("\n");
-		buf.append("    public void foo(int p1, int p2) {\n");
-		buf.append("        this.p1 = p1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		int offset= buf.toString().indexOf("int p2");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int p1;\n");
-		buf.append("    private int p2;\n");
-		buf.append("\n");
-		buf.append("    public void foo(int p1, int p2) {\n");
-		buf.append("        this.p1 = p1;\n");
-		buf.append("        this.p2 = p2;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}		
-	
-	
-	
-	public void testAssignToLocal2CursorAtEnd() throws Exception {	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        goo().toArray();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "goo().toArray();";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");				
-		buf.append("public class E {\n");
-		buf.append("    private Object[] objects;\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        objects = goo().toArray();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public Vector goo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        Object[] objects = goo().toArray();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testReplaceCatchClauseWithThrowsWithFinally() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");	
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        } finally {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "(IOException e)";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo() throws IOException {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } finally {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } finally {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-				
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-
-	}
-	
-	public void testReplaceSingleCatchClauseWithThrows() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");	
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "(IOException e)";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo() throws IOException {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");	
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        } finally {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-				
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });	
-
-	}
-	
-	public void testUnwrapForLoop() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        for (int i= 0; i < 3; i++) {\n");		
-		buf.append("            goo();\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "for";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testUnwrapDoStatement() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        do {\n");		
-		buf.append("            goo();\n");
-		buf.append("            goo();\n");
-		buf.append("            goo();\n");
-		buf.append("        } while (true);\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "do";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo();\n");
-		buf.append("        goo();\n");
-		buf.append("        goo();\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}	
-	
-	public void testUnwrapWhileLoop2Statements() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        while (true) {\n");		
-		buf.append("            goo();\n");
-		buf.append("            System.out.println();\n");		
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "while";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo();\n");
-		buf.append("        System.out.println();\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testUnwrapIfStatement() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        if (1+ 3 == 6) {\n");		
-		buf.append("            StringBuffer buf= new StringBuffer();\n");
-		buf.append("            buf.append(1);\n");
-		buf.append("            buf.append(2);\n");
-		buf.append("            buf.append(3);\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "if";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        StringBuffer buf= new StringBuffer();\n");
-		buf.append("        buf.append(1);\n");
-		buf.append("        buf.append(2);\n");
-		buf.append("        buf.append(3);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        if (1+ 3 == 6) {\n");		
-		buf.append("            StringBuffer buf= new StringBuffer();\n");
-		buf.append("            buf.append(1);\n");
-		buf.append("            buf.append(2);\n");
-		buf.append("            buf.append(3);\n");
-		buf.append("        } else {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-				
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testUnwrapTryStatement() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            StringBuffer buf= new StringBuffer();\n");
-		buf.append("            buf.append(1);\n");
-		buf.append("            buf.append(2);\n");
-		buf.append("            buf.append(3);\n");
-		buf.append("        } finally {\n");
-		buf.append("            return;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "try";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        StringBuffer buf= new StringBuffer();\n");
-		buf.append("        buf.append(1);\n");
-		buf.append("        buf.append(2);\n");
-		buf.append("        buf.append(3);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testUnwrapAnonymous() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            public void run() { \n");
-		buf.append("                throw new NullPointerException();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "};";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        throw new NullPointerException();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testUnwrapBlock() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        {\n");
-		buf.append("            { \n");
-		buf.append("                throw new NullPointerException();\n");
-		buf.append("            }//comment\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "}//comment";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        {\n");
-		buf.append("            throw new NullPointerException();\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testUnwrapParanthesis() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return (9+ 8);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "(9+ 8)";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 9+ 8;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testUnwrapMethodInvocation() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return Math.abs(9+ 8);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "Math.abs(9+ 8)";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 9+ 8;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testSplitDeclaration1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int i = 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "9";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int i;\n");
-		buf.append("        i = 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testSplitDeclaration2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        for (int i = 0; i < 9; i++) {\n");
-		buf.append("       }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "0";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int i;\n");
-		buf.append("        for (i = 0; i < 9; i++) {\n");
-		buf.append("       }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testSplitDeclaration3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        final int i[] = null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "i[]";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int i[];\n");
-		buf.append("        i = null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}	
-	
-	public void testJoinDeclaration1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int var[];\n");
-		buf.append("        var = null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "var";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int var[] = null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");		
-
-
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	
-	public void testJoinDeclaration2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int var;\n");
-		buf.append("        for (var = 0; var < 9; var++) {\n");
-		buf.append("       }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "var";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int var = 0;\n");
-		buf.append("        for (; var < 9; var++) {\n");
-		buf.append("       }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	private static final Class[] FILTER_EQ= { LinkedNamesAssistProposal.class, AssignToVariableAssistProposal.class };
-	
-    public void testInvertEquals() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(\"b\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"b\".equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(\"b\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    public void testInvertEquals2() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        String s= \"a\";\n");
-        buf.append("        s.equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        String s= \"a\";\n");
-        buf.append("        \"a\".equals(s);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        String s= \"a\";\n");
-        buf.append("        s.equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    public void testInvertEquals3() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    private String a= \"a\";\n");
-        buf.append("    private String b= \"b\";\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        a.equals(b);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    private String a= \"a\";\n");
-        buf.append("    private String b= \"b\";\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        b.equals(a);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    private String a= \"a\";\n");
-        buf.append("    private String b= \"b\";\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        a.equals(b);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    public void testInvertEquals4() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class S {\n");
-        buf.append("    protected String sup= \"a\";\n");
-        buf.append("}\n");
-        buf.append("public class E extends S {\n");
-        buf.append("    private String a= \"a\";\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        sup.equals(this.a);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class S {\n");
-        buf.append("    protected String sup= \"a\";\n");
-        buf.append("}\n");
-        buf.append("public class E extends S {\n");
-        buf.append("    private String a= \"a\";\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        this.a.equals(sup);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class S {\n");
-        buf.append("    protected String sup= \"a\";\n");
-        buf.append("}\n");
-        buf.append("public class E extends S {\n");
-        buf.append("    private String a= \"a\";\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        sup.equals(this.a);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-
-    public void testInvertEquals5() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class A {\n");
-        buf.append("    static String A= \"a\";\n");
-        buf.append("}\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(A.A);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class A {\n");
-        buf.append("    static String A= \"a\";\n");
-        buf.append("}\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        A.A.equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class A {\n");
-        buf.append("    static String A= \"a\";\n");
-        buf.append("}\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(A.A);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-
-    public void testInvertEquals6() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class A {\n");
-        buf.append("    static String get() {\n");
-        buf.append("        return \"a\";\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(A.get());\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class A {\n");
-        buf.append("    static String get() {\n");
-        buf.append("        return \"a\";\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        A.get().equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class A {\n");
-        buf.append("    static String get() {\n");
-        buf.append("        return \"a\";\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(A.get());\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-
-    public void testInvertEquals7() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".getClass().equals(String.class);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        String.class.equals(\"a\".getClass());\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".getClass().equals(String.class);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-
-    public void testInvertEquals8() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        boolean x = false && \"a\".equals(get());\n");
-        buf.append("    }\n");
-        buf.append("    String get() {\n");
-        buf.append("        return \"a\";\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        boolean x = false && get().equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("    String get() {\n");
-        buf.append("        return \"a\";\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        boolean x = false && \"a\".equals(get());\n");
-        buf.append("    }\n");
-        buf.append("    String get() {\n");
-        buf.append("        return \"a\";\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-
-    public void testInvertEquals9() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        equals(new E());\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        new E().equals(this);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        equals(new E());\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    public void testInvertEquals10() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(null);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals11() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    boolean equals(Object o, boolean a) {\n");
-        buf.append("        return false;\n");
-        buf.append("    }\n");  
-        buf.append("    public void foo() {\n");        
-        buf.append("        new E().equals(\"a\", false);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "E().equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-        
-        context= getCorrectionContext(cu, buf.toString().lastIndexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals12() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    boolean equals(boolean b) {\n");
-        buf.append("        return false;\n");
-        buf.append("    }\n");  
-        buf.append("    public void foo() {\n");        
-        buf.append("        new E().equals(false);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "E().equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-        
-        context= getCorrectionContext(cu, buf.toString().lastIndexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals13() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    boolean equals(boolean b) {\n");
-        buf.append("        return false;\n");
-        buf.append("    }\n");  
-        buf.append("    public void foo() {\n");        
-        buf.append("        new E().equals(true ? true : false);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "E().equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-        
-        context= getCorrectionContext(cu, buf.toString().lastIndexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals14() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("class Super {\n");
-        buf.append("    protected boolean sBool= false;\n");
-        buf.append("}\n");
-        buf.append("public class E extends Super {\n");
-        buf.append("    boolean equals(boolean b) {\n");
-        buf.append("        return false;\n");
-        buf.append("    }\n");  
-        buf.append("    public void foo() {\n");        
-        buf.append("        new E().equals(sBool);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "E().equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-        
-        context= getCorrectionContext(cu, buf.toString().lastIndexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals15() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    boolean equals(int i) {\n");
-        buf.append("        return false;\n");
-        buf.append("    }\n");  
-        buf.append("    public void foo() {\n");        
-        buf.append("        new E().equals(1 + 1);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "E().equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-        
-        context= getCorrectionContext(cu, buf.toString().lastIndexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals16() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    boolean equals(int i) {\n");
-        buf.append("        return false;\n");
-        buf.append("    }\n");  
-        buf.append("    public void foo() {\n");
-        buf.append("        int i= 1;\n");
-        buf.append("        new E().equals(i + i);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "E().equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-        
-        context= getCorrectionContext(cu, buf.toString().lastIndexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals17() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("       \"a\".equals(null);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals18() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public boolean equals(Object o) {\n");
-        buf.append("       return super.equals(o);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals(o)";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-        
-        context= getCorrectionContext(cu, buf.toString().lastIndexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 0);
-        assertCorrectLabels(proposals);
-    }
-    
-    public void testInvertEquals19() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    private String a= \"a\";\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        a.equals((Object) \"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    private String a= \"a\";\n");        
-        buf.append("    public void foo() {\n");
-        buf.append("        ((Object) \"a\").equals(a);\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    private String a= \"a\";\n");        
-        buf.append("    public void foo() {\n");
-        buf.append("        a.equals((Object) \"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    public void testInvertEquals20() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        String s= null;\n");
-        buf.append("        \"a\".equals(s = \"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        String s= null;\n");
-        buf.append("        (s = \"a\").equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        String s= null;\n");
-        buf.append("        \"a\".equals(s = \"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    public void testInvertEquals21() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"aaa\".equals(\"a\" + \"a\" + \"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        (\"a\" + \"a\" + \"a\").equals(\"aaa\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"aaa\".equals(\"a\" + \"a\" + \"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    public void testInvertEquals22() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(true ? \"a\" : \"b\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        (true ? \"a\" : \"b\").equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(true ? \"a\" : \"b\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    public void testInvertEquals23() throws Exception {
-        IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-        StringBuffer buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals((\"a\"));\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-        
-        String str= "equals";
-        AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        List proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-        String preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        (\"a\").equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-        
-        cu= pack1.createCompilationUnit("E.java", buf.toString(), true, null);
-        context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-        proposals= collectAssists(context, FILTER_EQ);
-        
-        assertNumberOfProposals(proposals, 1);
-        assertCorrectLabels(proposals);
-        
-        proposal= (CUCorrectionProposal) proposals.get(0);
-        preview= getPreviewContent(proposal);
-
-        buf= new StringBuffer();
-        buf.append("package test1;\n");
-        buf.append("public class E {\n");
-        buf.append("    public void foo() {\n");
-        buf.append("        \"a\".equals(\"a\");\n");
-        buf.append("    }\n");
-        buf.append("}\n");
-        assertEqualString(preview, buf.toString());
-    }
-    
-    
-	public void testAddTypeToArrayInitializer() throws Exception {
-		
-			IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-			StringBuffer buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("public class E {\n");
-			buf.append("    public void foo() {\n");
-			buf.append("        int[][] numbers= {{ 1, 2 }, { 3, 4 }, { 4, 5 }};\n");		
-			buf.append("    }\n");
-			buf.append("}\n");
-			ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-			
-			String str= "{{";
-			AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-			List proposals= collectAssists(context, false);
-			
-			assertNumberOfProposals(proposals, 1);
-			assertCorrectLabels(proposals);
-			
-			CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-			String preview= getPreviewContent(proposal);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("public class E {\n");
-			buf.append("    public void foo() {\n");
-			buf.append("        int[][] numbers= new int[][]{{ 1, 2 }, { 3, 4 }, { 4, 5 }};\n");		
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(preview, buf.toString());	
-		}
-	
-	public void testCreateInSuper() throws Exception {
-		
-			IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-			StringBuffer buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("public class A {\n");
-			buf.append("}\n");
-			pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-			
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("public interface IB {\n");
-			buf.append("}\n");
-			pack1.createCompilationUnit("IB.java", buf.toString(), false, null);
-			
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("import java.io.IOException;\n");
-			buf.append("import java.util.Vector;\n");
-			buf.append("public class E extends A implements IB {\n");
-			buf.append("    public Vector foo(int count) throws IOException {\n");
-			buf.append("        return null;\n");
-			buf.append("    }\n");
-			buf.append("}\n");
-			ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-			
-			String str= "foo";
-			AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str) + str.length(), 0);
-			List proposals= collectAssists(context, false);
-			
-			assertNumberOfProposals(proposals, 2);
-			assertCorrectLabels(proposals);
-			
-			CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-			String preview1= getPreviewContent(proposal);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.IOException;\n");
-			buf.append("import java.util.Vector;\n");
-			buf.append("\n");
-			buf.append("public interface IB {\n");
-			buf.append("\n");
-			buf.append("    Vector foo(int count) throws IOException;\n");
-			buf.append("}\n");
-			String expected1= buf.toString();
-			
-			proposal= (CUCorrectionProposal) proposals.get(1);
-			String preview2= getPreviewContent(proposal);
-
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("\n");
-			buf.append("import java.io.IOException;\n");
-			buf.append("import java.util.Vector;\n");
-			buf.append("\n");
-			buf.append("public class A {\n");
-			buf.append("\n");
-			buf.append("    public Vector foo(int count) throws IOException {\n");
-			buf.append("        //TODO\n");
-			buf.append("        return null;\n");
-			buf.append("    }\n");
-			buf.append("}\n");
-			String expected2= buf.toString();
-					
-			assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-
-		}
-    
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ContributedQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ContributedQuickFixTest.java
deleted file mode 100644
index 5952d0d..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ContributedQuickFixTest.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Sebastian Davids <sdavids@gmx.de> - testInvertEquals1-23
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-
-public class ContributedQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= ContributedQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-
-	public ContributedQuickFixTest(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ContributedQuickFixTest("testContributedQuickFix1"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		
-		JavaCore.setOptions(options);			
-
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-	
-	public void testContributedQuickAssist1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public String foo() {\n");
-		buf.append("        return \"hello\";\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-				
-		int offset= buf.toString().indexOf("hello");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public String foo() {\n");
-		buf.append("        return \"HELLO\";\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1 }, new String[] { expected1 });	
-		
-	}
-	
-	public void testContributedQuickFix1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 99999999999999999;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-				
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1 }, new String[] { expected1 });	
-		
-	}
-	
-	public void testContributedQuickFix2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class B {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 99999999999999999;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("B.java", buf.toString(), false, null);
-				
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-
-		assertNumberOfProposals(proposals, 0);
-	}
-
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ConvertForLoopQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ConvertForLoopQuickFixTest.java
deleted file mode 100644
index 9c406fc..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ConvertForLoopQuickFixTest.java
+++ /dev/null

@@ -1,980 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.ConvertForLoopProposal;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-public class ConvertForLoopQuickFixTest extends QuickFixTest {
-
-	private static final Class THIS= ConvertForLoopQuickFixTest.class;
-
-	private IJavaProject fJProject1;
-
-	private IPackageFragmentRoot fSourceFolder;
-
-	private ConvertForLoopProposal fConvertLoopProposal;
-
-	public ConvertForLoopQuickFixTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ConvertForLoopQuickFixTest("testSimplestClean"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-		fConvertLoopProposal= null;
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	public void testSimplestSmokeCase() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int element : array) {\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testInferPrimitiveTypeElement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		char[] array = {'1','2'};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		char[] array = {'1','2'};\n");
-		buf.append("		for (char element : array) {\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testInferTypeElement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = {\"1\",\"2\"};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = {\"1\",\"2\"};\n");
-		buf.append("		for (String element : array) {\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testSimplestClean() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = {\"1\",\"2\"};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			System.out.println(array[i]);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = {\"1\",\"2\"};\n");
-		buf.append("		for (String element : array) {\n");
-		buf.append("			System.out.println(element);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testLotsOfRefereces() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = {\"1\",\"2\"};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			if (array[i].equals(\"2\"))\n");
-		buf.append("				System.out.println(array[i]);\n");
-		buf.append("			else if ((array[i] + 2) == \"4\"){\n");
-		buf.append("				int k = Integer.parseInt(array[i]) - 2;\n");
-		buf.append("			}\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = {\"1\",\"2\"};\n");
-		buf.append("		for (String element : array) {\n");
-		buf.append("			if (element.equals(\"2\"))\n");
-		buf.append("				System.out.println(element);\n");
-		buf.append("			else if ((element + 2) == \"4\"){\n");
-		buf.append("				int k = Integer.parseInt(element) - 2;\n");
-		buf.append("			}\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testInferCollectionFromInitializers() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = {\"1\",\"2\"};\n");
-		buf.append("		for (int i = 0, max = array.length; i < max; i++){\n");
-		buf.append("			if (array[i].equals(\"2\"))\n");
-		buf.append("				System.out.println(array[i]);\n");
-		buf.append("			else if ((array[i] + 2) == \"4\"){\n");
-		buf.append("				int k = Integer.parseInt(array[i]) - 2;\n");
-		buf.append("			}\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = {\"1\",\"2\"};\n");
-		buf.append("		for (String element : array) {\n");
-		buf.append("			if (element.equals(\"2\"))\n");
-		buf.append("				System.out.println(element);\n");
-		buf.append("			else if ((element + 2) == \"4\"){\n");
-		buf.append("				int k = Integer.parseInt(element) - 2;\n");
-		buf.append("			}\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testNiceReduction() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class Weirdy{}\n");
-		buf.append("private Weirdy[] weirdies;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo(){\n");
-		buf.append("		for (int i = 0, length = weirdies.length; i < length; i++){\n");
-		buf.append("			System.out.println();\n");
-		buf.append("		    Weirdy p = weirdies[i];\n");
-		buf.append("		    if (p != null){\n");
-		buf.append("				System.out.println(p);\n");
-		buf.append("	    	}\n");
-		buf.append("	    }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class Weirdy{}\n");
-		buf.append("private Weirdy[] weirdies;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo(){\n");
-		buf.append("		for (Weirdy p : weirdies) {\n");
-		buf.append("			System.out.println();\n");
-		buf.append("		    if (p != null){\n");
-		buf.append("				System.out.println(p);\n");
-		buf.append("	    	}\n");
-		buf.append("	    }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testNiceReductionArrayIsField() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class Weirdy{}\n");
-		buf.append("public class A {\n");
-		buf.append("	private Weirdy[] weirdies;\n");
-		buf.append("    public void foo(){\n");
-		buf.append("		for (int i = 0, length = weirdies.length; i < length; i++){\n");
-		buf.append("			System.out.println();\n");
-		buf.append("		    Weirdy p = weirdies[i];\n");
-		buf.append("		    if (p != null){\n");
-		buf.append("				System.out.println(p);\n");
-		buf.append("	    	}\n");
-		buf.append("	    }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class Weirdy{}\n");
-		buf.append("public class A {\n");
-		buf.append("	private Weirdy[] weirdies;\n");
-		buf.append("    public void foo(){\n");
-		buf.append("		for (Weirdy p : weirdies) {\n");
-		buf.append("			System.out.println();\n");
-		buf.append("		    if (p != null){\n");
-		buf.append("				System.out.println(p);\n");
-		buf.append("	    	}\n");
-		buf.append("	    }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testArrayIsQualifiedByThis() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class Weirdy{}\n");
-		buf.append("public class A {\n");
-		buf.append("	private Weirdy[] weirdies;\n");
-		buf.append("    public void foo(){\n");
-		buf.append("		for (int i = 0, length = this.weirdies.length; i < length; i++){\n");
-		buf.append("			System.out.println();\n");
-		buf.append("		    Weirdy p = this.weirdies[i];\n");
-		buf.append("		    if (p != null){\n");
-		buf.append("				System.out.println(p);\n");
-		buf.append("	    	}\n");
-		buf.append("	    }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class Weirdy{}\n");
-		buf.append("public class A {\n");
-		buf.append("	private Weirdy[] weirdies;\n");
-		buf.append("    public void foo(){\n");
-		buf.append("		for (Weirdy p : weirdies) {\n");
-		buf.append("			System.out.println();\n");
-		buf.append("		    if (p != null){\n");
-		buf.append("				System.out.println(p);\n");
-		buf.append("	    	}\n");
-		buf.append("	    }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testArrayIsAccessedByMethodInvocation() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class Weirdy{}\n");
-		buf.append("public class A {\n");
-		buf.append("	private Weirdy[] weirdies;\n");
-		buf.append("	private Weirdy[] getArray(){\n");
-		buf.append("		return weirdies;\n");
-		buf.append("	}\n");
-		buf.append("    public void foo(){\n");
-		buf.append("		for (int i = 0, length = this.weirdies.length; i < length; i++){\n");
-		buf.append("			System.out.println();\n");
-		buf.append("		    Weirdy p = getArray()[i];\n");
-		buf.append("		    if (p != null){\n");
-		buf.append("				System.out.println(p);\n");
-		buf.append("	    	}\n");
-		buf.append("	    }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testArrayIsAccessedByMethodInvocation2() throws Exception {
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class Weirdy{}\n");
-		buf.append("public class A {\n");
-		buf.append("	private Weirdy[] weirdies;\n");
-		buf.append("	private Weirdy[] getArray(){\n");
-		buf.append("		return weirdies;\n");
-		buf.append("	}\n");
-		buf.append("    public void foo(){\n");
-		buf.append("		for (int i = 0, length = getArray().length; i < length; i++){\n");
-		buf.append("			System.out.println();\n");
-		buf.append("		    Weirdy p = getArray()[i];\n");
-		buf.append("		    if (p != null){\n");
-		buf.append("				System.out.println(p);\n");
-		buf.append("	    	}\n");
-		buf.append("	    }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		        String preview1 = getPreviewContent(fConvertLoopProposal);
-		        
-		
-		        buf = new StringBuffer();
-		        buf.append("package test1;\n");
-		        buf.append("class Weirdy{}\n");
-		        buf.append("public class A {\n");
-		        buf.append("	private Weirdy[] weirdies;\n");
-		        buf.append("	private Weirdy[] getArray(){\n");
-		        buf.append("		return weirdies;\n");
-		        buf.append("	}\n");
-		        buf.append("    public void foo(){\n");
-		        buf.append("		for (Weirdy p : getArray()) {\n");
-		        buf.append("			System.out.println();\n");
-			    buf.append("		    if (p != null){\n");
-			    buf.append("				System.out.println(p);\n");
-			    buf.append("	    	}\n");
-			    buf.append("	    }\n");
-		        buf.append("    }\n");
-		        buf.append("}\n");
-		        String expected = buf.toString();
-		        assertEqualString(preview1, expected);
-	}
-
-	public void testMatrix() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[][] matrix = {{1,2},{3,4}};\n");
-		buf.append("		for (int i = 0; i < matrix.length; i++){\n");
-		buf.append("			System.out.println(matrix[i]);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[][] matrix = {{1,2},{3,4}};\n");
-		buf.append("		for (int[] element : matrix) {\n");
-		buf.append("			System.out.println(element);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testMatrix2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[][] matrix = {{1,2},{3,4}};\n");
-		buf.append("		for (int i = 0; i < matrix.length; i++){\n");
-		buf.append("			for(int j = 0; j < matrix[i].length; j++){\n");
-		buf.append("				System.out.println(matrix[i][j]);\n");
-		buf.append("			}\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNotNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-
-		String preview1= getPreviewContent(fConvertLoopProposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[][] matrix = {{1,2},{3,4}};\n");
-		buf.append("		for (int[] element : matrix) {\n");
-		buf.append("			for(int j = 0; j < element.length; j++){\n");
-		buf.append("				System.out.println(element[j]);\n");
-		buf.append("			}\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testArrayIsAssigned() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			array[i]=0;\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testArrayIsAssigned2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			++array[i];\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testArrayCannotBeInferred() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < 4; i++){\n");
-		buf.append("			System.out.println(array[i]);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testIndexBruteModified() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			System.out.println(array[i]);\n");
-		buf.append("			i++;\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testIndexBruteModified2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			i = array.lenght;\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testIndexReadOutsideArrayAccess() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			if (i == 1){};\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testIndexReadOutsideInferredArrayAccess() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		int[] array2 = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			System.out.println(array[i] + array2[i]);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-	
-	public void testIndexReadOutsideInferredArrayAccess2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public int get(int i) {\n");
-		buf.append("        return i; \n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		String[] array = null;\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			System.out.println(array[get(i)]);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testReverseTraversalIsNotAllowed() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = array.length; i > 0; --i){\n");
-		buf.append("			System.out.println(array[i]);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testCollectionIsNotArray() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		java.util.List list = new ArrayList();\n");
-		buf.append("		list.add(null);\n");
-		buf.append("		for (int i = 0; i < list.size(); i++){\n");
-		buf.append("			System.out.println(list.get(i);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testAdditionalLocalIsNotReferenced() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0, j = 0; i < array.length; i++){\n");
-		buf.append("			System.out.println(array[i] + j++);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testTwoIndexesNotAllowed() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0, j = 0; i < array.length; i++, j++){\n");
-		buf.append("			System.out.println(array[i] + j);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testAdditionalLocalIsNotReferenced2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		int i,j;\n");
-		buf.append("		for (i = 0, j = 1; i < array.length; i++){\n");
-		buf.append("			System.out.println(array[i] + j++);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-	
-	public void testCollectionTypeBindingIsNull() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		in[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < array.length; i++){\n");
-		buf.append("			System.out.println(array[i]);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-	
-	public void testCollectionBindingIsNull() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array = {1,2,3,4};\n");
-		buf.append("		for (int i = 0; i < arra.length; i++){\n");
-		buf.append("			System.out.println(array[i]);\n");
-		buf.append("		}\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-
-	public void testCollectionsNotAcceptedYet() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		List strings= new ArrayList();\n");
-		buf.append("		for (int i= 0; i < strings.size(); i++);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-	
-	public void testIndexDoesNotStartFromZero() throws Exception{
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("		int[] array= null;\n");
-		buf.append("		for (int i= 1; i < array.length; i++);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-
-		List proposals= fecthConvertingProposal(buf, cu);
-
-		assertNull(fConvertLoopProposal);
-
-		assertCorrectLabels(proposals);
-	}
-	private List fecthConvertingProposal(StringBuffer buf, ICompilationUnit cu) {
-		int offset= buf.toString().indexOf("for");
-		AssistContext context= getCorrectionContext(cu, offset, 0);
-		List proposals= collectAssists(context, false);
-
-		for (Iterator it= proposals.iterator(); it.hasNext();) {
-			CUCorrectionProposal proposal= (CUCorrectionProposal)it.next();
-			if (proposal instanceof ConvertForLoopProposal) {
-				fConvertLoopProposal= (ConvertForLoopProposal)proposal;
-			}
-		}
-		return proposals;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTest.java
deleted file mode 100644
index 6453ebf..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JavadocQuickFixTest.java
+++ /dev/null

@@ -1,775 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-
-public class JavadocQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= JavadocQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public JavadocQuickFixTest(String name) {
-		super(name);
-	}
-
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new JavadocQuickFixTest("testInsertAllMissing2"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(JavaCore.COMPILER_PB_INVALID_JAVADOC, JavaCore.ERROR);
-		options.put(JavaCore.COMPILER_PB_MISSING_JAVADOC_TAGS, JavaCore.ERROR);
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	
-	public void testMissingParam1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param b\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a, int b, int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param b\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a, int b, int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-		assertEqualString(preview2, expected);
-	}
-
-	public void testMissingParam2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a, int b, int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param b\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a, int b, int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-		assertEqualString(preview2, expected);
-	}
-	public void testMissingParam3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param b\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a, int b, int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param b\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a, int b, int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-		assertEqualString(preview2, expected);
-	}
-	
-	public void testMissingReturn1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param b\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public int foo(int b, int c) {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param b\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param c\n");
-		buf.append("     * @return\n");
-		buf.append("     */\n");
-		buf.append("    public int foo(int b, int c) {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-		assertEqualString(preview2, expected);
-	}
-	
-	public void testMissingReturn2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     */\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @return\n");
-		buf.append("     */\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-		assertEqualString(preview2, expected);
-	}
-	
-	public void testMissingReturn3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @throws Exception\n");
-		buf.append("     */\n");
-		buf.append("    public int foo() throws Exception {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @return\n");
-		buf.append("     * @throws Exception\n");
-		buf.append("     */\n");
-		buf.append("    public int foo() throws Exception {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-		assertEqualString(preview2, expected);
-	}
-	
-	public void testInsertAllMissing1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @throws Exception\n");
-		buf.append("     */\n");
-		buf.append("    public int foo(int a, int b) throws NullPointerException, Exception {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 4);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param b\n");
-		buf.append("     * @return\n");
-		buf.append("     * @throws NullPointerException\n");
-		buf.append("     * @throws Exception\n");
-		buf.append("     */\n");
-		buf.append("    public int foo(int a, int b) throws NullPointerException, Exception {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @return\n");
-		buf.append("     * @throws Exception\n");
-		buf.append("     */\n");
-		buf.append("    public int foo(int a, int b) throws NullPointerException, Exception {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-		
-	}
-	
-	public void testInsertAllMissing2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param b\n");
-		buf.append("     * @return a number\n");
-		buf.append("     */\n");
-		buf.append("    public int foo(int a, int b, int c) throws NullPointerException, Exception {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 4);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param b\n");
-		buf.append("     * @param c\n");
-		buf.append("     * @return a number\n");
-		buf.append("     * @throws NullPointerException\n");
-		buf.append("     * @throws Exception\n");
-		buf.append("     */\n");
-		buf.append("    public int foo(int a, int b, int c) throws NullPointerException, Exception {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     * @param b\n");
-		buf.append("     * @return a number\n");
-		buf.append("     */\n");
-		buf.append("    public int foo(int a, int b, int c) throws NullPointerException, Exception {\n");
-		buf.append("        return 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-		
-	}
-	
-	public void testRemoveParamTag1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-	
-	public void testRemoveParamTag2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param a\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	
-	public void testRemoveThrowsTag1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param c\n");
-		buf.append("     * @throws Exception Thrown by surprise.\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a, int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @param c\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a, int c) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	public void testRemoveThrowsTag2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @exception Exception\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-	
-	public void testRemoveThrowsTag3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @exception Exception\n");
-		buf.append("     * @exception java.io.IOException\n");
-		buf.append("     * @exception NullPointerException\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) throws IOException {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @exception java.io.IOException\n");
-		buf.append("     * @exception NullPointerException\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) throws IOException {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-	
-	public void testRemoveReturnTag1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @return Returns the result.\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @exception Exception\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) throws Exception {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @exception Exception\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) throws Exception {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-	
-	public void testRemoveUnknownTag1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @return Returns the result.\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @exception Exception\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) throws Exception {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		ArrayList proposals= collectCorrections2(cu, 1);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("/**\n");
-		buf.append(" */\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param a\n");
-		buf.append("     *      comment on second line.\n");
-		buf.append("     * @exception Exception\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int a) throws Exception {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-		assertEqualString(preview1, expected);
-	}
-
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/LocalCorrectionsQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/LocalCorrectionsQuickFixTest.java
deleted file mode 100644
index 0e15f40..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/LocalCorrectionsQuickFixTest.java
+++ /dev/null

@@ -1,3698 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.LinkedNamesAssistProposal;
-
-public class LocalCorrectionsQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= LocalCorrectionsQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-
-	public LocalCorrectionsQuickFixTest(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test setUpTest(Test test) {
-		return new ProjectTestSetup(test);
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		}
-		return setUpTest(new AdvancedQuickAssistTest("testAssignToLocal1"));
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, String.valueOf(99));
-		options.put(JavaCore.COMPILER_PB_STATIC_ACCESS_RECEIVER, JavaCore.ERROR);
-		
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CATCHBLOCK).setPattern("");
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CONSTRUCTORSTUB).setPattern("");
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.METHODSTUB).setPattern("");
-
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	
-	public void testFieldAccessToStatic() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.File;\n");
-		buf.append("public class E {\n");
-		buf.append("    public char foo() {\n");
-		buf.append("        return (new File(\"x.txt\")).separatorChar;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.File;\n");
-		buf.append("public class E {\n");
-		buf.append("    public char foo() {\n");
-		buf.append("        return File.separatorChar;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInheritedAccessOnStatic() throws Exception {
-		IPackageFragment pack0= fSourceFolder.createPackageFragment("pack", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class A {\n");
-		buf.append("    public static void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack0.createCompilationUnit("A.java", buf.toString(), false, null);		
-		
-		buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class B extends A {\n");
-		buf.append("}\n");
-		pack0.createCompilationUnit("B.java", buf.toString(), false, null);		
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import pack.B;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(B b) {\n");
-		buf.append("        b.foo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import pack.B;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(B b) {\n");
-		buf.append("        B.foo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import pack.A;\n");		
-		buf.append("import pack.B;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(B b) {\n");
-		buf.append("        A.foo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class A {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();		
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });
-	}	
-	
-	
-	public void testQualifiedAccessToStatic() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Thread t) {\n");
-		buf.append("        t.sleep(10);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Thread t) {\n");
-		buf.append("        Thread.sleep(10);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}	
-	
-	public void testThisAccessToStatic() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void goo() {\n");
-		buf.append("    }\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        this.goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void goo() {\n");
-		buf.append("    }\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        E.goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo() {\n");
-		buf.append("    }\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        this.goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testThisAccessToStaticField() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static int fCount;\n");
-		buf.append("\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        this.fCount= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static int fCount;\n");
-		buf.append("\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        E.fCount= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int fCount;\n");
-		buf.append("\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        this.fCount= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-		
-	}	
-	
-	public void testCastMissingInVarDecl() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        Thread th= o;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        Thread th= (Thread) o;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        Object th= o;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Thread o) {\n");
-		buf.append("        Thread th= o;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testCastMissingInVarDecl2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");		
-		buf.append("public class Container {\n");
-		buf.append("    public List[] getLists() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Container.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Container c) {\n");
-		buf.append("         ArrayList[] lists= c.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Container c) {\n");
-		buf.append("         ArrayList[] lists= (ArrayList[]) c.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");					
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Container c) {\n");
-		buf.append("         List[] lists= c.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");		
-		buf.append("import java.util.List;\n");		
-		buf.append("public class Container {\n");
-		buf.append("    public ArrayList[] getLists() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-
-	}
-	
-	public void testCastMissingInVarDecl3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Thread th= foo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 0);
-	}	
-	
-	public void testCastMissingInVarDecl4() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");		
-		buf.append("public class Container {\n");
-		buf.append("    public List getLists()[] {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Container.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");				
-		buf.append("public class E extends Container {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         ArrayList[] lists= super.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");				
-		buf.append("public class E extends Container {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         ArrayList[] lists= (ArrayList[]) super.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");					
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E extends Container {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         List[] lists= super.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");		
-		buf.append("import java.util.List;\n");		
-		buf.append("public class Container {\n");
-		buf.append("    public ArrayList[] getLists() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-
-	}
-	
-	
-	public void testCastMissingInFieldDecl() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    int time= System.currentTimeMillis();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    int time= (int) System.currentTimeMillis();\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    long time= System.currentTimeMillis();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}	
-	
-	public void testCastMissingInAssignment() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str;\n");
-		buf.append("        str= iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str;\n");
-		buf.append("        str= (String) iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        Object str;\n");
-		buf.append("        str= iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testCastMissingInAssignment2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str, str2;\n");
-		buf.append("        str= iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str, str2;\n");
-		buf.append("        str= (String) iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str2;\n");
-		buf.append("        Object str;\n");
-		buf.append("        str= iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testCastMissingInExpression() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public String[] foo(List list) {\n");
-		buf.append("        return list.toArray(new List[list.size()]);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public String[] foo(List list) {\n");
-		buf.append("        return (String[]) list.toArray(new List[list.size()]);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public Object[] foo(List list) {\n");
-		buf.append("        return list.toArray(new List[list.size()]);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	public void testCastOnCastExpression() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(List list) {\n");
-		buf.append("        ArrayList a= (Cloneable) list;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(List list) {\n");
-		buf.append("        ArrayList a= (ArrayList) list;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(List list) {\n");
-		buf.append("        Cloneable a= (Cloneable) list;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-
-	public void testUncaughtException() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");			
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("    }\n");				
-		buf.append("    public void foo() throws IOException {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		 
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");			
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");						
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testUncaughtException2() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public String goo() throws IOException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("    /**\n");
-		buf.append("     * Not much to say here.\n");
-		buf.append("     */\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo().substring(2);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");			
-		buf.append("public class E {\n");
-		buf.append("    public String goo() throws IOException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("    /**\n");
-		buf.append("     * Not much to say here.\n");
-		buf.append("     * @throws IOException\n");
-		buf.append("     */\n");
-		buf.append("    public void foo() throws IOException {\n");
-		buf.append("        goo().substring(2);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		 
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");			
-		buf.append("public class E {\n");
-		buf.append("    public String goo() throws IOException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("    /**\n");
-		buf.append("     * Not much to say here.\n");
-		buf.append("     */\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo().substring(2);\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");						
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testUncaughtExceptionRemoveMoreSpecific() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.net.SocketException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("    /**\n");
-		buf.append("     * @throws SocketException Sockets are dangerous\n");
-		buf.append("     * @since 3.0\n");
-		buf.append("     */\n");
-		buf.append("    public void foo() throws SocketException {\n");
-		buf.append("        this.goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.net.SocketException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("    /**\n");
-		buf.append("     * @throws IOException\n");
-		buf.append("     * @since 3.0\n");
-		buf.append("     */\n");
-		buf.append("    public void foo() throws IOException {\n");
-		buf.append("        this.goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		 
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.net.SocketException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("    /**\n");
-		buf.append("     * @throws SocketException Sockets are dangerous\n");
-		buf.append("     * @since 3.0\n");
-		buf.append("     */\n");
-		buf.append("    public void foo() throws SocketException {\n");
-		buf.append("        try {\n");		
-		buf.append("            this.goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");			
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testUncaughtExceptionToSurroundingTry() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void goo() throws IOException, ParseException {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");
-		buf.append("            E.goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void goo() throws IOException, ParseException {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() throws ParseException {\n");
-		buf.append("        try {\n");
-		buf.append("            E.goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		 
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void goo() throws IOException, ParseException {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");
-		buf.append("            try {\n");
-		buf.append("                E.goo();\n");
-		buf.append("            } catch (ParseException e1) {\n");
-		buf.append("            }\n");		
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-		 
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void goo() throws IOException, ParseException {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");		
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");
-		buf.append("            E.goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        } catch (ParseException e) {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}	
-	
-	public void testUncaughtExceptionOnSuper1() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.FileInputStream;\n");		
-		buf.append("public class E extends FileInputStream {\n");
-		buf.append("    public E() {\n");
-		buf.append("        super(\"x\");\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.FileInputStream;\n");		
-		buf.append("import java.io.FileNotFoundException;\n");	
-		buf.append("public class E extends FileInputStream {\n");
-		buf.append("    public E() throws FileNotFoundException {\n");
-		buf.append("        super(\"x\");\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUncaughtExceptionOnSuper2() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public A() throws Exception {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack1.createCompilationUnit("A.java", buf.toString(), false, null);		
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends A {\n");
-		buf.append("    public E() {\n");
-		buf.append("        super();\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends A {\n");
-		buf.append("    public E() throws Exception {\n");
-		buf.append("        super();\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		
-		assertEqualString(preview, buf.toString());
-	}	
-	
-	public void testUncaughtExceptionOnThis() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("        this(null);\n");		
-		buf.append("    }\n");
-		buf.append("    public E(Object x) throws IOException {\n");
-		buf.append("    }\n");				
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public E() throws IOException {\n");
-		buf.append("        this(null);\n");		
-		buf.append("    }\n");
-		buf.append("    public E(Object x) throws IOException {\n");
-		buf.append("    }\n");				
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}	
-	
-	
-	boolean BUG_25417= true;
-	
-	public void testUncaughtExceptionDuplicate() throws Exception {
-		if (BUG_25417) {
-			return;
-		}
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class MyException extends Exception {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("MyException.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void m1() throws IOException {\n");
-		buf.append("        m2();\n");
-		buf.append("    }\n");		
-		buf.append("    public void m2() throws IOException, ParseException, MyException {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 2); // 2 uncaught exceptions
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void m1() throws IOException, ParseException, MyException {\n");
-		buf.append("        m2();\n");
-		buf.append("    }\n");		
-		buf.append("    public void m2() throws IOException, ParseException, MyException {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		 
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void m1() throws IOException {\n");
-		buf.append("        try {\n");
-		buf.append("            m2();\n");
-		buf.append("        } catch (ParseException e) {\n");
-		buf.append("        } catch (MyException e) {\n");		
-		buf.append("        }\n");
-		buf.append("    }\n");		
-		buf.append("    public void m2() throws IOException, ParseException, MyException {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}	
-	
-	public void testMultipleUncaughtExceptions() throws Exception {
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");						
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException, ParseException {\n");
-		buf.append("    }\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 2); // 2 uncaught exceptions
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");						
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException, ParseException {\n");
-		buf.append("    }\n");				
-		buf.append("    public void foo() throws IOException, ParseException {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		 
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException, ParseException {\n");
-		buf.append("    }\n");				
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        } catch (ParseException e) {\n");		
-		buf.append("        }\n");						
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}	
-	
-	public void testUnneededCatchBlock() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        } catch (ParseException e) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");	
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void goo() throws IOException {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() throws ParseException {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testUnneededCatchBlockInInitializer() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.text.ParseException;\n");				
-		buf.append("public class E {\n");
-		buf.append("    static {\n");
-		buf.append("        try {\n");		
-		buf.append("            int x= 1;\n");
-		buf.append("        } catch (ParseException e) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");	
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.text.ParseException;\n");				
-		buf.append("public class E {\n");
-		buf.append("    static {\n");
-		buf.append("        int x= 1;\n");
-		buf.append("    }\n");	
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1 }, new String[] { expected1 });	
-	}
-	
-	public void testUnneededCatchBlockSingle() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo() {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo() {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo() {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() throws IOException {\n");
-		buf.append("        goo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-
-	public void testUnneededCatchBlockBug47221() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public Object foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            Object o= null;\n");
-		buf.append("            return o;\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        }\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public Object foo() {\n");
-		buf.append("        Object o= null;\n");
-		buf.append("        return o;\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public Object foo() throws IOException {\n");
-		buf.append("        Object o= null;\n");
-		buf.append("        return o;\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-
-	
-	public void testUnneededCatchBlockWithFinally() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo() {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } catch (IOException e) {\n");
-		buf.append("        } finally {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-	
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo() {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } finally {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo() {\n");
-		buf.append("    }\n");			
-		buf.append("    public void foo() throws IOException {\n");
-		buf.append("        try {\n");		
-		buf.append("            goo();\n");
-		buf.append("        } finally {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testUnimplementedMethods() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public interface Inter {\n");
-		buf.append("    int getCount(Object[] o) throws IOException;\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("Inter.java", buf.toString(), false, null);
-
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.Inter;\n");		
-		buf.append("public class E implements Inter{\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.Inter;\n");		
-		buf.append("public abstract class E implements Inter{\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("\n");		
-		buf.append("import test2.Inter;\n");
-		buf.append("public class E implements Inter{\n");
-		buf.append("\n");
-		buf.append("    public int getCount(Object[] o) throws IOException {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-		
-	}
-	
-	public void testUnimplementedMethods2() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public interface Inter {\n");
-		buf.append("    int getCount(Object[] o) throws IOException;\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("Inter.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public abstract class InterImpl implements Inter {\n");
-		buf.append("    protected abstract int[] getMusic() throws IOException;\n");		
-		buf.append("}\n");
-		pack2.createCompilationUnit("InterImpl.java", buf.toString(), false, null);		
-
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.InterImpl;\n");		
-		buf.append("public class E extends InterImpl {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 2);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.InterImpl;\n");		
-		buf.append("public abstract class E extends InterImpl {\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("\n");		
-		buf.append("import test2.InterImpl;\n");
-		buf.append("public class E extends InterImpl {\n");
-		buf.append("\n");
-		buf.append("    protected int[] getMusic() throws IOException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public int getCount(Object[] o) throws IOException {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	public void testUnimplementedMethods_bug62931() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public interface Inter {\n");
-		buf.append("    int foo();\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("Inter.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class A {\n");
-		buf.append("    int foo() { }\n");	// package visible	
-		buf.append("}\n");
-		pack2.createCompilationUnit("A.java", buf.toString(), false, null);		
-
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.A;\n");	
-		buf.append("import test2.Inter;\n");		
-		buf.append("public class E extends A implements Inter {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.A;\n");	
-		buf.append("import test2.Inter;\n");		
-		buf.append("public class E extends A implements Inter {\n");
-		buf.append("\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.A;\n");	
-		buf.append("import test2.Inter;\n");		
-		buf.append("public abstract class E extends A implements Inter {\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-
-				
-		assertEqualStringsIgnoreOrder(new String[] { preview1 }, new String[] { expected1 });
-	}		
-	
-	public void testUnitializedVariable() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int s;\n");
-		buf.append("        try {\n");
-		buf.append("            s= 1;\n");
-		buf.append("        } catch (Exception e) {\n");
-		buf.append("            System.out.println(s);\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int s = 0;\n");
-		buf.append("        try {\n");
-		buf.append("            s= 1;\n");
-		buf.append("        } catch (Exception e) {\n");
-		buf.append("            System.out.println(s);\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testUndefinedConstructorInDefaultConstructor1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public F(Runnable runnable) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("\n");
-		buf.append("    public E(Runnable runnable) {\n");
-		buf.append("        super(runnable);\n");		
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUndefinedConstructorInDefaultConstructor2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class F {\n");
-		buf.append("    public F(Runnable runnable) throws IOException {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public F(int i, Runnable runnable) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("\n");
-		buf.append("    public E(int i, Runnable runnable) {\n");
-		buf.append("        super(i, runnable);\n");		
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("\n");
-		buf.append("public class E extends F {\n");
-		buf.append("\n");
-		buf.append("    public E(Runnable runnable) throws IOException {\n");
-		buf.append("        super(runnable);\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-
-	public void testUndefinedConstructorWithEnclosing1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public class SubF {\n");
-		buf.append("        public SubF(int i) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public class SubE extends F.SubF {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public class SubE extends F.SubF {\n");
-		buf.append("\n");
-		buf.append("        public SubE(F f, int i) {\n");
-		buf.append("            f.super(i);\n");		
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUndefinedConstructorWithEnclosing2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public static class SubF {\n");
-		buf.append("        public SubF(int i) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public class SubE extends F.SubF {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public class SubE extends F.SubF {\n");
-		buf.append("\n");
-		buf.append("        public SubE(int i) {\n");
-		buf.append("            super(i);\n");		
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	public void testUndefinedConstructorWithEnclosing3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public static class SubF {\n");
-		buf.append("        public SubF(int i) {\n");
-		buf.append("        }\n");
-		buf.append("        public class SubF2 extends SubF {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public static class SubF {\n");
-		buf.append("        public SubF(int i) {\n");
-		buf.append("        }\n");
-		buf.append("        public class SubF2 extends SubF {\n");
-		buf.append("\n");
-		buf.append("            public SubF2(int i) {\n");
-		buf.append("                super(i);\n");		
-		buf.append("            }\n");	
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testNotVisibleConstructorInDefaultConstructor() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    private F() {\n");
-		buf.append("    }\n");
-		buf.append("    public F(Runnable runnable) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("\n");
-		buf.append("    public E(Runnable runnable) {\n");
-		buf.append("        super(runnable);\n");		
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnhandledExceptionInDefaultConstructor() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class F {\n");
-		buf.append("    public F() throws IOException{\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("\n");
-		buf.append("public class E extends F {\n");
-		buf.append("\n");
-		buf.append("    public E() throws IOException {\n");
-		buf.append("        super();\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedPrivateField() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PRIVATE_MEMBER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fCount;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}	
-
-	public void testUnusedPrivateField1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PRIVATE_MEMBER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fCount, fColor= fCount;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fCount;\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedPrivateField2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PRIVATE_MEMBER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fCount= 0;\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        fCount= 1 + 2;\n");		
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedPrivateField3() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PRIVATE_MEMBER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private E e= new E();\n");
-		buf.append("    private int value;\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        value= 0;\n");
-		buf.append("        this.value= 0;\n");
-		buf.append("        e.value= 0;\n");
-		buf.append("        this.e.value= 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private E e= new E();\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	
-	public void testUnusedVariable() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PARAMETER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        boolean res= process();\n");
-		buf.append("        res= (super.hashCode() == 1);\n");
-		buf.append("    }\n");
-		buf.append("    public boolean process() {\n");
-		buf.append("        return true;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        res= (super.hashCode() == 1);\n");
-		buf.append("    }\n");
-		buf.append("    public boolean process() {\n");
-		buf.append("        return true;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedVariable1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PARAMETER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private Object[] foo() {\n");
-		buf.append("        Object[] i, j= new Object[0];\n");
-		buf.append("        i= j = null;\n");
-		buf.append("        i= (new Object[] { null, null });\n");
-		buf.append("        return j;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private Object[] foo() {\n");
-		buf.append("        Object[] j= new Object[0];\n");
-		buf.append("        j = null;\n");
-		buf.append("        return j;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}	
-
-	public void testUnusedVariable2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PARAMETER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private void foo() {\n");
-		buf.append("        for (int j= 0, i= 0; i < 3; i++) {\n");
-		buf.append("             j= i;\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private void foo() {\n");
-		buf.append("        for (int i= 0; i < 3; i++) {\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedVariable4() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PARAMETER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i\n");
-		buf.append("     */\n");
-		buf.append("    private void foo(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     */\n");
-		buf.append("    private void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedParam() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PARAMETER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private void foo(Object str) {\n");
-		buf.append("        {\n");
-		buf.append("            str= toString();\n");
-		buf.append("            str= new String[] { toString(), toString() };\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private void foo() {\n");
-		buf.append("        {\n");
-		buf.append("            str= toString();\n");
-		buf.append("            str= new String[] { toString(), toString() };\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	public void testUnusedPrivateMethod() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PRIVATE_MEMBER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int fCount;\n");
-		buf.append(" \n");
-		buf.append("    private void foo() {\n");
-		buf.append("        fCount= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int fCount;\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedPrivateConstructor() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PRIVATE_MEMBER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append(" \n");
-		buf.append("    private E(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedPrivateType() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_PRIVATE_MEMBER, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private class F {\n");
-		buf.append("    }\n");
-		buf.append(" \n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}		
-	
-	public void testUnnecessaryCast1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_TYPE_CHECK, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        int s = (int) i;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        int s = i;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnnecessaryCast2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_TYPE_CHECK, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s) {\n");
-		buf.append("        String r = ((String) s);\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s) {\n");
-		buf.append("        String r = s;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnnecessaryCast3() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_TYPE_CHECK, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        int s = ((int) 1 + 2) * 3;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        int s = (1 + 2) * 3;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testSuperfluousSemicolon() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_EMPTY_STATEMENT, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        int s= 1;;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        int s= 1;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testIndirectStaticAccess1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_INDIRECT_STATIC_ACCESS, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment other= fSourceFolder.createPackageFragment("other", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package other;\n");
-		buf.append("public class A {\n");
-		buf.append("    public static final int CONST=1;\n");
-		buf.append("}\n");
-		other.createCompilationUnit("A.java", buf.toString(), false, null);		
-
-		IPackageFragment pack0= fSourceFolder.createPackageFragment("pack", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class B extends other.A {\n");
-		buf.append("}\n");
-		pack0.createCompilationUnit("B.java", buf.toString(), false, null);		
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import pack.B;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo(B b) {\n");
-		buf.append("        return B.CONST;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import other.A;\n");
-		buf.append("import pack.B;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo(B b) {\n");
-		buf.append("        return A.CONST;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testIndirectStaticAccess2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_INDIRECT_STATIC_ACCESS, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment other= fSourceFolder.createPackageFragment("other", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package other;\n");
-		buf.append("public class A {\n");
-		buf.append("    public static int foo() {\n");
-		buf.append("        return 1;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		other.createCompilationUnit("A.java", buf.toString(), false, null);		
-
-		IPackageFragment pack0= fSourceFolder.createPackageFragment("pack", false, null);
-		buf= new StringBuffer();
-		buf.append("package pack;\n");
-		buf.append("public class B extends other.A {\n");
-		buf.append("}\n");
-		pack0.createCompilationUnit("B.java", buf.toString(), false, null);		
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return pack.B.foo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import other.A;\n");
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return A.foo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testIndirectStaticAccess_bug40880() throws Exception {
-		
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_INDIRECT_STATIC_ACCESS, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("class FileType {\n");
-		buf.append("    public String extension;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("FileType.java", buf.toString(), false, null);		
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("interface ToolConfigurationSettingsConstants {\n");
-		buf.append("     FileType FILE_TYPE = null;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("ToolConfigurationSettingsConstants.java", buf.toString(), false, null);		
-
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("interface ToolUserSettingsConstants extends ToolConfigurationSettingsConstants {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("ToolUserSettingsConstants.java", buf.toString(), false, null);		
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        ToolUserSettingsConstants.FILE_TYPE.extension.toLowerCase();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-			
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        ToolConfigurationSettingsConstants.FILE_TYPE.extension.toLowerCase();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testIndirectStaticAccess_bug32022() throws Exception {
-		
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_INDIRECT_STATIC_ACCESS, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class StaticField {\n");
-		buf.append("    public boolean flag;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("StaticField.java", buf.toString(), false, null);		
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class ConstClass {\n");
-		buf.append("     public static StaticField staticField = new StaticField();\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("ConstClass.java", buf.toString(), false, null);		
-
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(ConstClass constclass) {\n");
-		buf.append("        constclass.staticField.flag= true;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(ConstClass constclass) {\n");
-		buf.append("        ConstClass.staticField.flag= true;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class ConstClass {\n");
-		buf.append("     public StaticField staticField = new StaticField();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	
-	public void testUnnecessaryInstanceof1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_TYPE_CHECK, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(String b) {\n");
-		buf.append("        return (b instanceof String);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(String b) {\n");
-		buf.append("        return (b != null);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnnecessaryInstanceof2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_TYPE_CHECK, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String b) {\n");
-		buf.append("        if  (b instanceof String && b.getClass() != null) {\n");
-		buf.append("            System.out.println();\n");		
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String b) {\n");
-		buf.append("        if  (b != null && b.getClass() != null) {\n");
-		buf.append("            System.out.println();\n");		
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testUnnecessaryThrownException1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_DECLARED_THROWN_EXCEPTION, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String b) throws IOException {\n");
-		buf.append("        if  (b != null) {\n");
-		buf.append("            System.out.println();\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String b) {\n");
-		buf.append("        if  (b != null) {\n");
-		buf.append("            System.out.println();\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnnecessaryThrownException2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_DECLARED_THROWN_EXCEPTION, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(int i) throws IOException, ParseException {\n");
-		buf.append("        if  (i == 0) {\n");
-		buf.append("            throw new IOException();\n");	
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(int i) throws IOException {\n");
-		buf.append("        if  (i == 0) {\n");
-		buf.append("            throw new IOException();\n");	
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnnecessaryThrownException3() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNUSED_DECLARED_THROWN_EXCEPTION, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i\n");
-		buf.append("     * @throws IOException\n");
-		buf.append("     * @throws ParseException\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int i) throws IOException, ParseException {\n");
-		buf.append("        if  (i == 0) {\n");
-		buf.append("            throw new IOException();\n");	
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i\n");
-		buf.append("     * @throws IOException\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int i) throws IOException {\n");
-		buf.append("        if  (i == 0) {\n");
-		buf.append("            throw new IOException();\n");	
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	
-	public void testUnqualifiedFieldAccess1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNQUALIFIED_FIELD_ACCESS, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        count= i;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        this.count= i;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnqualifiedFieldAccess2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNQUALIFIED_FIELD_ACCESS, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public int count;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private F f= new F();\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        f.count= i;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private F f= new F();\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        this.f.count= i;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnqualifiedFieldAccess3() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNQUALIFIED_FIELD_ACCESS, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public void setCount(int i) {}\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private F f= new F();\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        f.setCount(i);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private F f= new F();\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        this.f.setCount(i);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnqualifiedFieldAccess4() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNQUALIFIED_FIELD_ACCESS, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        class Inner {\n");
-		buf.append("            public void foo() {\n");
-		buf.append("               count= 1;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        class Inner {\n");
-		buf.append("            public void foo() {\n");
-		buf.append("               E.this.count= 1;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnqualifiedFieldAccess_bug50960() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNQUALIFIED_FIELD_ACCESS, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    private int count;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        count= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends F {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        this.count= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	
-	public void testHidingVariable1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public void foo() {\n");
-		buf.append("       int count= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		assertTrue(proposals.get(0) instanceof LinkedNamesAssistProposal);
-	}
-	
-	public void testHidingVariable2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public void foo(int count) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		assertTrue(proposals.get(0) instanceof LinkedNamesAssistProposal);
-	}	
-	
-	public void testHidingVariable3() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int count) {\n");
-		buf.append("        class Inner {\n");
-		buf.append("            private int count;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		assertTrue(proposals.get(0) instanceof LinkedNamesAssistProposal);
-	}
-	
-	public void testHidingVariable4() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int count;\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        class Inner {\n");
-		buf.append("            private int count;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		assertTrue(proposals.get(0) instanceof LinkedNamesAssistProposal);
-	}
-	
-	public void testHidingVariable5() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int count) {\n");
-		buf.append("        class Inner {\n");
-		buf.append("            public void foo() {\n");
-		buf.append("                 int count;\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		assertTrue(proposals.get(0) instanceof LinkedNamesAssistProposal);
-	}
-	
-	public void testHidingVariable6() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int count) {\n");
-		buf.append("        class Inner {\n");
-		buf.append("            public void foo(int count) {\n");
-		buf.append("            }\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		assertTrue(proposals.get(0) instanceof LinkedNamesAssistProposal);
-	}
-	
-	public void testSetParenteses1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object x) {\n");
-		buf.append("        if (!x instanceof Runnable) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object x) {\n");
-		buf.append("        if (!(x instanceof Runnable)) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-	}
-	
-	public void testSetParenteses2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_LOCAL_VARIABLE_HIDING, JavaCore.ERROR);
-		hashtable.put(JavaCore.COMPILER_PB_FIELD_HIDING, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(int x) {\n");
-		buf.append("        return !x instanceof Runnable || true;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(int x) {\n");
-		buf.append("        return !(x instanceof Runnable) || true;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-	}
-
-	public void testUnnecessaryElse1() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_ELSE, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(int x) {\n");
-		buf.append("        if (x == 9) {\n");
-		buf.append("            return true;\n");
-		buf.append("        } else {\n");
-		buf.append("            return false;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(int x) {\n");
-		buf.append("        if (x == 9) {\n");
-		buf.append("            return true;\n");
-		buf.append("        }\n");
-		buf.append("        return false;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-	}
-	public void testUnnecessaryElse2() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_ELSE, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(int x) {\n");
-		buf.append("        if (x == 9) {\n");
-		buf.append("            return true;\n");
-		buf.append("        } else {\n");
-		buf.append("            x= 9;\n");	
-		buf.append("            return false;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(int x) {\n");
-		buf.append("        if (x == 9) {\n");
-		buf.append("            return true;\n");
-		buf.append("        }\n");
-		buf.append("        x= 9;\n");	
-		buf.append("        return false;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-	}
-	
-	public void testUnnecessaryElse3() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_ELSE, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(int x) {\n");
-		buf.append("        if (x == 9) {\n");
-		buf.append("            return true;\n");
-		buf.append("        } else\n");
-		buf.append("            return false;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean foo(int x) {\n");
-		buf.append("        if (x == 9) {\n");
-		buf.append("            return true;\n");
-		buf.append("        }\n");
-		buf.append("        return false;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-	}
-	
-	
-	public void testInterfaceExtendsClass() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_UNNECESSARY_ELSE, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E extends List {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E implements List {\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public interface E extends List {\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-
-		
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/MarkerResolutionGenerator.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/MarkerResolutionGenerator.java
deleted file mode 100644
index a71320a..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/MarkerResolutionGenerator.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.IAnnotationModel;
-
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
-
-import org.eclipse.jdt.ui.JavaUI;
-
-public class MarkerResolutionGenerator implements IMarkerResolutionGenerator {
-
-	/**
-	 * Marker resolution that replaces the covered range with the uppercased content.
-	 */
-	public static class TestCorrectionMarkerResolution implements IMarkerResolution {
-
-		public TestCorrectionMarkerResolution() {
-		}
-	
-		/* (non-Javadoc)
-		 * @see IMarkerResolution#getLabel()
-		 */
-		public String getLabel() {
-			return "Change to Uppercase";
-		}
-	
-		/* (non-Javadoc)
-		 * @see IMarkerResolution#run(IMarker)
-		 */
-		public void run(IMarker marker) {
-			FileEditorInput input= new FileEditorInput((IFile) marker.getResource());
-			IAnnotationModel model= JavaUI.getDocumentProvider().getAnnotationModel(input);
-			if (model != null) {
-				// resource is open in editor
-				
-				Position pos= findProblemPosition(model, marker);
-				if (pos != null) {
-					IDocument doc= JavaUI.getDocumentProvider().getDocument(input);
-					try {
-						String str= doc.get(pos.getOffset(), pos.getLength());
-						doc.replace(pos.getOffset(), pos.getLength(), str.toUpperCase());
-					} catch (BadLocationException e) {
-						e.printStackTrace();
-					}
-				}
-			} else {
-				// resource is not open in editor
-				// to do: work on the resource
-			}
-			try {
-				marker.delete();
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		
-		private Position findProblemPosition(IAnnotationModel model, IMarker marker) {
-			Iterator iter= model.getAnnotationIterator();
-			while (iter.hasNext()) {
-				Object curr= iter.next();
-				if (curr instanceof SimpleMarkerAnnotation) {
-					SimpleMarkerAnnotation annot= (SimpleMarkerAnnotation) curr;
-					if (marker.equals(annot.getMarker())) {
-						return model.getPosition(annot);
-					}
-				}
-			}
-			return null;
-		}
-	}
-
-
-	public MarkerResolutionGenerator() {
-	}
-
-	/* (non-Javadoc)
-	 * @see IMarkerResolutionGenerator#getResolutions(IMarker)
-	 */
-	public IMarkerResolution[] getResolutions(IMarker marker) {
-		return new IMarkerResolution[] { new TestCorrectionMarkerResolution() };
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/MarkerResolutionTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/MarkerResolutionTest.java
deleted file mode 100644
index ec607ba..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/MarkerResolutionTest.java
+++ /dev/null

@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.Arrays;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.examples.AddTestMarkersAction;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionAssistant;
-import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionProcessor;
-
-public class MarkerResolutionTest extends QuickFixTest {
-	
-	private static final Class THIS= MarkerResolutionTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	private boolean BUG_46227= true;
-
-	public MarkerResolutionTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new MarkerResolutionTest("testQuickFixAfterModification"));
-			return suite;
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-		
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-
-	private IMarker createMarker(ICompilationUnit cu, int line, int offset, int len) throws CoreException {
-		IFile file= (IFile) cu.getResource();
-		IMarker marker= file.createMarker(AddTestMarkersAction.MARKER_TYPE);
-		marker.setAttribute(IMarker.LOCATION, cu.getElementName());
-		marker.setAttribute(IMarker.MESSAGE, "Test marker");
-		marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-		marker.setAttribute(IMarker.LINE_NUMBER, line);
-		marker.setAttribute(IMarker.CHAR_START, offset);
-		marker.setAttribute(IMarker.CHAR_END, offset + len);
-		return marker;
-	}
-
-	
-	public void testQuickFix() throws Exception {
-		if (BUG_46227)
-			return;
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        goo(true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		createMarker(cu, 0, 0, 7);
-		
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		
-		JavaEditor javaEditor= (JavaEditor) part;
-		ITextViewer viewer= javaEditor.getViewer();
-		
-		try {
-			JavaCorrectionAssistant assistant= new JavaCorrectionAssistant(javaEditor);
-			JavaCorrectionProcessor processor= new JavaCorrectionProcessor(assistant);
-			ICompletionProposal[] proposals= processor.computeCompletionProposals(viewer, 0);
-			
-			assertNumberOf("proposals", proposals.length, 1);
-			assertCorrectLabels(Arrays.asList(proposals));
-			
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			
-			proposals[0].apply(doc);
-			
-			buf= new StringBuffer();
-			buf.append("PACKAGE test1;\n");
-			buf.append("import java.util.Vector;\n");
-			buf.append("public class E {\n");
-			buf.append("    void foo(Vector vec) {\n");
-			buf.append("        goo(true);\n");
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString());
-		} finally {
-			JavaPlugin.getActivePage().closeAllEditors(false);
-		}
-	}
-	
-	public void testQuickFixAfterModification() throws Exception {
-		if (BUG_46227)
-			return;
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        goo(true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		int markerPos= 8;
-		createMarker(cu, 0, markerPos, 5);
-		
-		IEditorPart part= EditorUtility.openInEditor(cu);
-		try {
-			IDocument doc= JavaUI.getDocumentProvider().getDocument(part.getEditorInput());
-			doc.replace(0, 0, "\n"); // insert new line
-			
-			JavaCorrectionAssistant assistant= new JavaCorrectionAssistant((ITextEditor) part);
-			JavaCorrectionProcessor processor= new JavaCorrectionProcessor(assistant);
-			ICompletionProposal[] proposals= processor.computeCompletionProposals(null, markerPos + 1);
-			
-			assertNumberOf("proposals", proposals.length, 1);
-			assertCorrectLabels(Arrays.asList(proposals));	
-			
-			proposals[0].apply(doc);
-			
-			buf= new StringBuffer();
-			buf.append("\n");		
-			buf.append("package TEST1;\n");
-			buf.append("import java.util.Vector;\n");
-			buf.append("public class E {\n");
-			buf.append("    void foo(Vector vec) {\n");
-			buf.append("        goo(true);\n");
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(doc.get(), buf.toString());
-		} finally {
-			JavaPlugin.getActivePage().closeAllEditors(false);
-		}
-	}	
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ModifierCorrectionsQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ModifierCorrectionsQuickFixTest.java
deleted file mode 100644
index 493d877..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ModifierCorrectionsQuickFixTest.java
+++ /dev/null

@@ -1,1851 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-
-public class ModifierCorrectionsQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= ModifierCorrectionsQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public ModifierCorrectionsQuickFixTest(String name) {
-		super(name);
-	}
-
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ModifierCorrectionsQuickFixTest("testStaticOverridesMethod"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(JavaCore.COMPILER_PB_STATIC_ACCESS_RECEIVER, JavaCore.ERROR);
-		
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	public void testStaticMethodRequestedInSameType1() throws Exception {
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void xoo() {\n");
-		buf.append("    }\n");		
-		buf.append("    public static void foo() {\n");
-		buf.append("        xoo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void xoo() {\n");
-		buf.append("    }\n");		
-		buf.append("    public static void foo() {\n");
-		buf.append("        xoo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}	
-
-	public void testStaticMethodRequestedInSameType2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void xoo() {\n");
-		buf.append("    }\n");		
-		buf.append("    public static void foo() {\n");
-		buf.append("        E.xoo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void xoo() {\n");
-		buf.append("    }\n");		
-		buf.append("    public static void foo() {\n");
-		buf.append("        E.xoo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testStaticMethodRequestedInOtherType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public void xoo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         X.xoo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public static void xoo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvisibleMethodRequestedInSuperType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class C {\n");
-		buf.append("    private void xoo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         xoo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    protected void xoo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvisibleSuperMethodRequestedInSuperType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    private void xoo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         super.xoo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    protected void xoo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-		
-	public void testInvisibleMethodRequestedInOtherPackage() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("import java.util.List;\n");		
-		buf.append("public class C {\n");
-		buf.append("    private void xoo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.C;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo(C c) {\n");
-		buf.append("         c.xoo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("import java.util.List;\n");		
-		buf.append("public class C {\n");
-		buf.append("    public void xoo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvisibleConstructorRequestedInOtherType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class C {\n");
-		buf.append("    private C() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         C c= new C();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class C {\n");
-		buf.append("    C() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvisibleConstructorRequestedInSuperType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class C {\n");
-		buf.append("    private C() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public E() {\n");
-		buf.append("         super();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class C {\n");
-		buf.append("    protected C() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}	
-	
-	public void testInvisibleFieldRequestedInSamePackage1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    private int fXoo;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class E {\n");
-		buf.append("    public void foo(C c) {\n");
-		buf.append("         c.fXoo= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    int fXoo;\n");
-		buf.append("}\n");
-		
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	public void testInvisibleFieldRequestedInSamePackage2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    private int fXoo;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         fXoo= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 5);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    protected int fXoo;\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class E extends C {\n");
-		buf.append("    private int fXoo;\n");
-		buf.append("\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         fXoo= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo(int fXoo) {\n");
-		buf.append("         fXoo= 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(3);
-		String preview4= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         int fXoo = 1;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected4= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(4);
-		String preview5= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");	
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected5= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3, preview4, preview5 }, new String[] { expected1, expected2, expected3, expected4, expected5 });		
-
-	}	
-	
-	
-	public void testNonStaticMethodRequestedInConstructor() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int xoo() { return 1; };\n");
-		buf.append("    public E(int val) {\n");		
-		buf.append("    }\n");			
-		buf.append("    public E() {\n");
-		buf.append("         this(xoo());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static int xoo() { return 1; };\n");
-		buf.append("    public E(int val) {\n");		
-		buf.append("    }\n");			
-		buf.append("    public E() {\n");
-		buf.append("         this(xoo());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}		
-	
-	public void testNonStaticFieldRequestedInConstructor() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int fXoo= 1;\n");
-		buf.append("    public E(int val) {\n");		
-		buf.append("    }\n");			
-		buf.append("    public E() {\n");
-		buf.append("         this(fXoo);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static int fXoo= 1;\n");
-		buf.append("    public E(int val) {\n");		
-		buf.append("    }\n");			
-		buf.append("    public E() {\n");
-		buf.append("         this(fXoo);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvisibleTypeRequestedInDifferentPackage() throws Exception {
-		if (false) {
-			System.out.println("testInvisibleTypeRequestedInDifferentPackage: Waiting for release fo bug fix 24406");	
-			return;
-		}
-		
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("class C {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("C.java", buf.toString(), false, null);
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         test2.C c= null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvisibleTypeRequestedFromSuperClass() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    private class CInner {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-	
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         CInner c= null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    class CInner {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	public void testInvisibleImport() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("class C {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("C.java", buf.toString(), false, null);
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         test2.C c= null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testAbstractMethodWithBody() throws Exception {	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public abstract class E {\n");
-		buf.append("    public abstract void foo() {\n");
-		buf.append("    }\n");				
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public abstract class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");				
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public abstract class E {\n");
-		buf.append("    public abstract void foo();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testAbstractMethodInNonAbstractClass() throws Exception {	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public abstract int foo();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 0;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");		
-		buf.append("public abstract class E {\n");
-		buf.append("    public abstract int foo();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testNativeMethodWithBody() throws Exception {	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public native void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");		
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public native void foo();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testOuterLocalMustBeFinal() throws Exception {
-	
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        int i= 9;\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                int x= i;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        final int i= 9;\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                int x= i;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testOuterParameterMustBeFinal() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                int x= i;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(final int i) {\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                int x= i;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testOuterForParamMustBeFinal() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        for (int i= 1; true;) {\n");		
-		buf.append("            Runnable run= new Runnable() {\n");
-		buf.append("                public void run() {\n");
-		buf.append("                    int x= i;\n");
-		buf.append("                }\n");
-		buf.append("            };\n");			
-		buf.append("        }\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        for (final int i= 1; true;) {\n");		
-		buf.append("            Runnable run= new Runnable() {\n");
-		buf.append("                public void run() {\n");
-		buf.append("                    int x= i;\n");
-		buf.append("                }\n");
-		buf.append("            };\n");			
-		buf.append("        }\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testMethodRequiresBody() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public abstract void foo();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testMethodRequiresBody2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public abstract int foo();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}	
-	
-	public void testNeedToEmulateMethodAccess() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_SYNTHETIC_ACCESS_EMULATION, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void x() {\n");
-		buf.append("        Runnable r= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                foo();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("    private void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void x() {\n");
-		buf.append("        Runnable r= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                foo();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("    void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testNeedToEmulateConstructorAccess() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_SYNTHETIC_ACCESS_EMULATION, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void x() {\n");
-		buf.append("        Runnable r= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("               E e= new E();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("    private E() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void x() {\n");
-		buf.append("        Runnable r= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("               E e= new E();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("    E() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}		
-	
-	public void testNeedToEmulateFieldRead() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_SYNTHETIC_ACCESS_EMULATION, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void x() {\n");
-		buf.append("        Runnable r= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("               int x= fCount;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("    private int fCount; {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void x() {\n");
-		buf.append("        Runnable r= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("               int x= fCount;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("    int fCount; {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testNeedToEmulateFieldWrite() throws Exception {
-		Hashtable hashtable= JavaCore.getOptions();
-		hashtable.put(JavaCore.COMPILER_PB_SYNTHETIC_ACCESS_EMULATION, JavaCore.ERROR);
-		JavaCore.setOptions(hashtable);
-				
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void x() {\n");
-		buf.append("        Runnable r= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("               fCount= 2;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("    private int fCount; {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void x() {\n");
-		buf.append("        Runnable r= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("               fCount= 2;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("    int fCount; {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}		
-
-	public void testSetFinalVariable1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private final int x= 9;\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        x= 8;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int x= 9;\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        x= 8;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testSetFinalVariable2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private final int x;\n");
-		buf.append("    public E() {\n");
-		buf.append("        x= 8;\n");
-		buf.append("        x= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int x;\n");
-		buf.append("    public E() {\n");
-		buf.append("        x= 8;\n");
-		buf.append("        x= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testSetFinalVariable3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("        final int x= 8;\n");
-		buf.append("        x= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("        int x= 8;\n");
-		buf.append("        x= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testOverrideFinalMethod() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    protected final void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	public void testOverridesNonVisibleMethod() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("    void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack2.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.C;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testOverridesStaticMethod() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("    public static void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack2.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.C;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testStaticOverridesMethod() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack2.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.C;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public static void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.C;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testOverridesMoreVisibleMethod() throws Exception {
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack2.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.C;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.C;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testInvalidInterfaceModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public static interface E  {\n");
-		buf.append("    public void foo();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    public void foo();\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidMemberInterfaceModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    private interface Inner {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    interface Inner {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidInterfaceFieldModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    public native int i;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    public int i;\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidInterfaceMethodModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    private strictfp void foo();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    void foo();\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidClassModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public volatile class E  {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	public void testInvalidMemberClassModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    private class Inner {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E  {\n");
-		buf.append("    class Inner {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidLocalClassModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    private void foo() {\n");
-		buf.append("        static class Local {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    private void foo() {\n");
-		buf.append("        class Local {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidClassFieldModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    strictfp public native int i;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    public int i;\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidClassMethodModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public abstract class E  {\n");
-		buf.append("    volatile abstract void foo();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public abstract class E  {\n");
-		buf.append("    abstract void foo();\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidParamModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    private void foo(private int x) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    private void foo(int x) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testInvalidVariableModifiers() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    private void foo() {\n");
-		buf.append("        native int x;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E  {\n");
-		buf.append("    private void foo() {\n");
-		buf.append("        int x;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testExtendsFinalClass() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public final class C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testExtendsFinalClass2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public final class C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack1.createCompilationUnit("C.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("        C c= new C() { };\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class C {\n");
-		buf.append("    protected void foo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
deleted file mode 100644
index 8c83837..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
+++ /dev/null

@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.StringAsserts;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IProblemRequestor;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.WorkingCopyOwner;
-import org.eclipse.jdt.core.compiler.IProblem;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionProcessor;
-import org.eclipse.jdt.internal.ui.text.correction.LinkedNamesAssistProposal;
-import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
-
-/**
-  */
-public class QuickFixTest extends TestCase {
-
-	public static Test suite() {
-		TestSuite suite= new TestSuite();
-		suite.addTest(SerialVersionQuickFixTest.allTests());
-		suite.addTest(UnresolvedTypesQuickFixTest.allTests());
-		suite.addTest(UnresolvedVariablesQuickFixTest.allTests());
-		suite.addTest(UnresolvedMethodsQuickFixTest.allTests());
-		suite.addTest(ReturnTypeQuickFixTest.allTests());
-		suite.addTest(LocalCorrectionsQuickFixTest.allTests());
-		suite.addTest(TypeMismatchQuickFixTests.allTests());
-		suite.addTest(ReorgQuickFixTest.allTests());
-		suite.addTest(ModifierCorrectionsQuickFixTest.allTests());
-		suite.addTest(AssistQuickFixTest.allTests());
-		suite.addTest(MarkerResolutionTest.allTests());
-		suite.addTest(JavadocQuickFixTest.allTests());
-		suite.addTest(ConvertForLoopQuickFixTest.allTests());
-		suite.addTest(AdvancedQuickAssistTest.allTests());
-		return new ProjectTestSetup(suite);
-	}
-
-	
-	public QuickFixTest(String name) {
-		super(name);
-	}
-	
-	public static void assertCorrectLabels(List proposals) {
-		for (int i= 0; i < proposals.size(); i++) {
-			ICompletionProposal proposal= (ICompletionProposal) proposals.get(i);
-			String name= proposal.getDisplayString();
-			if (name == null || name.length() == 0 || name.charAt(0) == '!' || name.indexOf("{0}") != -1 || name.indexOf("{1}") != -1) {
-				assertTrue("wrong proposal label: " + name, false);
-			}
-			if (proposal.getImage() == null) {
-				assertTrue("wrong proposal image", false);
-			}			
-		}
-	}
-	
-	public static void assertCorrectContext(IInvocationContext context, ProblemLocation problem) {
-		if (problem.getProblemId() != 0) {
-			if (!JavaCorrectionProcessor.hasCorrections(context.getCompilationUnit(), problem.getProblemId())) {
-				assertTrue("Problem type not marked with light bulb: " + problem, false);
-			}
-		}
-	}	
-	
-	
-	public static void assertNumberOf(String name, int nProblems, int nProblemsExpected) {
-		assertTrue("Wrong number of " + name + ", is: " + nProblems + ", expected: " + nProblemsExpected, nProblems == nProblemsExpected);
-	}
-	
-	
-	public static void assertEqualString(String actual, String expected) {	
-		StringAsserts.assertEqualString(actual, expected);
-	}
-	
-	public static void assertEqualStringIgnoreDelim(String actual, String expected) throws IOException {
-		StringAsserts.assertEqualStringIgnoreDelim(actual, expected);
-	}	
-	
-	public static void assertEqualStringsIgnoreOrder(String[] actuals, String[] expecteds) {
-		StringAsserts.assertEqualStringsIgnoreOrder(actuals, expecteds);			
-	}
-	
-	public static void assertExpectedExistInProposals(List actualProposals, String[] expecteds) throws CoreException {
-		String[] actuals= new String[actualProposals.size()];
-		for (int i= 0; i < actualProposals.size(); i++) {
-			actuals[i]= getPreviewContent((CUCorrectionProposal) actualProposals.get(i));
-		}
-		StringAsserts.assertExpectedExistInProposals(actuals, expecteds);
-	}
-	
-	public static TypeDeclaration findTypeDeclaration(CompilationUnit astRoot, String simpleTypeName) {
-		List types= astRoot.types();
-		for (int i= 0; i < types.size(); i++) {
-			TypeDeclaration elem= (TypeDeclaration) types.get(i);
-			if (simpleTypeName.equals(elem.getName().getIdentifier())) {
-				return elem;
-			}
-		}
-		return null;
-	}
-	
-	public static MethodDeclaration findMethodDeclaration(TypeDeclaration typeDecl, String methodName) {
-		MethodDeclaration[] methods= typeDecl.getMethods();
-		for (int i= 0; i < methods.length; i++) {
-			if (methodName.equals(methods[i].getName().getIdentifier())) {
-				return methods[i];
-			}
-		}
-		return null;
-	}
-	
-	public static VariableDeclarationFragment findFieldDeclaration(TypeDeclaration typeDecl, String fieldName) {
-		FieldDeclaration[] fields= typeDecl.getFields();
-		for (int i= 0; i < fields.length; i++) {
-			List list= fields[i].fragments();
-			for (int k= 0; k < list.size(); k++) {
-				VariableDeclarationFragment fragment= (VariableDeclarationFragment) list.get(k);
-				if (fieldName.equals(fragment.getName().getIdentifier())) {
-					return fragment;
-				}				
-			}
-		}
-		return null;
-	}	
-		
-	public static AssistContext getCorrectionContext(ICompilationUnit cu, int offset, int length) {
-		AssistContext context= new AssistContext(cu, offset, length);
-		return context;
-	}
-
-
-	protected static final ArrayList collectCorrections(ICompilationUnit cu, CompilationUnit astRoot) {
-		return collectCorrections(cu, astRoot, 1);
-	}
-
-
-	protected static final ArrayList collectCorrections(ICompilationUnit cu, CompilationUnit astRoot, int nProblems) {
-		IProblem[] problems= astRoot.getProblems();
-		if (problems.length != nProblems) {
-			StringBuffer buf= new StringBuffer("Wrong number of problems, is: ");
-			buf.append(problems.length).append(", expected: ").append(nProblems).append('\n');
-			for (int i= 0; i < problems.length; i++) {
-				buf.append(problems[i]);
-				buf.append('[').append(problems[i].getSourceStart()).append(" ,").append(problems[i].getSourceEnd()).append(']');
-				buf.append('\n');
-			}
-			assertTrue(buf.toString(), false);
-
-		}
-		return collectCorrections(cu, problems[0]);
-	}
-	
-	protected static final ArrayList collectCorrections2(ICompilationUnit cu, int nProblems) throws JavaModelException {
-		
-		final ArrayList problemsList= new ArrayList();
-		IProblemRequestor requestor= new IProblemRequestor() {
-			public void acceptProblem(IProblem problem) {
-				problemsList.add(problem);
-			}
-			public void beginReporting() {
-				problemsList.clear();
-			}
-			public void endReporting() {}
-			public boolean isActive() {	return true;}
-		};
-		
-		ICompilationUnit wc= cu.getWorkingCopy(new WorkingCopyOwner() {}, requestor, null);
-		try {
-			wc.reconcile(ICompilationUnit.NO_AST, true, wc.getOwner(), null);
-		} finally {
-			wc.discardWorkingCopy();
-		}
-		
-		IProblem[] problems= (IProblem[]) problemsList.toArray(new IProblem[problemsList.size()]);
-		if (problems.length != nProblems) {
-			StringBuffer buf= new StringBuffer("Wrong number of problems, is: ");
-			buf.append(problems.length).append(", expected: ").append(nProblems).append('\n');
-			for (int i= 0; i < problems.length; i++) {
-				buf.append(problems[i]);
-				buf.append('[').append(problems[i].getSourceStart()).append(" ,").append(problems[i].getSourceEnd()).append(']');
-				buf.append('\n');
-			}
-			assertTrue(buf.toString(), false);
-
-		}
-		return collectCorrections(cu, problems[0]);
-	}
-		
-	protected static final ArrayList collectCorrections(ICompilationUnit cu, IProblem curr) {
-			
-		int offset= curr.getSourceStart();
-		int length= curr.getSourceEnd() + 1 - offset;
-		
-		ProblemLocation problem= new ProblemLocation(offset, length, curr.getID(), curr.getArguments(), true);
-		AssistContext context= new AssistContext(cu, offset, length);
-		ArrayList proposals= new ArrayList();
-		
-		JavaCorrectionProcessor.collectCorrections(context,  new ProblemLocation[] { problem }, proposals);
-		if (!proposals.isEmpty()) {
-			assertCorrectContext(context, problem);
-		}
-		
-		return proposals;
-	}
-
-
-	protected static final ArrayList collectAssists(IInvocationContext context, Class[] filteredTypes) {
-		ArrayList proposals= new ArrayList();
-		JavaCorrectionProcessor.collectAssists(context, null, proposals);
-		
-		if (!proposals.isEmpty()) {
-			assertTrue("should be marked as 'has assist'", JavaCorrectionProcessor.hasAssists(context));
-		}
-		
-		
-		if (filteredTypes != null && filteredTypes.length > 0) {
-			for (Iterator iter= proposals.iterator(); iter.hasNext(); ) {
-				if (isFiltered(iter.next(), filteredTypes)) {
-					iter.remove();
-				}
-			}
-		}
-		return proposals;
-	}
-	
-	private static boolean isFiltered(Object curr, Class[] filteredTypes) {
-		for (int k = 0; k < filteredTypes.length; k++) {
-			if (filteredTypes[k].isInstance(curr)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	protected static final ArrayList collectAssists(IInvocationContext context, boolean includeLinkedRename) {
-		Class[] filteredTypes= includeLinkedRename ? null : new Class[] { LinkedNamesAssistProposal.class };
-		return collectAssists(context, filteredTypes);
-	}
-	
-	protected static CompilationUnit getASTRoot(ICompilationUnit cu) {
-		ASTParser parser= ASTParser.newParser(AST.JLS3);
-		parser.setSource(cu);
-		parser.setResolveBindings(true);
-		return (CompilationUnit) parser.createAST(null);
-	}
-	
-	protected static String getPreviewContent(CUCorrectionProposal proposal) throws CoreException {
-		return proposal.getPreviewContent();
-	}
-	
-	protected static void assertNumberOfProposals(List proposals, int expectedProposals) {
-		if (proposals.size() != expectedProposals) {
-			StringBuffer buf= new StringBuffer();
-			buf.append("Wrong number of proposals, is: ").append(proposals.size()). append(", expected: ").append(expectedProposals).append('\n');
-			for (int i= 0; i < proposals.size(); i++) {
-				ICompletionProposal curr= (ICompletionProposal) proposals.get(i);
-				buf.append(" - ").append(curr.getDisplayString()).append('\n');
-				if (curr instanceof CUCorrectionProposal) {
-					appendSource(((CUCorrectionProposal) curr), buf);
-				}
-			}
-			assertTrue(buf.toString(), false);
-		}
-	}
-	
-	private static void appendSource(CUCorrectionProposal proposal, StringBuffer buf) {
-		
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReorgQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReorgQuickFixTest.java
deleted file mode 100644
index f456ec5..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReorgQuickFixTest.java
+++ /dev/null

@@ -1,930 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
-
-import org.eclipse.jdt.internal.corext.refactoring.changes.AddToClasspathChange;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.ChangeCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.CorrectMainTypeNameProposal;
-import org.eclipse.jdt.internal.ui.text.correction.CorrectPackageDeclarationProposal;
-import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionProcessor;
-import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
-
-public class ReorgQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= ReorgQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public ReorgQuickFixTest(String name) {
-		super(name);
-	}
-
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ReorgQuickFixTest("testAddToClasspath2"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(JavaCore.COMPILER_PB_UNUSED_IMPORT, JavaCore.ERROR);
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	
-	public void testUnusedImports() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		Object p1= proposals.get(0);
-		if (!(p1 instanceof CUCorrectionProposal)) {
-			p1= proposals.get(1);
-		}
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) p1;
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testUnusedImportsInDefaultPackage() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		Object p1= proposals.get(0);
-		if (!(p1 instanceof CUCorrectionProposal)) {
-			p1= proposals.get(1);
-		}
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) p1;
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testUnusedImportOnDemand() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");				
-		buf.append("import java.util.Vector;\n");
-		buf.append("import java.net.*;\n");
-		buf.append("\n");				
-		buf.append("public class E {\n");
-		buf.append("    Vector v;\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		Object p1= proposals.get(0);
-		if (!(p1 instanceof CUCorrectionProposal)) {
-			p1= proposals.get(1);
-		}
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) p1;
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");				
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("    Vector v;\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testCollidingImports() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");				
-		buf.append("import java.security.Permission;\n");
-		buf.append("import java.security.acl.Permission;\n");
-		buf.append("import java.util.Vector;\n");		
-		buf.append("\n");				
-		buf.append("public class E {\n");
-		buf.append("    Permission p;\n");
-		buf.append("    Vector v;\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		Object p1= proposals.get(0);
-		if (!(p1 instanceof CUCorrectionProposal)) {
-			p1= proposals.get(1);
-		}
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) p1;
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");				
-		buf.append("import java.security.Permission;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");				
-		buf.append("public class E {\n");
-		buf.append("    Permission p;\n");
-		buf.append("    Vector v;\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testWrongPackageStatement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("\n");				
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean hasRename= true, hasMove= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
-			if (curr instanceof CorrectPackageDeclarationProposal) {
-				assertTrue("Duplicated proposal", hasRename);
-				hasRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) curr;
-				String preview= getPreviewContent(proposal);				
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("\n");				
-				buf.append("public class E {\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());			
-			} else {
-				assertTrue("Duplicated proposal", hasMove);
-				hasMove= false;				
-				curr.apply(null);
-				
-				IPackageFragment pack2= fSourceFolder.getPackageFragment("test2");
-				ICompilationUnit cu2= pack2.getCompilationUnit("E.java");
-				assertTrue("CU does not exist", cu2.exists());
-				buf= new StringBuffer();
-				buf.append("package test2;\n");
-				buf.append("\n");				
-				buf.append("public class E {\n");
-				buf.append("}\n");
-				assertEqualStringIgnoreDelim(cu2.getSource(), buf.toString());					
-			}
-		}
-	}
-	
-	public void testWrongPackageStatementFromDefault() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("\n");				
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean hasRename= true, hasMove= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
-			if (curr instanceof CorrectPackageDeclarationProposal) {
-				assertTrue("Duplicated proposal", hasRename);
-				hasRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) curr;
-				String preview= getPreviewContent(proposal);				
-				buf= new StringBuffer();
-				buf.append("\n");
-				buf.append("\n");
-				buf.append("public class E {\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());			
-			} else {
-				assertTrue("Duplicated proposal", hasMove);
-				hasMove= false;				
-				curr.apply(null);
-				
-				IPackageFragment pack2= fSourceFolder.getPackageFragment("test2");
-				ICompilationUnit cu2= pack2.getCompilationUnit("E.java");
-				assertTrue("CU does not exist", cu2.exists());
-				buf= new StringBuffer();
-				buf.append("package test2;\n");
-				buf.append("\n");				
-				buf.append("public class E {\n");
-				buf.append("}\n");
-				assertEqualStringIgnoreDelim(cu2.getSource(), buf.toString());					
-			}
-		}
-	}		
-	
-	public void testWrongDefaultPackageStatement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test2", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean hasRename= true, hasMove= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
-			if (curr instanceof CorrectPackageDeclarationProposal) {
-				assertTrue("Duplicated proposal", hasRename);
-				hasRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) curr;
-				String preview= getPreviewContent(proposal);				
-				buf= new StringBuffer();
-				buf.append("package test2;\n");
-				buf.append("\n");
-				buf.append("public class E {\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());			
-			} else {
-				assertTrue("Duplicated proposal", hasMove);
-				hasMove= false;				
-				curr.apply(null);
-				
-				IPackageFragment pack2= fSourceFolder.getPackageFragment("");
-				ICompilationUnit cu2= pack2.getCompilationUnit("E.java");
-				assertTrue("CU does not exist", cu2.exists());
-				buf= new StringBuffer();			
-				buf.append("public class E {\n");
-				buf.append("}\n");
-				assertEqualStringIgnoreDelim(cu2.getSource(), buf.toString());					
-			}
-		}
-	}
-	
-	public void testWrongPackageStatementButColliding() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("\n");		
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		buf.append("package test2;\n");
-		buf.append("\n");		
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-			
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());			
-	}
-	
-	public void testWrongTypeName() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");				
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("X.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean hasRename= true, hasMove= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			ChangeCorrectionProposal curr= (ChangeCorrectionProposal) proposals.get(i);
-			if (curr instanceof CorrectMainTypeNameProposal) {
-				assertTrue("Duplicated proposal", hasRename);
-				hasRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) curr;
-				String preview= getPreviewContent(proposal);				
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("\n");				
-				buf.append("public class X {\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());					
-			} else {						
-				assertTrue("Duplicated proposal", hasMove);
-				hasMove= false;				
-				curr.apply(null);
-				
-				ICompilationUnit cu2= pack1.getCompilationUnit("E.java");
-				assertTrue("CU does not exist", cu2.exists());
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("\n");				
-				buf.append("public class E {\n");
-				buf.append("}\n");
-				assertEqualStringIgnoreDelim(cu2.getSource(), buf.toString());
-			}
-		}
-	}
-	
-	public void testWrongTypeNameButColliding() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");		
-		buf.append("public class X {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		buf.append("package test1;\n");
-		buf.append("\n");		
-		buf.append("public class X {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		
-		String preview= getPreviewContent(proposal);				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());			
-	}
-	
-	public void testWrongTypeNameWithConstructor() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");		
-		buf.append("public class X {\n");
-		buf.append("    public X() {\n");
-		buf.append("        X other;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		buf.append("package test1;\n");
-		buf.append("\n");		
-		buf.append("public class X {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		
-		String preview= getPreviewContent(proposal);				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");		
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("        E other;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());			
-	}		
-	
-	public void testTodoTasks1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        // TODO: XXX\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "TODO: XXX";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		ProblemLocation problem= new ProblemLocation(buf.toString().indexOf(str), str.length(), IProblem.Task, new String[0], true);
-		ArrayList proposals= new ArrayList();
-		
-		JavaCorrectionProcessor.collectCorrections(context, new IProblemLocation[] { problem } , proposals);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testTodoTasks2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        // Some other text TODO: XXX\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "TODO: XXX";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		ProblemLocation problem= new ProblemLocation(buf.toString().indexOf(str), str.length(), IProblem.Task, new String[0], true);
-		ArrayList proposals= new ArrayList();
-		
-		JavaCorrectionProcessor.collectCorrections(context, new IProblemLocation[] { problem } , proposals);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        // Some other text \n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testTodoTasks3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        /* TODO: XXX */\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "TODO: XXX";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		ProblemLocation problem= new ProblemLocation(buf.toString().indexOf(str), str.length(), IProblem.Task, new String[0], true);
-		ArrayList proposals= new ArrayList();
-		
-		JavaCorrectionProcessor.collectCorrections(context, new IProblemLocation[] { problem } , proposals);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testTodoTasks4() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        /**\n");
-		buf.append("        TODO: XXX\n");
-		buf.append("        */\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "TODO: XXX";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		ProblemLocation problem= new ProblemLocation(buf.toString().indexOf(str), str.length(), IProblem.Task, new String[0], true);
-		ArrayList proposals= new ArrayList();
-		
-		JavaCorrectionProcessor.collectCorrections(context, new IProblemLocation[] { problem } , proposals);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}		
-	
-	public void testTodoTasks5() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        /**\n");
-		buf.append("        Some other text: TODO: XXX\n");
-		buf.append("        */\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "TODO: XXX";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		ProblemLocation problem= new ProblemLocation(buf.toString().indexOf(str), str.length(), IProblem.Task, new String[0], true);
-		ArrayList proposals= new ArrayList();
-		
-		JavaCorrectionProcessor.collectCorrections(context, new IProblemLocation[] { problem } , proposals);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        /**\n");
-		buf.append("        Some other text: \n");
-		buf.append("        */\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testTodoTasks6() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        ;// TODO: XXX\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "TODO: XXX";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		ProblemLocation problem= new ProblemLocation(buf.toString().indexOf(str), str.length(), IProblem.Task, new String[0], true);
-		ArrayList proposals= new ArrayList();
-		
-		JavaCorrectionProcessor.collectCorrections(context, new IProblemLocation[] { problem } , proposals);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        ;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	public void testTodoTasks7() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        /* TODO: XXX*/;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		String str= "TODO: XXX";
-		AssistContext context= getCorrectionContext(cu, buf.toString().indexOf(str), 0);
-		ProblemLocation problem= new ProblemLocation(buf.toString().indexOf(str), str.length(), IProblem.Task, new String[0], true);
-		ArrayList proposals= new ArrayList();
-		
-		JavaCorrectionProcessor.collectCorrections(context, new IProblemLocation[] { problem } , proposals);
-		
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        ;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());	
-	}
-	
-	
-	public void testAddToClasspathSourceFolder() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import mylib.Foo;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		IClasspathEntry[] prevClasspath= cu.getJavaProject().getRawClasspath();
-		
-		IJavaProject otherProject= JavaProjectHelper.createJavaProject("other", "bin");
-		try {
-			IPackageFragmentRoot otherRoot= JavaProjectHelper.addSourceContainer(otherProject, "src");
-			IPackageFragment otherPack= otherRoot.createPackageFragment("mylib", false, null);
-			buf= new StringBuffer();
-			buf.append("package mylib;\n");
-			buf.append("public class Foo {\n");
-			buf.append("}\n");
-			otherPack.createCompilationUnit("Foo.java", buf.toString(), false, null);
-			
-			CompilationUnit astRoot= getASTRoot(cu);
-			ArrayList proposals= collectCorrections(cu, astRoot);
-			assertNumberOfProposals(proposals, 3);
-			assertCorrectLabels(proposals);
-			
-			for (int i= 0; i < proposals.size(); i++) {
-				ChangeCorrectionProposal curr=  (ChangeCorrectionProposal) proposals.get(i);
-				if (curr.getChange() instanceof AddToClasspathChange) {
-					curr.apply(null);
-					
-					IClasspathEntry[] newClasspath= cu.getJavaProject().getRawClasspath();
-					assertEquals(prevClasspath.length + 1, newClasspath.length);
-					assertEquals(otherProject.getPath(), newClasspath[prevClasspath.length].getPath());
-				}
-			}
-		} finally {
-			JavaProjectHelper.delete(otherProject);
-		}
-	}
-	
-	public void testAddToClasspathIntJAR() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import mylib.Foo;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		IClasspathEntry[] prevClasspath= cu.getJavaProject().getRawClasspath();
-		
-		IJavaProject otherProject= JavaProjectHelper.createJavaProject("other", "bin");
-		try {
-			File lib= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-			assertTrue("lib does not exist",  lib != null && lib.exists());
-			IPackageFragmentRoot otherRoot= JavaProjectHelper.addLibraryWithImport(otherProject, new Path(lib.getPath()), null, null);
-			
-			CompilationUnit astRoot= getASTRoot(cu);
-			ArrayList proposals= collectCorrections(cu, astRoot);
-			assertNumberOfProposals(proposals, 3);
-			assertCorrectLabels(proposals);
-			
-			for (int i= 0; i < proposals.size(); i++) {
-				ChangeCorrectionProposal curr=  (ChangeCorrectionProposal) proposals.get(i);
-				if (curr.getChange() instanceof AddToClasspathChange) {
-					curr.apply(null);
-					IClasspathEntry[] newClasspath= cu.getJavaProject().getRawClasspath();
-					assertEquals(prevClasspath.length + 1, newClasspath.length);
-					assertEquals(otherRoot.getPath(), newClasspath[prevClasspath.length].getPath());
-				}
-			}
-		} finally {
-			JavaProjectHelper.delete(otherProject);
-		}
-	}
-	
-	public void testAddToClasspathExportedExtJAR() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import mylib.Foo;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		IJavaProject otherProject= JavaProjectHelper.createJavaProject("other", "bin");
-		try {
-			File lib= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-			IPath path= new Path(lib.getPath());
-			assertTrue("lib does not exist",  lib != null && lib.exists());
-			// exported external JAR
-			IClasspathEntry entry= JavaCore.newLibraryEntry(path, null, null, true);
-			JavaProjectHelper.addToClasspath(otherProject, entry);
-			
-			CompilationUnit astRoot= getASTRoot(cu);
-			ArrayList proposals= collectCorrections(cu, astRoot);
-			assertNumberOfProposals(proposals, 4);
-			assertCorrectLabels(proposals);
-		} finally {
-			JavaProjectHelper.delete(otherProject);
-		}
-	}
-	
-	public void testAddToClasspathContainer() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import mylib.Foo;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		IClasspathEntry[] prevClasspath= cu.getJavaProject().getRawClasspath();
-		
-		IJavaProject otherProject= JavaProjectHelper.createJavaProject("other", "bin");
-		try {
-			File lib= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.MYLIB);
-			assertTrue("lib does not exist",  lib != null && lib.exists());
-			IPath path= new Path(lib.getPath());
-			final IClasspathEntry[] entries= { JavaCore.newLibraryEntry(path, null, null) };
-			final IPath containerPath= new Path(JavaCore.USER_LIBRARY_CONTAINER_ID).append("MyUserLibrary");
-
-			
-			IClasspathContainer newContainer= new IClasspathContainer() {
-				public IClasspathEntry[] getClasspathEntries() {
-					return entries;
-				}
-
-				public String getDescription() {
-					return "MyUserLibrary";
-				}
-
-				public int getKind() {
-					return IClasspathContainer.K_APPLICATION;
-				}
-
-				public IPath getPath() {
-					return containerPath;
-				}
-			};
-			ClasspathContainerInitializer initializer= JavaCore.getClasspathContainerInitializer(JavaCore.USER_LIBRARY_CONTAINER_ID);
-			initializer.requestClasspathContainerUpdate(containerPath, otherProject, newContainer);
-			
-			IClasspathEntry entry= JavaCore.newContainerEntry(containerPath);
-			JavaProjectHelper.addToClasspath(otherProject, entry);
-			
-			CompilationUnit astRoot= getASTRoot(cu);
-			ArrayList proposals= collectCorrections(cu, astRoot);
-			assertNumberOfProposals(proposals, 3);
-			assertCorrectLabels(proposals);
-			
-			for (int i= 0; i < proposals.size(); i++) {
-				ChangeCorrectionProposal curr=  (ChangeCorrectionProposal) proposals.get(i);
-				if (curr.getChange() instanceof AddToClasspathChange) {
-					curr.apply(null);
-					IClasspathEntry[] newClasspath= cu.getJavaProject().getRawClasspath();
-					assertEquals(prevClasspath.length + 1, newClasspath.length);
-					assertEquals(containerPath, newClasspath[prevClasspath.length].getPath());
-				}
-			}
-		} finally {
-			JavaProjectHelper.delete(otherProject);
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReturnTypeQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReturnTypeQuickFixTest.java
deleted file mode 100644
index c74b4cb..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/ReturnTypeQuickFixTest.java
+++ /dev/null

@@ -1,905 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.ASTRewriteCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-
-public class ReturnTypeQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= ReturnTypeQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public ReturnTypeQuickFixTest(String name) {
-		super(name);
-	}
-
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new ReturnTypeQuickFixTest("testMethodWithConstructorName"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	
-	public void testSimpleTypeReturnDeclMissing() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public foo() {\n");
-		buf.append("        return (new Vector()).elements();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean addReturnType= true, doRename= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
-			if (elem instanceof ASTRewriteCorrectionProposal) {
-				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
-				assertTrue("duplicated entries", addReturnType);
-				addReturnType= false;		
-		
-				String preview= getPreviewContent(proposal);
-		
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("import java.util.Enumeration;\n");		
-				buf.append("import java.util.Vector;\n");
-				buf.append("public class E {\n");
-				buf.append("    public Enumeration foo() {\n");
-				buf.append("        return (new Vector()).elements();\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			} else {
-				assertTrue("duplicated entries", doRename);
-				doRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) elem;
-				String preview= getPreviewContent(proposal);
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("import java.util.Vector;\n");				
-				buf.append("public class E {\n");
-				buf.append("    public E() {\n");
-				buf.append("        return (new Vector()).elements();\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			}
-		}
-	}
-
-
-	public void testVoidTypeReturnDeclMissing() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public foo() {\n");
-		buf.append("        //do nothing\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean addReturnType= true, doRename= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
-			if (elem instanceof ASTRewriteCorrectionProposal) {
-				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
-				assertTrue("duplicated entries", addReturnType);
-				addReturnType= false;		
-		
-				String preview= getPreviewContent(proposal);
-		
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    public void foo() {\n");
-				buf.append("        //do nothing\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			} else {
-				assertTrue("duplicated entries", doRename);
-				doRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) elem;
-				String preview= getPreviewContent(proposal);
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    public E() {\n");
-				buf.append("        //do nothing\n");	
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			}
-		}	
-		
-	}
-	
-	
-	public void testReturnTypeDeclMissing() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E {\n");
-		buf.append("    public foo();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E {\n");
-		buf.append("    public void foo();\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1 }, new String[] { expected1 });
-	}
-
-	
-	public void testVoidTypeReturnDeclMissing2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public foo() {\n");
-		buf.append("        if (true) {\n");
-		buf.append("           return;\n");
-		buf.append("        }\n");
-		buf.append("        return;\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean addReturnType= true, doRename= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
-			if (elem instanceof ASTRewriteCorrectionProposal) {
-				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
-				assertTrue("duplicated entries", addReturnType);
-				addReturnType= false;		
-		
-				String preview= getPreviewContent(proposal);
-		
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    public void foo() {\n");
-				buf.append("        if (true) {\n");
-				buf.append("           return;\n");
-				buf.append("        }\n");
-				buf.append("        return;\n");				
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			} else {
-				assertTrue("duplicated entries", doRename);
-				doRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) elem;
-				String preview= getPreviewContent(proposal);
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    public E() {\n");
-				buf.append("        if (true) {\n");
-				buf.append("           return;\n");
-				buf.append("        }\n");
-				buf.append("        return;\n");				
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			}
-		}	
-	}
-	
-	public void testVoidMissingInAnonymousType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("            }\n");
-		buf.append("            public foo() {\n");
-		buf.append("            }\n");		
-		buf.append("        };\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Runnable run= new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("            }\n");
-		buf.append("            public void foo() {\n");
-		buf.append("            }\n");		
-		buf.append("        };\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	
-	public void testNullTypeReturnDeclMissing() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public foo() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean addReturnType= true, doRename= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
-			if (elem instanceof ASTRewriteCorrectionProposal) {
-				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
-				assertTrue("duplicated entries", addReturnType);
-				addReturnType= false;		
-		
-				String preview= getPreviewContent(proposal);
-		
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    public Object foo() {\n");
-				buf.append("        return null;\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			} else {
-				assertTrue("duplicated entries", doRename);
-				doRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) elem;
-				String preview= getPreviewContent(proposal);
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    public E() {\n");
-				buf.append("        return null;\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			}	
-		}		
-	}
-	
-	public void testArrayTypeReturnDeclMissing() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public foo() {\n");
-		buf.append("        return new int[][] { { 1, 2 }, { 2, 3 } };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		boolean addReturnType= true, doRename= true;
-		
-		for (int i= 0; i < proposals.size(); i++) {
-			Object elem= proposals.get(i);
-			if (elem instanceof ASTRewriteCorrectionProposal) {
-				ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) elem;
-				assertTrue("duplicated entries", addReturnType);
-				addReturnType= false;
-
-				String preview= getPreviewContent(proposal);
-		
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    public int[][] foo() {\n");
-				buf.append("        return new int[][] { { 1, 2 }, { 2, 3 } };\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			} else {
-				assertTrue("duplicated entries", doRename);
-				doRename= false;
-				
-				CUCorrectionProposal proposal= (CUCorrectionProposal) elem;
-				String preview= getPreviewContent(proposal);
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    public E() {\n");
-				buf.append("        return new int[][] { { 1, 2 }, { 2, 3 } };\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			}
-		}	
-	}
-	
-	public void testVoidMethodReturnsStatement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    Vector fList= new Vector();\n");
-		buf.append("    public void elements() {\n");
-		buf.append("        return fList.toArray();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-			
-		{	
-			ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-			String preview= getPreviewContent(proposal);
-		
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("import java.util.Vector;\n");
-			buf.append("public class E {\n");
-			buf.append("    Vector fList= new Vector();\n");
-			buf.append("    public Object[] elements() {\n");
-			buf.append("        return fList.toArray();\n");
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(preview, buf.toString());
-		}
-		{	
-			ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(1);
-			String preview= getPreviewContent(proposal);
-		
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("import java.util.Vector;\n");
-			buf.append("public class E {\n");
-			buf.append("    Vector fList= new Vector();\n");
-			buf.append("    public void elements() {\n");
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(preview, buf.toString());
-		}		
-	}
-	
-	public void testVoidMethodReturnsAnonymClass() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void getOperation() {\n");
-		buf.append("        return new Runnable() {\n");
-		buf.append("            public void run() {}\n");
-		buf.append("        };\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-			
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public Runnable getOperation() {\n");
-		buf.append("        return new Runnable() {\n");
-		buf.append("            public void run() {}\n");
-		buf.append("        };\n");				
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (ASTRewriteCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-			
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void getOperation() {\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testConstructorReturnsValue() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Arrays;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("        return Arrays.asList(null);\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		{
-			ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-			String preview= getPreviewContent(proposal);
-	
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("import java.util.Arrays;\n");
-			buf.append("import java.util.List;\n");					
-			buf.append("public class E {\n");
-			buf.append("    public List E() {\n");
-			buf.append("        return Arrays.asList(null);\n");		
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(preview, buf.toString());
-		}
-		{
-			ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(1);
-			String preview= getPreviewContent(proposal);
-	
-			buf= new StringBuffer();
-			buf.append("package test1;\n");
-			buf.append("import java.util.Arrays;\n");		
-			buf.append("public class E {\n");
-			buf.append("    public E() {\n");
-			buf.append("    }\n");
-			buf.append("}\n");
-			assertEqualString(preview, buf.toString());
-		}		
-	}
-	
-	
-	public void testCorrectReturnStatement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public Runnable getOperation() {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public Runnable getOperation() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (ASTRewriteCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void getOperation() {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testCorrectReturnStatementForArray() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int[][] getArray() {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int[][] getArray() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (ASTRewriteCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void getArray() {\n");
-		buf.append("        return;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}	
-	
-	public void testMethodWithConstructorName() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int[][] E() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}	
-	
-	public void testMissingReturnStatement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int[][] getArray() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public int[][] getArray() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (ASTRewriteCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void getArray() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-
-	public void testMissingReturnStatementWithCode() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int[] fArray;\n");		
-		buf.append("    public int getArray()[] {\n");
-		buf.append("        if (true) {\n");		
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int[] fArray;\n");	
-		buf.append("    public int getArray()[] {\n");
-		buf.append("        if (true) {\n");		
-		buf.append("        }\n");
-		buf.append("        return fArray;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (ASTRewriteCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int[] fArray;\n");		
-		buf.append("    public void getArray()[] {\n");
-		buf.append("        if (true) {\n");		
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-
-	public void testMissingReturnStatementWithCode2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean isVisible() {\n");
-		buf.append("        boolean res= false;\n");			
-		buf.append("        if (true) {\n");
-		buf.append("            res= false;\n");			
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public boolean isVisible() {\n");
-		buf.append("        boolean res= false;\n");			
-		buf.append("        if (true) {\n");
-		buf.append("            res= false;\n");			
-		buf.append("        }\n");
-		buf.append("        return res;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (ASTRewriteCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void isVisible() {\n");
-		buf.append("        boolean res= false;\n");			
-		buf.append("        if (true) {\n");
-		buf.append("            res= false;\n");			
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	public void testMissingReturnStatementWithCode3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public String getDebugInfo() {\n");
-		buf.append("        getClass().getName();\n");			
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public String getDebugInfo() {\n");
-		buf.append("        return getClass().getName();\n");			
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1 }, new String[] { expected1 });
-	}
-	
-	public void testMissingReturnStatementWithCode4() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public String getDebugInfo() {\n");
-		buf.append("        getClass().notify();\n");			
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		ASTRewriteCorrectionProposal proposal= (ASTRewriteCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public String getDebugInfo() {\n");
-		buf.append("        getClass().notify();\n");			
-		buf.append("        return null;\n");			
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1 }, new String[] { expected1 });
-	}
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/SerialVersionQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/SerialVersionQuickFixTest.java
deleted file mode 100644
index 4a27415..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/SerialVersionQuickFixTest.java
+++ /dev/null

@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.SerialVersionDefaultProposal;
-import org.eclipse.jdt.internal.ui.text.correction.SerialVersionHashProposal;
-
-/**
- *  
- */
-public class SerialVersionQuickFixTest extends QuickFixTest {
-
-	private static final String FIELD_COMMENT= "/* Test */";
-
-	private static final Class THIS= SerialVersionQuickFixTest.class;
-
-	/**
-	 * @return Test
-	 */
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-
-	/*
-	 * @see org.eclipse.jdt.ui.tests.quickfix.QuickFixTest#suite()
-	 */
-	public static Test suite() {
-		return allTests();
-	}
-
-	private IJavaProject fProject;
-
-	private IPackageFragmentRoot fSourceFolder;
-
-	/**
-	 * @param name
-	 */
-	public SerialVersionQuickFixTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-
-		Hashtable options= TestOptions.getFormatterOptions();
-
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1"); //$NON-NLS-1$
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4"); //$NON-NLS-1$
-		options.put(JavaCore.COMPILER_PB_UNUSED_IMPORT, JavaCore.IGNORE);
-		JavaCore.setOptions(options);
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-
-		fProject= JavaProjectHelper.createJavaProject("serialIdProject", "bin");
-		JavaProjectHelper.addRTJar(fProject);
-
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.NEWTYPE).setPattern(""); //$NON-NLS-1$
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.TYPECOMMENT).setPattern(""); //$NON-NLS-1$
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.FIELDCOMMENT).setPattern(FIELD_COMMENT); //$NON-NLS-1$
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fProject, "src"); //$NON-NLS-1$
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fProject);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public void testAnonymousClass() throws Exception {
-
-		IPackageFragment package3= fSourceFolder.createPackageFragment("test3", false, null); //$NON-NLS-1$
-		StringBuffer buffer= new StringBuffer();
-
-		buffer.append("package test3;\n"); //$NON-NLS-1$
-		buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-		buffer.append("public class Test3 {\n"); //$NON-NLS-1$
-		buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-		buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-		buffer.append("    public void test() {\n"); //$NON-NLS-1$
-		buffer.append("        Serializable var3= new Serializable() {\n"); //$NON-NLS-1$
-		buffer.append("            int var4;\n"); //$NON-NLS-1$
-		buffer.append("        };\n"); //$NON-NLS-1$
-		buffer.append("    }\n"); //$NON-NLS-1$
-		buffer.append("}\n"); //$NON-NLS-1$
-
-		ICompilationUnit unit3= package3.createCompilationUnit("Test3.java", buffer.toString(), false, null); //$NON-NLS-1$
-		fProject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
-
-		CompilationUnit root3= getASTRoot(unit3);
-		ArrayList proposals3= collectCorrections(unit3, root3);
-
-		assertNumberOf("proposals3", proposals3.size(), 2); //$NON-NLS-1$
-		assertCorrectLabels(proposals3);
-
-		Object current= null;
-		for (int index= 0; index < proposals3.size(); index++) {
-
-			current= proposals3.get(index);
-			if (current instanceof SerialVersionHashProposal) {
-
-				SerialVersionHashProposal proposal= (SerialVersionHashProposal) current;
-				String preview= getPreviewContent(proposal);
-
-				buffer= new StringBuffer();
-				buffer.append("package test3;\n"); //$NON-NLS-1$
-				buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-				buffer.append("public class Test3 {\n"); //$NON-NLS-1$
-				buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-				buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-				buffer.append("    public void test() {\n"); //$NON-NLS-1$
-				buffer.append("        Serializable var3= new Serializable() {\n"); //$NON-NLS-1$
-				buffer.append("            " + FIELD_COMMENT + "\n");
-				buffer.append("            private static final long serialVersionUID = -70923185657280836L;\n"); //$NON-NLS-1$
-				buffer.append("            int var4;\n"); //$NON-NLS-1$
-				buffer.append("        };\n"); //$NON-NLS-1$
-				buffer.append("    }\n"); //$NON-NLS-1$
-				buffer.append("}\n"); //$NON-NLS-1$
-				assertEqualString(preview, buffer.toString());
-
-			} else if (current instanceof SerialVersionDefaultProposal) {
-
-				SerialVersionDefaultProposal proposal= (SerialVersionDefaultProposal) current;
-				String preview= getPreviewContent(proposal);
-
-				buffer= new StringBuffer();
-				buffer.append("package test3;\n"); //$NON-NLS-1$
-				buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-				buffer.append("public class Test3 {\n"); //$NON-NLS-1$
-				buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-				buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-				buffer.append("    public void test() {\n"); //$NON-NLS-1$
-				buffer.append("        Serializable var3= new Serializable() {\n"); //$NON-NLS-1$
-				buffer.append("            " + FIELD_COMMENT + "\n");
-				buffer.append("            private static final long serialVersionUID = 1L;\n"); //$NON-NLS-1$
-				buffer.append("            int var4;\n"); //$NON-NLS-1$
-				buffer.append("        };\n"); //$NON-NLS-1$
-				buffer.append("    }\n"); //$NON-NLS-1$
-				buffer.append("}\n"); //$NON-NLS-1$
-				assertEqualString(preview, buffer.toString());
-			}
-		}
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public void testInnerClass() throws Exception {
-
-		IPackageFragment package2= fSourceFolder.createPackageFragment("test2", false, null); //$NON-NLS-1$
-		StringBuffer buffer= new StringBuffer();
-
-		buffer.append("package test2;\n"); //$NON-NLS-1$
-		buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-		buffer.append("public class Test2 {\n"); //$NON-NLS-1$
-		buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-		buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-		buffer.append("    protected class Test1 implements Serializable {\n"); //$NON-NLS-1$
-		buffer.append("        public long var3;\n"); //$NON-NLS-1$
-		buffer.append("    }\n"); //$NON-NLS-1$
-		buffer.append("}\n"); //$NON-NLS-1$
-
-		ICompilationUnit unit2= package2.createCompilationUnit("Test2.java", buffer.toString(), false, null); //$NON-NLS-1$
-		fProject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
-
-		CompilationUnit root2= getASTRoot(unit2);
-		ArrayList proposals2= collectCorrections(unit2, root2);
-
-		assertNumberOf("proposals2", proposals2.size(), 2); //$NON-NLS-1$
-		assertCorrectLabels(proposals2);
-
-		Object current= null;
-		for (int index= 0; index < proposals2.size(); index++) {
-
-			current= proposals2.get(index);
-			if (current instanceof SerialVersionHashProposal) {
-
-				SerialVersionHashProposal proposal= (SerialVersionHashProposal) current;
-				String preview= getPreviewContent(proposal);
-
-				buffer= new StringBuffer();
-				buffer.append("package test2;\n"); //$NON-NLS-1$
-				buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-				buffer.append("public class Test2 {\n"); //$NON-NLS-1$
-				buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-				buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-				buffer.append("    protected class Test1 implements Serializable {\n"); //$NON-NLS-1$
-				buffer.append("        " + FIELD_COMMENT + "\n");
-				buffer.append("        private static final long serialVersionUID = -4023230086280104302L;\n"); //$NON-NLS-1$
-				buffer.append("        public long var3;\n"); //$NON-NLS-1$
-				buffer.append("    }\n"); //$NON-NLS-1$
-				buffer.append("}\n"); //$NON-NLS-1$
-				assertEqualString(preview, buffer.toString());
-
-			} else if (current instanceof SerialVersionDefaultProposal) {
-
-				SerialVersionDefaultProposal proposal= (SerialVersionDefaultProposal) current;
-				String preview= getPreviewContent(proposal);
-
-				buffer= new StringBuffer();
-				buffer.append("package test2;\n"); //$NON-NLS-1$
-				buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-				buffer.append("public class Test2 {\n"); //$NON-NLS-1$
-				buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-				buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-				buffer.append("    protected class Test1 implements Serializable {\n"); //$NON-NLS-1$
-				buffer.append("        " + FIELD_COMMENT + "\n");
-				buffer.append("        private static final long serialVersionUID = 1L;\n"); //$NON-NLS-1$
-				buffer.append("        public long var3;\n"); //$NON-NLS-1$
-				buffer.append("    }\n"); //$NON-NLS-1$
-				buffer.append("}\n"); //$NON-NLS-1$
-				assertEqualString(preview, buffer.toString());
-			}
-		}
-	}
-
-	public void testOuterClass() throws Exception {
-
-		IPackageFragment package1= fSourceFolder.createPackageFragment("test1", false, null); //$NON-NLS-1$
-		StringBuffer buffer= new StringBuffer();
-
-		buffer.append("package test1;\n"); //$NON-NLS-1$
-		buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-		buffer.append("public class Test1 implements Serializable {\n"); //$NON-NLS-1$
-		buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-		buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-		buffer.append("}\n"); //$NON-NLS-1$
-
-		ICompilationUnit unit1= package1.createCompilationUnit("Test1.java", buffer.toString(), false, null); //$NON-NLS-1$
-		fProject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
-
-		CompilationUnit root1= getASTRoot(unit1);
-		ArrayList proposals1= collectCorrections(unit1, root1);
-
-		assertNumberOf("proposals1", proposals1.size(), 2); //$NON-NLS-1$
-		assertCorrectLabels(proposals1);
-
-		Object current= null;
-		for (int index= 0; index < proposals1.size(); index++) {
-
-			current= proposals1.get(index);
-			if (current instanceof SerialVersionHashProposal) {
-
-				SerialVersionHashProposal proposal= (SerialVersionHashProposal) current;
-				String preview= getPreviewContent(proposal);
-
-				buffer= new StringBuffer();
-				buffer.append("package test1;\n"); //$NON-NLS-1$
-				buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-				buffer.append("public class Test1 implements Serializable {\n"); //$NON-NLS-1$
-				buffer.append("    " + FIELD_COMMENT + "\n");
-				buffer.append("    private static final long serialVersionUID = -2242798150684569765L;\n"); //$NON-NLS-1$
-				buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-				buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-				buffer.append("}\n"); //$NON-NLS-1$
-				assertEqualString(preview, buffer.toString());
-
-			} else if (current instanceof SerialVersionDefaultProposal) {
-
-				SerialVersionDefaultProposal proposal= (SerialVersionDefaultProposal) current;
-				String preview= getPreviewContent(proposal);
-
-				buffer= new StringBuffer();
-				buffer.append("package test1;\n"); //$NON-NLS-1$
-				buffer.append("import java.io.Serializable;\n"); //$NON-NLS-1$
-				buffer.append("public class Test1 implements Serializable {\n"); //$NON-NLS-1$
-				buffer.append("    " + FIELD_COMMENT + "\n");
-				buffer.append("    private static final long serialVersionUID = 1L;\n"); //$NON-NLS-1$
-				buffer.append("    protected int var1;\n"); //$NON-NLS-1$
-				buffer.append("    protected int var2;\n"); //$NON-NLS-1$
-				buffer.append("}\n"); //$NON-NLS-1$
-				assertEqualString(preview, buffer.toString());
-			}
-		}
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/TypeMismatchQuickFixTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/TypeMismatchQuickFixTests.java
deleted file mode 100644
index 75f1e01..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/TypeMismatchQuickFixTests.java
+++ /dev/null

@@ -1,1008 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-
-public class TypeMismatchQuickFixTests extends QuickFixTest {
-	
-	private static final Class THIS= TypeMismatchQuickFixTests.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-
-	public TypeMismatchQuickFixTests(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (false) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new TypeMismatchQuickFixTests("testMismatchingExceptions2"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, String.valueOf(99));
-		options.put(JavaCore.COMPILER_PB_STATIC_ACCESS_RECEIVER, JavaCore.ERROR);
-		
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CATCHBLOCK).setPattern("");
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CONSTRUCTORSTUB).setPattern("");
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.METHODSTUB).setPattern("");
-
-		fJProject1= ProjectTestSetup.getProject();
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	
-	public void testTypeMismatchInVarDecl() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        Thread th= o;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        Thread th= (Thread) o;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        Object th= o;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Thread o) {\n");
-		buf.append("        Thread th= o;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testTypeMismatchInVarDecl2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");		
-		buf.append("public class Container {\n");
-		buf.append("    public List[] getLists() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Container.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Container c) {\n");
-		buf.append("         ArrayList[] lists= c.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Container c) {\n");
-		buf.append("         ArrayList[] lists= (ArrayList[]) c.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");					
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Container c) {\n");
-		buf.append("         List[] lists= c.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");		
-		buf.append("import java.util.List;\n");		
-		buf.append("public class Container {\n");
-		buf.append("    public ArrayList[] getLists() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-
-	}
-	
-	public void testTypeMismatchInVarDecl3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Thread th= foo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 0);
-	}	
-	
-	public void testTypeMismatchInVarDecl4() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");		
-		buf.append("public class Container {\n");
-		buf.append("    public List getLists()[] {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Container.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");				
-		buf.append("public class E extends Container {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         ArrayList[] lists= super.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");				
-		buf.append("public class E extends Container {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         ArrayList[] lists= (ArrayList[]) super.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");					
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E extends Container {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         List[] lists= super.getLists();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");		
-		buf.append("import java.util.List;\n");		
-		buf.append("public class Container {\n");
-		buf.append("    public ArrayList[] getLists() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-
-	}
-	
-	
-	public void testTypeMismatchForInterface1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class Container {\n");
-		buf.append("    public static Container getContainer() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Container.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         List list= Container.getContainer();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 4);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         Container list= Container.getContainer();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         List list= (List) Container.getContainer();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.List;\n");
-		buf.append("\n");
-		buf.append("public class Container {\n");
-		buf.append("    public static List getContainer() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(3);
-		String preview4= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");	
-		buf.append("import java.util.List;\n");
-		buf.append("\n");
-		buf.append("public class Container implements List {\n");
-		buf.append("    public static Container getContainer() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected4= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3, preview4 }, new String[] { expected1, expected2, expected3, expected4 });		
-
-	}
-	
-	public void testTypeMismatchForInterface2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class Container {\n");
-		buf.append("    public static Container getContainer() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Container.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Collections;\n");				
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         Collections.reverse(Container.getContainer());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Collections;\n");
-		buf.append("import java.util.List;\n");	
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("         Collections.reverse((List) Container.getContainer());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.List;\n");
-		buf.append("\n");
-		buf.append("public class Container {\n");
-		buf.append("    public static List getContainer() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");	
-		buf.append("import java.util.List;\n");
-		buf.append("\n");
-		buf.append("public class Container implements List {\n");
-		buf.append("    public static Container getContainer() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-				
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-
-	public void testTypeMismatchInFieldDecl() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    int time= System.currentTimeMillis();\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    int time= (int) System.currentTimeMillis();\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    long time= System.currentTimeMillis();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}	
-	
-	public void testTypeMismatchInAssignment() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str;\n");
-		buf.append("        str= iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str;\n");
-		buf.append("        str= (String) iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        Object str;\n");
-		buf.append("        str= iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testTypeMismatchInAssignment2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str, str2;\n");
-		buf.append("        str= iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str, str2;\n");
-		buf.append("        str= (String) iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Iterator iter) {\n");
-		buf.append("        String str2;\n");
-		buf.append("        Object str;\n");
-		buf.append("        str= iter.next();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testTypeMismatchInExpression() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");		
-		buf.append("public class E {\n");
-		buf.append("    public String[] foo(List list) {\n");
-		buf.append("        return list.toArray(new List[list.size()]);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public String[] foo(List list) {\n");
-		buf.append("        return (String[]) list.toArray(new List[list.size()]);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public Object[] foo(List list) {\n");
-		buf.append("        return list.toArray(new List[list.size()]);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	public void testCastOnCastExpression() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(List list) {\n");
-		buf.append("        ArrayList a= (Cloneable) list;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(List list) {\n");
-		buf.append("        ArrayList a= (ArrayList) list;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(List list) {\n");
-		buf.append("        Cloneable a= (Cloneable) list;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-
-	
-	public void testMismatchingReturnType1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class Base {\n");
-		buf.append("    public String getName() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Base.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends Base {\n");
-		buf.append("    public char[] getName() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends Base {\n");
-		buf.append("    public String getName() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class Base {\n");
-		buf.append("    public char[] getName() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-						
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testMismatchingReturnType2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public interface IBase {\n");
-		buf.append("    List getCollection();\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("IBase.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E implements IBase {\n");
-		buf.append("    public String[] getCollection() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.List;\n");
-		buf.append("\n");
-		buf.append("public class E implements IBase {\n");
-		buf.append("    public List getCollection() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.List;\n");
-		buf.append("public interface IBase {\n");
-		buf.append("    String[] getCollection();\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-						
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testMismatchingExceptions1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface IBase {\n");
-		buf.append("    String[] getValues();\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("IBase.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E implements IBase {\n");
-		buf.append("    public String[] getValues() throws IOException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("\n");
-		buf.append("public interface IBase {\n");
-		buf.append("    String[] getValues() throws IOException;\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class E implements IBase {\n");
-		buf.append("    public String[] getValues() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-						
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testMismatchingExceptions2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class Base {\n");
-		buf.append("    String[] getValues() throws IOException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Base.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.EOFException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E extends Base {\n");
-		buf.append("    public String[] getValues() throws EOFException, ParseException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class Base {\n");
-		buf.append("    String[] getValues() throws IOException, ParseException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.EOFException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E extends Base {\n");
-		buf.append("    public String[] getValues() throws EOFException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-						
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testMismatchingExceptions3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("public class Base {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The parameter\n");
-		buf.append("     *                  More about the parameter\n");
-		buf.append("     * @return The returned argument\n");
-		buf.append("     * @throws IOException IO problems\n");
-		buf.append("     * @since 3.0\n");
-		buf.append("     */\n");
-		buf.append("    String[] getValues(int i) throws IOException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Base.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.EOFException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E extends Base {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The parameter\n");
-		buf.append("     *                  More about the parameter\n");
-		buf.append("     * @return The returned argument\n");
-		buf.append("     * @throws EOFException EOF problems\n");
-		buf.append("     * @throws ParseException Parse problems\n");
-		buf.append("     */\n");
-		buf.append("    public String[] getValues(int i) throws EOFException, ParseException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class Base {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The parameter\n");
-		buf.append("     *                  More about the parameter\n");
-		buf.append("     * @return The returned argument\n");
-		buf.append("     * @throws IOException IO problems\n");
-		buf.append("     * @throws ParseException\n");
-		buf.append("     * @since 3.0\n");
-		buf.append("     */\n");
-		buf.append("    String[] getValues(int i) throws IOException, ParseException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.EOFException;\n");
-		buf.append("import java.text.ParseException;\n");
-		buf.append("public class E extends Base {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The parameter\n");
-		buf.append("     *                  More about the parameter\n");
-		buf.append("     * @return The returned argument\n");
-		buf.append("     * @throws EOFException EOF problems\n");
-		buf.append("     */\n");
-		buf.append("    public String[] getValues(int i) throws EOFException {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-						
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-
-	
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedMethodsQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedMethodsQuickFixTest.java
deleted file mode 100644
index 84be4f9..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedMethodsQuickFixTest.java
+++ /dev/null

@@ -1,3176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.NewMethodCompletionProposal;
-
-public class UnresolvedMethodsQuickFixTest extends QuickFixTest {
-	private static final Class THIS= UnresolvedMethodsQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public UnresolvedMethodsQuickFixTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new UnresolvedMethodsQuickFixTest("testConstructorInvocationMoreArguments2"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(JavaCore.COMPILER_PB_NO_EFFECT_ASSIGNMENT, JavaCore.IGNORE);
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-		
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CATCHBLOCK).setPattern("");
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.CONSTRUCTORSTUB).setPattern("");
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.METHODSTUB).setPattern("");		
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-
-	
-	public void testMethodInSameType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private int goo(Vector vec, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testMethodInForInit() throws Exception {		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (int i= 0, j= goo(3); i < 0; i++) {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (int i= 0, j= goo(3); i < 0; i++) {\n");
-		buf.append("        }\n");	
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private int goo(int i) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testMethodInInfixExpression1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private boolean foo() {\n");
-		buf.append("        return f(1) || f(2);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 2);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private boolean foo() {\n");
-		buf.append("        return f(1) || f(2);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private boolean f(int i) {\n");
-		buf.append("        return false;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testMethodInInfixExpression2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private boolean foo() {\n");
-		buf.append("        return f(1) == f(2);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 2);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private boolean foo() {\n");
-		buf.append("        return f(1) == f(2);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private Object f(int i) {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}		
-
-	public void testMethodSpacing0EmptyLines() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("    private int goo(Vector vec, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testMethodSpacing1EmptyLine() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private int goo(Vector vec, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testMethodSpacing2EmptyLines() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("    \n");
-		buf.append("    \n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("    \n");
-		buf.append("    \n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("\n");
-		buf.append("    private int goo(Vector vec, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testMethodSpacingComment() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("//comment\n");
-		buf.append("\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("//comment\n");
-		buf.append("\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private int goo(Vector vec, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testMethodSpacingJavadoc() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    /**\n");
-		buf.append("     * javadoc\n");
-		buf.append("     */\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    /**\n");
-		buf.append("     * javadoc\n");
-		buf.append("     */\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private int goo(Vector vec, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-
-	public void testMethodSpacingNonJavadoc() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    /*\n");
-		buf.append("     * non javadoc\n");
-		buf.append("     */\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("\n");
-		buf.append("    void fred() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    /*\n");
-		buf.append("     * non javadoc\n");
-		buf.append("     */\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private int goo(Vector vec, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testMethodInSameTypeUsingThis() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= this.goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        int i= this.goo(vec, true);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private int goo(Vector vec, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-	}
-	
-	public void testMethodInDifferentClass() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(X x) {\n");
-		buf.append("        if (x instanceof Y) {\n");
-		buf.append("            boolean i= x.goo(1, 2.1);\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface Y {\n");
-		buf.append("    public boolean goo(int i, double d);\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("Y.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("\n");
-		buf.append("    public boolean goo(int i, double d) {\n");
-		buf.append("        return false;\n");
-		buf.append("    }\n");				
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(X x) {\n");
-		buf.append("        if (x instanceof Y) {\n");
-		buf.append("            boolean i= ((Y) x).goo(1, 2.1);\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testMethodInAnonymous1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                xoo();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                xoo();\n");
-		buf.append("            }\n");
-		buf.append("\n");
-		buf.append("            private void xoo() {\n");
-		buf.append("            }\n");		
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                xoo();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    protected void xoo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                foo();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-				
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testMethodInAnonymous2() throws Exception {
-		IPackageFragment pack0= fSourceFolder.createPackageFragment("other", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf= new StringBuffer();
-		buf.append("package other;\n");
-		buf.append("public class A {\n");
-		buf.append("}\n");
-		pack0.createCompilationUnit("A.java", buf.toString(), false, null);
-
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import other.A;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                A.xoo();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package other;\n");
-		buf.append("public class A {\n");
-		buf.append("\n");
-		buf.append("    public static void xoo() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		assertEqualString(preview1, expected1);			
-	}
-	
-	public void testMethodInAnonymousCovering1() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                run(1);\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 4);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                E.this.run(1);\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                run();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run(int i) {\n");
-		buf.append("                run(1);\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(3);
-		String preview4= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                run(1);\n");
-		buf.append("            }\n");
-		buf.append("\n");
-		buf.append("            private void run(int i) {\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected4= buf.toString();		
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3, preview4 }, new String[] { expected1, expected2, expected3, expected4 });
-	}
-	
-	public void testMethodInAnonymousCovering2() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                run(1);\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 4);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                E.run(1);\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                run();\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run(int i) {\n");
-		buf.append("                run(1);\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(3);
-		String preview4= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public static void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                run(1);\n");
-		buf.append("            }\n");
-		buf.append("\n");
-		buf.append("            private void run(int i) {\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected4= buf.toString();		
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3, preview4 }, new String[] { expected1, expected2, expected3, expected4 });
-	}
-	
-	public void testMethodInAnonymousCovering3() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public class Inner {\n");
-		buf.append("        public void run() {\n");
-		buf.append("            run(1);\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 4);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public class Inner {\n");
-		buf.append("        public void run() {\n");
-		buf.append("            E.this.run(1);\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public class Inner {\n");
-		buf.append("        public void run() {\n");
-		buf.append("            run();\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public class Inner {\n");
-		buf.append("        public void run(int i) {\n");
-		buf.append("            run(1);\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(3);
-		String preview4= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public class Inner {\n");
-		buf.append("        public void run() {\n");
-		buf.append("            run(1);\n");
-		buf.append("        }\n");
-		buf.append("\n");
-		buf.append("        private void run(int i) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected4= buf.toString();		
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3, preview4 }, new String[] { expected1, expected2, expected3, expected4 });
-	}
-	
-	public void testMethodInAnonymousCovering4() throws Exception {
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public static class Inner {\n");
-		buf.append("        public void run() {\n");
-		buf.append("            run(1);\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public static class Inner {\n");
-		buf.append("        public void run() {\n");
-		buf.append("            run(1);\n");
-		buf.append("        }\n");
-		buf.append("\n");
-		buf.append("        private void run(int i) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public static class Inner {\n");
-		buf.append("        public void run() {\n");
-		buf.append("            run();\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void run(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public static class Inner {\n");
-		buf.append("        public void run(int i) {\n");
-		buf.append("            run(1);\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });
-	}	
-	
-		
-	
-	
-	public void testMethodInDifferentInterface() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(X x) {\n");
-		buf.append("        boolean i= x.goo(getClass());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface X {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface X {\n");
-		buf.append("\n");
-		buf.append("    boolean goo(Class class1);\n");				
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(X x) {\n");
-		buf.append("        boolean i= ((Object) x).goo(getClass());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testParameterMismatchCast() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        long x= 0;\n");
-		buf.append("        foo(x + 1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        long x= 0;\n");
-		buf.append("        foo((int) (x + 1));\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        long x= 0;\n");
-		buf.append("        foo(x + 1);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private void foo(long l) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(long l) {\n");
-		buf.append("        long x= 0;\n");
-		buf.append("        foo(x + 1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchCast2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        double x= 0.0;\n");
-		buf.append("        X.xoo((float) x, this);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public static void xoo(int i, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);				
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        double x= 0.0;\n");
-		buf.append("        X.xoo((int) x, this);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public static void xoo(int i, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public static void xoo(float f, E e) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");		
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public static void xoo(float f, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchChangeVarType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        long x= 0;\n");
-		buf.append("        goo(x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo(long x) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        long x= 0;\n");
-		buf.append("        goo(x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        long x= 0;\n");
-		buf.append("        goo(x);\n");
-		buf.append("    }\n");
-		buf.append("    private void goo(long x) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        Vector x= 0;\n");
-		buf.append("        goo(x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchChangeFieldType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    int fCount= 0;\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo(fCount);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    int fCount= 0;\n");
-		buf.append("    public void goo(int count) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo(fCount);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    int fCount= 0;\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo(fCount);\n");
-		buf.append("    }\n");
-		buf.append("    private void goo(int count) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    Vector fCount= 0;\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        goo(fCount);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchChangeMethodType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        goo(this.foo());\n");
-		buf.append("        return 9;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo(int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        goo(this.foo());\n");
-		buf.append("        return 9;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        goo(this.foo());\n");
-		buf.append("        return 9;\n");	
-		buf.append("    }\n");
-		buf.append("    private void goo(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void goo(Vector v) {\n");
-		buf.append("    }\n");
-		buf.append("    public Vector foo() {\n");
-		buf.append("        goo(this.foo());\n");
-		buf.append("        return 9;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-
-
-	
-	
-	public void testParameterMismatchLessArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s, int i, Object o) {\n");
-		buf.append("        int x= 0;\n");
-		buf.append("        foo(x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s, int i, Object o) {\n");
-		buf.append("        int x= 0;\n");
-		buf.append("        foo(s, x, o);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s, int i, Object o) {\n");
-		buf.append("        int x= 0;\n");
-		buf.append("        foo(x);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private void foo(int x) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        int x= 0;\n");
-		buf.append("        foo(x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchLessArguments2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        X.xoo(null);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public static void xoo(int i, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);		
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        X.xoo(0, null);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public static void xoo(int i, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public static void xoo(Object object) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public static void xoo(Object o) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchLessArguments3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        X.xoo(1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     *                  More about the int value\n");
-		buf.append("     * @param o The Object value\n");
-		buf.append("     */\n");
-		buf.append("    public static void xoo(int i, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);		
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        X.xoo(1, null);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     *                  More about the int value\n");
-		buf.append("     * @param o The Object value\n");
-		buf.append("     */\n");
-		buf.append("    public static void xoo(int i, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public static void xoo(int i) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     *                  More about the int value\n");
-		buf.append("     */\n");
-		buf.append("    public static void xoo(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testSuperConstructorLessArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public X(Object o, int i) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);		
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E extends X {\n");
-		buf.append("    public E() {\n");
-		buf.append("        super(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E extends X {\n");
-		buf.append("    public E() {\n");
-		buf.append("        super(new Vector(), 0);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class X {\n");
-		buf.append("    public X(Object o, int i) {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public X(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public X(Object o) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testConstructorInvocationLessArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public E() {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public E() {\n");
-		buf.append("        this(new Vector(), 0);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(Object o) {\n");
-		buf.append("    }\n");
-		buf.append("    public E() {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("    }\n");
-		buf.append("    public E() {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("    public E(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}	
-	
-	
-	public void testParameterMismatchMoreArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(X x) {\n");
-		buf.append("        x.xoo(1, 1, x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public void xoo(int i, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(X x) {\n");
-		buf.append("        x.xoo(1, x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public void xoo(int i, int j, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public void xoo(int i, Object o) {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public void xoo(int i, int j, X x) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchMoreArguments2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s) {\n");
-		buf.append("        int x= 0;\n");
-		buf.append("        foo(s, x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s) {\n");
-		buf.append("        int x= 0;\n");
-		buf.append("        foo(s);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s) {\n");
-		buf.append("        int x= 0;\n");
-		buf.append("        foo(s, x);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private void foo(String s, int x) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(String s, int x2) {\n");
-		buf.append("        int x= 0;\n");
-		buf.append("        foo(s, x);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchMoreArguments3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Collections;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(X x) {\n");
-		buf.append("        x.xoo(Collections.EMPTY_SET, 1, 2);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     */\n");
-		buf.append("    public void xoo(int i) {\n");
-		buf.append("       int j= 0;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Collections;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(X x) {\n");
-		buf.append("        x.xoo(1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");	
-		buf.append("import java.util.Set;\n");
-		buf.append("\n");	
-		buf.append("public class X {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param set\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     * @param k\n");
-		buf.append("     */\n");
-		buf.append("    public void xoo(Set set, int i, int k) {\n");
-		buf.append("       int j= 0;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");	
-		buf.append("import java.util.Set;\n");
-		buf.append("\n");	
-		buf.append("public class X {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     */\n");
-		buf.append("    public void xoo(int i) {\n");
-		buf.append("       int j= 0;\n");		
-		buf.append("    }\n");
-		buf.append("\n");		
-		buf.append("    public void xoo(Set empty_set, int i, int j) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	
-	
-	
-	public void testSuperConstructorMoreArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public X() {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);		
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E extends X {\n");
-		buf.append("    public E() {\n");
-		buf.append("        super(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E extends X {\n");
-		buf.append("    public E() {\n");
-		buf.append("        super();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class X {\n");
-		buf.append("    public X() {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public X(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class X {\n");
-		buf.append("    public X(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testConstructorInvocationMoreArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("        this();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("    public E(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}	
-		
-	public void testConstructorInvocationMoreArguments2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * My favourite constructor.\n");
-		buf.append("     */\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * My favourite constructor.\n");
-		buf.append("     */\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("        this();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * My favourite constructor.\n");
-		buf.append("     * @param vector\n");
-		buf.append("     */\n");
-		buf.append("    public E(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * My favourite constructor.\n");
-		buf.append("     */\n");
-		buf.append("    public E() {\n");
-		buf.append("    }\n");
-		buf.append("    public E(Object o, int i) {\n");
-		buf.append("        this(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("    public E(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}	
-
-	
-	
-	public void testParameterMismatchSwap() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i, Object o) {\n");
-		buf.append("        foo(new Object[] { o }, i - 1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i, Object o) {\n");
-		buf.append("        foo(i - 1, new Object[] { o });\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i, Object o) {\n");
-		buf.append("        foo(new Object[] { o }, i - 1);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private void foo(Object[] objects, int i) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o, int i) {\n");
-		buf.append("        foo(new Object[] { o }, i - 1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testParameterMismatchSwap2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     * @param o The Object value\n");
-		buf.append("     * @param b The boolean value\n");
-		buf.append("     *                  More about the boolean value\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int i, Object o, boolean b) {\n");
-		buf.append("        foo(false, o, i - 1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     * @param o The Object value\n");
-		buf.append("     * @param b The boolean value\n");
-		buf.append("     *                  More about the boolean value\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int i, Object o, boolean b) {\n");
-		buf.append("        foo(i - 1, o, false);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     * @param o The Object value\n");
-		buf.append("     * @param b The boolean value\n");
-		buf.append("     *                  More about the boolean value\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(int i, Object o, boolean b) {\n");
-		buf.append("        foo(false, o, i - 1);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private void foo(boolean b, Object o, int i) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param b The boolean value\n");
-		buf.append("     *                  More about the boolean value\n");
-		buf.append("     * @param o The Object value\n");
-		buf.append("     * @param i The int value\n");
-		buf.append("     */\n");
-		buf.append("    public void foo(boolean b, Object o, int i) {\n");
-		buf.append("        foo(false, o, i - 1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}		
-	
-	public void testSuperConstructor() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends A {\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        super(i);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1=pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("\n");
-		buf.append("    public A(int i) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends A {\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        super();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	
-	public void testClassInstanceCreation() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A(i);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1=pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("\n");
-		buf.append("    public A(int i) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();		
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-
-	public void testClassInstanceCreation2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A(\"test\");\n");
-		buf.append("    }\n");
-		buf.append("    class A {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1=pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A(\"test\");\n");
-		buf.append("    }\n");
-		buf.append("    class A {\n");
-		buf.append("\n");
-		buf.append("        public A(String string) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A();\n");
-		buf.append("    }\n");
-		buf.append("    class A {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-
-	
-	public void testClassInstanceCreationMoreArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A(i, String.valueOf(i), true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1=pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public A(int i) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public A(int i, String string, boolean b) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A(i);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public A(int i) {\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public A(int i, String string, boolean b) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();			
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}	
-
-	public void testClassInstanceCreationLessArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1=pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public A(int i, String s) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public A() {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        A a= new A(i, null);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("    public A(int i, String s) {\n");
-		buf.append("    }\n");	
-		buf.append("\n");
-		buf.append("    public A() {\n");
-		buf.append("    }\n");	
-		buf.append("}\n");
-		String expected3= buf.toString();			
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}		
-	
-	
-	public void testConstructorInvocation() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        this(i, true);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1=pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public E(int i) {\n");
-		buf.append("        this(i, true);\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public E(int i, boolean b) {\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();
-				
-		assertEqualString(preview1, expected1);
-	}
-		
-	public void testSuperMethodInvocation() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends A {\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("        super.foo(i);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1=pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("A.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-
-		NewMethodCompletionProposal proposal= (NewMethodCompletionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class A {\n");
-		buf.append("\n");
-		buf.append("    public void foo(int i) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-
-	}
-	
-	public void testSuperMethodMoreArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);		
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E extends X {\n");
-		buf.append("    public void xoo() {\n");
-		buf.append("        super.foo(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E extends X {\n");
-		buf.append("    public void xoo() {\n");
-		buf.append("        super.foo();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class X {\n");
-		buf.append("    public int foo(Vector vector) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class X {\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public void foo(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	public void testSuperMethodLessArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public int foo(Object o, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("X.java", buf.toString(), false, null);		
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E extends X {\n");
-		buf.append("    public void xoo() {\n");
-		buf.append("        super.foo(new Vector());\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E extends X {\n");
-		buf.append("    public void xoo() {\n");
-		buf.append("        super.foo(new Vector(), false);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class X {\n");
-		buf.append("    public int foo(Object o) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class X {\n");
-		buf.append("    public int foo(Object o, boolean b) {\n");
-		buf.append("        return 0;\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    public void foo(Vector vector) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-	}
-	
-	
-	public void testMissingCastParents1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        String x= (String) o.substring(1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        String x= ((String) o).substring(1);\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();		
-
-		assertEqualString(preview1, expected1);
-	}
-	
-	public void testMissingCastParents2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        String x= (String) o.substring(1).toLowerCase();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object o) {\n");
-		buf.append("        String x= ((String) o).substring(1).toLowerCase();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();		
-
-		assertEqualString(preview1, expected1);
-	}
-	
-	public void testMissingCastParents3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static Object obj;\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        String x= (String) E.obj.substring(1).toLowerCase();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static Object obj;\n");
-		buf.append("    public void foo() {\n");
-		buf.append("        String x= ((String) E.obj).substring(1).toLowerCase();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();		
-
-		assertEqualString(preview1, expected1);
-	}
-	
-	public void testArrayAccess() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static Object obj;\n");
-		buf.append("    public String foo(Object[] array) {\n");
-		buf.append("        return array.tostring();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static Object obj;\n");
-		buf.append("    public String foo(Object[] array) {\n");
-		buf.append("        return array.toString();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static Object obj;\n");
-		buf.append("    public String foo(Object[] array) {\n");
-		buf.append("        return array.length;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-	
-	public void testIncompleteThrowsStatement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object[] array) {\n");
-		buf.append("        throw RuntimeException();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object[] array) {\n");
-		buf.append("        throw new RuntimeException();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();	
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(Object[] array) {\n");
-		buf.append("        throw RuntimeException();\n");
-		buf.append("    }\n");
-		buf.append("\n");
-		buf.append("    private Exception RuntimeException() {\n");
-		buf.append("        return null;\n");
-		buf.append("    }\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-
-	}
-
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedTypesQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedTypesQuickFixTest.java
deleted file mode 100644
index d1d8de5..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedTypesQuickFixTest.java
+++ /dev/null

@@ -1,1179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.NewCUCompletionUsingWizardProposal;
-
-public class UnresolvedTypesQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= UnresolvedTypesQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public UnresolvedTypesQuickFixTest(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (true) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new UnresolvedTypesQuickFixTest("testInnerType"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-	public static Test setUpTest(Test test) {
-		return new ProjectTestSetup(test);
-	}
-	
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		JavaCore.setOptions(options);
-		
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-				
-		fJProject1= ProjectTestSetup.getProject();
-
-		String newFileTemplate= "${package_declaration}\n\n${type_declaration}";
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.NEWTYPE).setPattern(newFileTemplate);
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.TYPECOMMENT).setPattern("");
-
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-		
-	public void testTypeInFieldDecl() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    Vector1 vec;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("    Vector vec;\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(1);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("Vector1.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public class Vector1 {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-		JavaProjectHelper.performDummySearch();
-		newCU.delete(true, null);
-
-		newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(2);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		newCU= pack1.getCompilationUnit("Vector1.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public interface Vector1 {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-	}
-
-	public void testTypeInMethodArguments() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vect1or[] vec) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector[] vec) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(1);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("Vect1or.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public class Vect1or {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-		JavaProjectHelper.performDummySearch();
-		newCU.delete(true, null);
-
-		newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(2);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		newCU= pack1.getCompilationUnit("Vect1or.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public interface Vect1or {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-	}
-	
-	public void testTypeInMethodReturnType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    Vect1or[] foo() {\n");
-		buf.append("        return null;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("    Vector[] foo() {\n");
-		buf.append("        return null;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(1);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("Vect1or.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public class Vect1or {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-		JavaProjectHelper.performDummySearch();
-		newCU.delete(true, null);
-
-		newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(2);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		newCU= pack1.getCompilationUnit("Vect1or.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public interface Vect1or {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-	}
-
-	public void testTypeInExceptionType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() throws IOExcpetion {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.IOException;\n");
-		buf.append("\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() throws IOException {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(1);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("IOExcpetion.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public class IOExcpetion extends Exception {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-		JavaProjectHelper.performDummySearch();
-		newCU.delete(true, null);
-	}
-	
-	
-	public void testTypeInStatement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");		
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        ArrayList v= new ArrayListist();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.ArrayList;\n");		
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        ArrayList v= new ArrayList();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(1);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("ArrayListist.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.util.ArrayList;\n");
-		buf.append("\n");
-		buf.append("public class ArrayListist extends ArrayList {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-	}	
-		
-
-	public void testArrayTypeInStatement() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.*;\n");		
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        Serializable[] v= new ArrayListExtra[10];\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 4);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        Serializable[] v= new Serializable[10];\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		preview= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.*;\n");
-		buf.append("import java.util.ArrayList;\n");		
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        Serializable[] v= new ArrayList[10];\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(2);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("ArrayListExtra.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.Serializable;\n");
-		buf.append("\n");
-		buf.append("public class ArrayListExtra implements Serializable {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-		JavaProjectHelper.performDummySearch();
-		newCU.delete(true, null);
-
-		newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(3);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		newCU= pack1.getCompilationUnit("ArrayListExtra.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("import java.io.Serializable;\n");
-		buf.append("\n");
-		buf.append("public interface ArrayListExtra extends Serializable {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-	}
-	
-	public void testQualifiedType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        test2.Test t= null;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(0);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= fSourceFolder.getPackageFragment("test2").getCompilationUnit("Test.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("\n");		
-		buf.append("public class Test {\n");
-		buf.append("\n");		
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-		JavaProjectHelper.performDummySearch();
-		newCU.delete(true, null);
-
-		newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(1);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		newCU= fSourceFolder.getPackageFragment("test2").getCompilationUnit("Test.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("\n");		
-		buf.append("public interface Test {\n");
-		buf.append("\n");		
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());		
-		
-	}
-	
-	public void testInnerType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        Object object= new F.Inner() {\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("}\n");
-		ICompilationUnit cu2= pack1.createCompilationUnit("F.java", buf.toString(), false, null);
-
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        Object object= new Object() {\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		assertEqualString(preview, buf.toString());
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(1);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public class Inner {\n");
-		buf.append("\n");				
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(cu2.getSource(), buf.toString());
-
-		cu2.getType("F").getType("Inner").delete(true, null);
-
-		newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(2);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public interface Inner {\n");
-		buf.append("\n");				
-		buf.append("    }\n");		
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(cu2.getSource(), buf.toString());		
-	
-	}
-	
-
-
-
-	public void testTypeInCatchBlock() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        try {\n");		
-		buf.append("        } catch (XXX x) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(0);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("XXX.java");
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");			
-		buf.append("public class XXX extends Exception {\n");
-		buf.append("\n");	
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-	}
-	
-	public void testTypeInSuperType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E extends XXX {\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(0);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("XXX.java");
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");			
-		buf.append("public class XXX {\n");
-		buf.append("\n");	
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-	}
-	
-	public void testTypeInSuperInterface() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public interface E extends XXX {\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOfProposals(proposals, 1);
-		assertCorrectLabels(proposals);
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(0);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("XXX.java");
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");			
-		buf.append("public interface XXX {\n");
-		buf.append("\n");	
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-	}
-	
-	public void testPrimitiveTypeInFieldDecl() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    floot vec= 1.0;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 5);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    double vec= 1.0;\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    Float vec= 1.0;\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    float vec= 1.0;\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });		
-
-		
-		
-		NewCUCompletionUsingWizardProposal newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(3);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		ICompilationUnit newCU= pack1.getCompilationUnit("floot.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");
-		buf.append("public class floot {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-		JavaProjectHelper.performDummySearch();
-		newCU.delete(true, null);
-
-		newCUWizard= (NewCUCompletionUsingWizardProposal) proposals.get(4);
-		newCUWizard.setShowDialog(false);
-		newCUWizard.apply(null);
-		
-		newCU= pack1.getCompilationUnit("floot.java");
-		assertTrue("Nothing created", newCU.exists());
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("\n");		
-		buf.append("public interface floot {\n");
-		buf.append("\n");
-		buf.append("}\n");
-		assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());	
-	}
-
-
-	private void createSomeAmbiguity(boolean ifc, boolean isException) throws Exception {
-
-		IPackageFragment pack3= fSourceFolder.createPackageFragment("test3", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public "); buf.append(ifc ? "interface" : "class");
-		buf.append(" A "); buf.append(isException ? "extends Exception " : ""); buf.append("{\n");
-		buf.append("}\n");
-		pack3.createCompilationUnit("A.java", buf.toString(), false, null);
-	
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class B {\n");
-		buf.append("}\n");
-		pack3.createCompilationUnit("B.java", buf.toString(), false, null);
-			
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public "); buf.append(ifc ? "interface" : "class");
-		buf.append(" A "); buf.append(isException ? "extends Exception " : ""); buf.append("{\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("A.java", buf.toString(), false, null);
-			
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class C {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("C.java", buf.toString(), false, null);
-	}
-
-
-	public void testAmbiguousTypeInSuperClass() throws Exception {
-		createSomeAmbiguity(false, false);
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("public class E extends A {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test2.A;\n");
-		buf.append("import test3.*;\n");
-		buf.append("public class E extends A {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("import test3.A;\n");
-		buf.append("public class E extends A {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-
-	public void testAmbiguousTypeInInterface() throws Exception {
-		createSomeAmbiguity(true, false);
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("public class E implements A {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test2.A;\n");
-		buf.append("import test3.*;\n");
-		buf.append("public class E implements A {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("import test3.A;\n");
-		buf.append("public class E implements A {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-
-	public void testAmbiguousTypeInField() throws Exception {
-		createSomeAmbiguity(true, false);
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("public class E {\n");
-		buf.append("    A a;\n");	
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test2.A;\n");
-		buf.append("import test3.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    A a;\n");	
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("import test3.A;\n");
-		buf.append("public class E {\n");
-		buf.append("    A a;\n");	
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	public void testAmbiguousTypeInArgument() throws Exception {
-		createSomeAmbiguity(true, false);
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo(A a) {");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test2.A;\n");
-		buf.append("import test3.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo(A a) {");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("import test3.A;\n");
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo(A a) {");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	public void testAmbiguousTypeInReturnType() throws Exception {
-		createSomeAmbiguity(false, false);
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public A foo() {");
-		buf.append("        return null;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test2.A;\n");
-		buf.append("import test3.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public A foo() {");
-		buf.append("        return null;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("import test3.A;\n");
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public A foo() {");
-		buf.append("        return null;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	public void testAmbiguousTypeInExceptionType() throws Exception {
-		createSomeAmbiguity(false, true);
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo() throws A {");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test2.A;\n");
-		buf.append("import test3.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo() throws A {");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("import test3.A;\n");
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo() throws A {");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}
-	
-	public void testAmbiguousTypeInCatchBlock() throws Exception {
-		createSomeAmbiguity(false, true);
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo() {");
-		buf.append("        try {\n");
-		buf.append("        } catch (A e) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOfProposals(proposals, 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test2.A;\n");
-		buf.append("import test3.*;\n");
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo() {");
-		buf.append("        try {\n");
-		buf.append("        } catch (A e) {\n");		
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test2.*;\n");
-		buf.append("import test3.*;\n");		
-		buf.append("import test3.A;\n");
-		buf.append("public class E {\n");
-		buf.append("    B b;\n");
-		buf.append("    C c;\n");		
-		buf.append("    public void foo() {");
-		buf.append("        try {\n");
-		buf.append("        } catch (A e) {\n");		
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });
-	}	
-	
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedVariablesQuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedVariablesQuickFixTest.java
deleted file mode 100644
index 1627e38..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/UnresolvedVariablesQuickFixTest.java
+++ /dev/null

@@ -1,1191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.quickfix;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
-
-import org.eclipse.jdt.internal.corext.template.java.CodeTemplateContextType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.text.correction.CUCorrectionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.NewCUCompletionUsingWizardProposal;
-import org.eclipse.jdt.internal.ui.text.correction.NewVariableCompletionProposal;
-import org.eclipse.jdt.internal.ui.text.correction.RenameNodeCompletionProposal;
-
-public class UnresolvedVariablesQuickFixTest extends QuickFixTest {
-	
-	private static final Class THIS= UnresolvedVariablesQuickFixTest.class;
-	
-	private IJavaProject fJProject1;
-	private IPackageFragmentRoot fSourceFolder;
-
-	public UnresolvedVariablesQuickFixTest(String name) {
-		super(name);
-	}
-
-	public static Test allTests() {
-		return new ProjectTestSetup(new TestSuite(THIS));
-	}
-	
-	public static Test suite() {
-		if (false) {
-			return allTests();
-		} else {
-			TestSuite suite= new TestSuite();
-			suite.addTest(new UnresolvedVariablesQuickFixTest("testVarInForInitializer2"));
-			return new ProjectTestSetup(suite);
-		}
-	}
-
-
-	protected void setUp() throws Exception {
-		Hashtable options= TestOptions.getFormatterOptions();
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaCore.SPACE);
-		options.put(DefaultCodeFormatterConstants.FORMATTER_NUMBER_OF_EMPTY_LINES_TO_PRESERVE, "1");
-		options.put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4");
-		options.put(JavaCore.COMPILER_PB_UNUSED_IMPORT, JavaCore.IGNORE);		
-		JavaCore.setOptions(options);			
-
-		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-		store.setValue(PreferenceConstants.CODEGEN_ADD_COMMENTS, false);
-		
-		fJProject1= ProjectTestSetup.getProject();
-		
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.NEWTYPE).setPattern("");
-		JavaPlugin.getDefault().getCodeTemplateStore().findTemplate(CodeTemplateContextType.TYPECOMMENT).setPattern("");
-		
-		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
-	}
-
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
-	}
-	
-	public void testVarInAssignment() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        iter= vec.iterator();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOf("proposals", proposals.size(), 4);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    private Iterator iter;\n");
-		buf.append("\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        iter= vec.iterator();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("        Iterator iter = vec.iterator();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Iterator;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec, Iterator iter) {\n");
-		buf.append("        iter= vec.iterator();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(3);
-		String preview4= getPreviewContent(proposal);
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.util.Vector;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Vector vec) {\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected4= buf.toString();
-	
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3, preview4 }, new String[] { expected1, expected2, expected3, expected4 });	
-	}
-
-	public void testVarInForInitializer() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (i= 0;;) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOf("proposals", proposals.size(), 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int i;\n");
-		buf.append("\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (i= 0;;) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();	
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (int i = 0;;) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(int i) {\n");
-		buf.append("        for (i= 0;;) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });	
-	}
-	
-	public void testVarInForInitializer2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @return Returns a number\n");
-		buf.append("     */\n");
-		buf.append("    int foo() {\n");
-		buf.append("        for (i= new int[] { 1 };;) {\n");
-		buf.append("        }\n");
-		buf.append("        return 0;\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOf("proposals", proposals.size(), 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int[] i;\n");
-		buf.append("\n");
-		buf.append("    /**\n");
-		buf.append("     * @return Returns a number\n");
-		buf.append("     */\n");
-		buf.append("    int foo() {\n");
-		buf.append("        for (i= new int[] { 1 };;) {\n");
-		buf.append("        }\n");
-		buf.append("        return 0;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();	
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @return Returns a number\n");
-		buf.append("     */\n");
-		buf.append("    int foo() {\n");
-		buf.append("        for (int[] i = new int[] { 1 };;) {\n");
-		buf.append("        }\n");
-		buf.append("        return 0;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    /**\n");
-		buf.append("     * @param i\n");
-		buf.append("     * @return Returns a number\n");
-		buf.append("     */\n");
-		buf.append("    int foo(int[] i) {\n");
-		buf.append("        for (i= new int[] { 1 };;) {\n");
-		buf.append("        }\n");
-		buf.append("        return 0;\n");	
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3 }, new String[] { expected1, expected2, expected3 });	
-	}	
-	
-	
-	public void testVarInInitializer() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int i= k;\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOf("proposals", proposals.size(), 2);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int k;\n");
-		buf.append("    private int i= k;\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static final int k = 0;\n");
-		buf.append("    private int i= k;\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });	
-	}
-	
-	public void testVarInOtherType() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    void foo(E e) {\n");
-		buf.append("         e.var2= 2;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("F.java", buf.toString(), false, null);		
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    protected int var1;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOf("proposals", proposals.size(), 2);
-		assertCorrectLabels(proposals);
-
-		boolean doNew= true, doChange= true;
-		for (int i= 0; i < proposals.size(); i++) {
-			Object curr= proposals.get(i);
-			if (curr instanceof NewVariableCompletionProposal) {
-				assertTrue("2 new proposals", doNew);
-				doNew= false;
-				NewVariableCompletionProposal proposal= (NewVariableCompletionProposal) curr;
-				String preview= getPreviewContent(proposal);
-	
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class E {\n");
-				buf.append("    protected int var1;\n");
-				buf.append("    public int var2;\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			} else if (curr instanceof CUCorrectionProposal) {
-				assertTrue("2 replace proposals", doChange);
-				doChange= false;
-				CUCorrectionProposal proposal= (CUCorrectionProposal) curr;
-				String preview= getPreviewContent(proposal);
-	
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("public class F {\n");
-				buf.append("    void foo(E e) {\n");
-				buf.append("         e.var1= 2;\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			}
-		}
-	}
-	
-	public void testVarInSuperFieldAccess() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F extends E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("         super.var2= 2;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("F.java", buf.toString(), false, null);		
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    protected int var1;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOf("proposals", proposals.size(), 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-	
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F extends E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("         super.var1= 2;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-	
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    protected int var1;\n");
-		buf.append("    public int var2;\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testVarInSuper() throws Exception {
-		StringBuffer buf= new StringBuffer();
-
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test3.E;\n");
-		buf.append("public class F extends E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("         this.color= baz();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("F.java", buf.toString(), false, null);		
-
-		IPackageFragment pack2= fSourceFolder.createPackageFragment("test2", false, null);
-		buf= new StringBuffer();
-		buf.append("package test2;\n");
-		buf.append("public class E {\n");
-		buf.append("}\n");
-		pack2.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		IPackageFragment pack3= fSourceFolder.createPackageFragment("test3", false, null);
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    protected Object olor;\n");
-		buf.append("    public test2.E baz() {\n");
-		buf.append("        return null;\n");		
-		buf.append("    }\n");				
-		buf.append("}\n");
-		pack3.createCompilationUnit("E.java", buf.toString(), false, null);		
-		
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOf("proposals", proposals.size(), 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-	
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test3.E;\n");
-		buf.append("public class F extends E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("         this.olor= baz();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-	
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import test3.E;\n");
-		buf.append("public class F extends E {\n");
-		buf.append("    private test2.E color;\n");
-		buf.append("\n");
-		buf.append("    void foo() {\n");
-		buf.append("         this.color= baz();\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}	
-	
-	
-	public void testVarInAnonymous() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-				
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int fcount) {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                fCount= 7;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOf("proposals", proposals.size(), 6);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int fcount) {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            private int fCount;\n");
-		buf.append("\n");
-		buf.append("            public void run() {\n");
-		buf.append("                fCount= 7;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    protected int fCount;\n");
-		buf.append("\n");
-		buf.append("    public void foo(int fcount) {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                fCount= 7;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(2);
-		String preview3= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int fcount) {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                int fCount = 7;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected3= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(3);
-		String preview4= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int fcount) {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run(int fCount) {\n");
-		buf.append("                fCount= 7;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected4= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(4);
-		String preview5= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int fcount) {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("                fcount= 7;\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected5= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(5);
-		String preview6= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public void foo(int fcount) {\n");
-		buf.append("        new Runnable() {\n");
-		buf.append("            public void run() {\n");
-		buf.append("            }\n");
-		buf.append("        };\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected6= buf.toString();			
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2, preview3, preview4, preview5, preview6 }, new String[] { expected1, expected2, expected3, expected4, expected5, expected6 });		
-	}
-	
-	public void testLongVarRef() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public int mash;\n");
-		buf.append("    void foo(E e) {\n");
-		buf.append("         e.var.hash= 2;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("F.java", buf.toString(), false, null);		
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    public F var;\n");
-		buf.append("}\n");
-		pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOf("proposals", proposals.size(), 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public int mash;\n");
-		buf.append("    private int hash;\n");
-		buf.append("    void foo(E e) {\n");
-		buf.append("         e.var.hash= 2;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class F {\n");
-		buf.append("    public int mash;\n");
-		buf.append("    void foo(E e) {\n");
-		buf.append("         e.var.mash= 2;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected2= buf.toString();			
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2}, new String[] { expected1, expected2});		
-	}	
-
-	public void testVarAndTypeRef() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("import java.io.File;\n");
-		buf.append("public class F {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        char ch= Fixe.pathSeparatorChar;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu1= pack1.createCompilationUnit("F.java", buf.toString(), false, null);		
-
-		CompilationUnit astRoot= getASTRoot(cu1);
-		ArrayList proposals= collectCorrections(cu1, astRoot);
-		assertNumberOf("proposals", proposals.size(), 7);
-		assertCorrectLabels(proposals);
-
-		boolean doField= true, doParam= true, doLocal= true, doConst= true, doInterface= true, doClass= true, doChange= true;
-		for (int i= 0; i < proposals.size(); i++) {
-			Object curr= proposals.get(i);
-			if (curr instanceof NewVariableCompletionProposal) {
-				NewVariableCompletionProposal proposal= (NewVariableCompletionProposal) proposals.get(i);
-				String preview= getPreviewContent(proposal);
-	
-				if (proposal.getVariableKind() == NewVariableCompletionProposal.FIELD) {
-					assertTrue("2 field proposals", doField);
-					doField= false;
-					
-					buf= new StringBuffer();
-					buf.append("package test1;\n");
-					buf.append("import java.io.File;\n");
-					buf.append("public class F {\n");
-					buf.append("    private Object Fixe;\n");
-					buf.append("\n");
-					buf.append("    void foo() {\n");
-					buf.append("        char ch= Fixe.pathSeparatorChar;\n");
-					buf.append("    }\n");
-					buf.append("}\n");
-					assertEqualString(preview, buf.toString());
-				} else if (proposal.getVariableKind() == NewVariableCompletionProposal.LOCAL) {
-					assertTrue("2 local proposals", doLocal);
-					doLocal= false;
-					
-					buf= new StringBuffer();
-					buf.append("package test1;\n");
-					buf.append("import java.io.File;\n");
-					buf.append("public class F {\n");
-					buf.append("    void foo() {\n");
-					buf.append("        Object Fixe;\n");					
-					buf.append("        char ch= Fixe.pathSeparatorChar;\n");
-					buf.append("    }\n");
-					buf.append("}\n");
-					assertEqualString(preview, buf.toString());
-				} else if (proposal.getVariableKind() == NewVariableCompletionProposal.PARAM) {
-					assertTrue("2 param proposals", doParam);
-					doParam= false;
-					
-					buf= new StringBuffer();
-					buf.append("package test1;\n");
-					buf.append("import java.io.File;\n");
-					buf.append("public class F {\n");
-					buf.append("    void foo(Object Fixe) {\n");
-					buf.append("        char ch= Fixe.pathSeparatorChar;\n");
-					buf.append("    }\n");
-					buf.append("}\n");
-					assertEqualString(preview, buf.toString());
-				} else if (proposal.getVariableKind() == NewVariableCompletionProposal.CONST_FIELD) {
-					assertTrue("2 const proposals", doConst);
-					doConst= false;
-					
-					buf= new StringBuffer();
-					buf.append("package test1;\n");
-					buf.append("import java.io.File;\n");
-					buf.append("public class F {\n");
-					buf.append("    private static final String Fixe = null;\n");
-					buf.append("\n");
-					buf.append("    void foo() {\n");
-					buf.append("        char ch= Fixe.pathSeparatorChar;\n");
-					buf.append("    }\n");
-					buf.append("}\n");
-					assertEqualString(preview, buf.toString());
-					
-				} else {
-					assertTrue("unknown type", false);
-				}
-			} else if (curr instanceof NewCUCompletionUsingWizardProposal) {
-				NewCUCompletionUsingWizardProposal proposal= (NewCUCompletionUsingWizardProposal) curr;
-				proposal.setShowDialog(false);
-				proposal.apply(null);
-				
-				ICompilationUnit newCU= pack1.getCompilationUnit("Fixe.java");
-				assertTrue("Nothing created", newCU.exists());
-
-				if (proposal.isClass()) {
-					assertTrue("2 class proposals", doClass);
-					doClass= false;
-
-					buf= new StringBuffer();
-					buf.append("package test1;\n");
-					buf.append("\n");
-					buf.append("public class Fixe {\n");
-					buf.append("\n");
-					buf.append("}\n");
-					assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-					JavaProjectHelper.performDummySearch();
-					newCU.delete(true, null);
-				} else {
-					assertTrue("2 interface proposals", doInterface);
-					doInterface= false;					
-					
-					buf= new StringBuffer();
-					buf.append("package test1;\n");
-					buf.append("\n");
-					buf.append("public interface Fixe {\n");
-					buf.append("\n");
-					buf.append("}\n");
-					assertEqualStringIgnoreDelim(newCU.getSource(), buf.toString());
-					JavaProjectHelper.performDummySearch();
-					newCU.delete(true, null);
-				}
-			} else {
-				assertTrue("2 replace proposals", doChange);
-				doChange= false;
-				CUCorrectionProposal proposal= (CUCorrectionProposal) curr;
-				String preview= getPreviewContent(proposal);
-	
-				buf= new StringBuffer();
-				buf.append("package test1;\n");
-				buf.append("import java.io.File;\n");
-				buf.append("public class F {\n");
-				buf.append("    void foo() {\n");
-				buf.append("        char ch= File.pathSeparatorChar;\n");
-				buf.append("    }\n");
-				buf.append("}\n");
-				assertEqualString(preview, buf.toString());
-			}
-		}		
-	
-	}
-
-	public void testSimilarVariableNames1() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test3", false, null);
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static final short CON1= 1;\n");
-		buf.append("    private static final float CON2= 1.0f;\n");
-		buf.append("    private String bla;\n");
-		buf.append("    private String cout;\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return count;\n");		
-		buf.append("    }\n");				
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		for (int i= proposals.size() - 1; i >= 0; i--) {
-			Object curr= proposals.get(i);
-			if (!(curr instanceof RenameNodeCompletionProposal)) {
-				proposals.remove(i);
-			}
-		}
-		
-		assertNumberOf("proposals", proposals.size(), 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static final short CON1= 1;\n");
-		buf.append("    private static final float CON2= 1.0f;\n");
-		buf.append("    private String bla;\n");
-		buf.append("    private String cout;\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return CON1;\n");		
-		buf.append("    }\n");				
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static final short CON1= 1;\n");
-		buf.append("    private static final float CON2= 1.0f;\n");
-		buf.append("    private String bla;\n");
-		buf.append("    private String cout;\n");
-		buf.append("    public int foo() {\n");
-		buf.append("        return cout;\n");		
-		buf.append("    }\n");				
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testSimilarVariableNames2() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test3", false, null);
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static final short CON1= 1;\n");
-		buf.append("    private static final float CON2= 1.0f;\n");
-		buf.append("    private static short var1= 1;\n");
-		buf.append("    private static float var2= 1.0f;\n");
-		buf.append("    private String bla;\n");
-		buf.append("    private String cout;\n");
-		buf.append("    public void foo(int x) {\n");
-		buf.append("        count= x;\n");		
-		buf.append("    }\n");				
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		for (int i= proposals.size() - 1; i >= 0; i--) {
-			Object curr= proposals.get(i);
-			if (!(curr instanceof RenameNodeCompletionProposal)) {
-				proposals.remove(i);
-			}
-		}
-		
-		assertNumberOf("proposals", proposals.size(), 2);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static final short CON1= 1;\n");
-		buf.append("    private static final float CON2= 1.0f;\n");
-		buf.append("    private static short var1= 1;\n");
-		buf.append("    private static float var2= 1.0f;\n");
-		buf.append("    private String bla;\n");
-		buf.append("    private String cout;\n");
-		buf.append("    public void foo(int x) {\n");
-		buf.append("        var2= x;\n");		
-		buf.append("    }\n");				
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		proposal= (CUCorrectionProposal) proposals.get(1);
-		String preview2= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    private static final short CON1= 1;\n");
-		buf.append("    private static final float CON2= 1.0f;\n");
-		buf.append("    private static short var1= 1;\n");
-		buf.append("    private static float var2= 1.0f;\n");
-		buf.append("    private String bla;\n");
-		buf.append("    private String cout;\n");
-		buf.append("    public void foo(int x) {\n");
-		buf.append("        cout= x;\n");		
-		buf.append("    }\n");				
-		buf.append("}\n");
-		String expected2= buf.toString();
-
-		assertEqualStringsIgnoreOrder(new String[] { preview1, preview2 }, new String[] { expected1, expected2 });		
-	}
-	
-	public void testSimilarVariableNamesMultipleOcc() throws Exception {
-		StringBuffer buf= new StringBuffer();
-		
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test3", false, null);
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int cout;\n");
-		buf.append("    public void setCount(int x) {\n");
-		buf.append("        count= x;\n");
-		buf.append("        count++;\n");	
-		buf.append("    }\n");
-		buf.append("    public int getCount() {\n");
-		buf.append("        return count;\n");	
-		buf.append("    }\n");			
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 3);
-		for (int i= proposals.size() - 1; i >= 0; i--) {
-			Object curr= proposals.get(i);
-			if (!(curr instanceof RenameNodeCompletionProposal)) {
-				proposals.remove(i);
-			}
-		}
-		
-		assertNumberOf("proposals", proposals.size(), 1);
-		assertCorrectLabels(proposals);
-
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-		
-		buf= new StringBuffer();
-		buf.append("package test3;\n");
-		buf.append("public class E {\n");
-		buf.append("    private int cout;\n");
-		buf.append("    public void setCount(int x) {\n");
-		buf.append("        cout= x;\n");
-		buf.append("        cout++;\n");	
-		buf.append("    }\n");
-		buf.append("    public int getCount() {\n");
-		buf.append("        return cout;\n");	
-		buf.append("    }\n");			
-		buf.append("}\n");
-		String expected1= buf.toString();
-
-		assertEqualString( preview1, expected1);
-	}
-	
-	public void testVarMultipleOccurances1() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (i= 0; i > 9; i++) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 3);
-		assertNumberOf("proposals", proposals.size(), 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal localProposal= null;
-		for (int i = 0; i < proposals.size(); i++) {
-			Object curr= proposals.get(i);
-			if (curr instanceof NewVariableCompletionProposal && ((NewVariableCompletionProposal) curr).getVariableKind() == NewVariableCompletionProposal.LOCAL) {
-				localProposal= (CUCorrectionProposal) curr;
-			}
-		}
-		assertNotNull(localProposal);
-		
-		String preview= getPreviewContent(localProposal);
-		buf= new StringBuffer();	
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (int i = 0; i > 9; i++) {\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-
-		assertEqualString(preview, expected);	
-	}	
-	
-	public void testVarMultipleOccurances2() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (i= 0; i > 9;) {\n");
-		buf.append("            i++;\n");
-		buf.append("        }\n");		
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 3);
-		assertNumberOf("proposals", proposals.size(), 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal localProposal= null;
-		for (int i = 0; i < proposals.size(); i++) {
-			Object curr= proposals.get(i);
-			if (curr instanceof NewVariableCompletionProposal && ((NewVariableCompletionProposal) curr).getVariableKind() == NewVariableCompletionProposal.LOCAL) {
-				localProposal= (CUCorrectionProposal) curr;
-			}
-		}
-		assertNotNull(localProposal);
-		
-		String preview= getPreviewContent(localProposal);
-		buf= new StringBuffer();	
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (int i = 0; i > 9;) {\n");
-		buf.append("            i++;\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-
-		assertEqualString(preview, expected);	
-	}
-	
-	public void testVarMultipleOccurances3() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        for (i = 0; i > 9;) {\n");
-		buf.append("        }\n");
-		buf.append("        i= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot, 3);
-		assertNumberOf("proposals", proposals.size(), 3);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal localProposal= null;
-		for (int i = 0; i < proposals.size(); i++) {
-			Object curr= proposals.get(i);
-			if (curr instanceof NewVariableCompletionProposal && ((NewVariableCompletionProposal) curr).getVariableKind() == NewVariableCompletionProposal.LOCAL) {
-				localProposal= (CUCorrectionProposal) curr;
-			}
-		}
-		assertNotNull(localProposal);
-		
-		String preview= getPreviewContent(localProposal);
-		buf= new StringBuffer();	
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo() {\n");
-		buf.append("        int i;\n");
-		buf.append("        for (i = 0; i > 9;) {\n");
-		buf.append("        }\n");
-		buf.append("        i= 9;\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected= buf.toString();
-
-		assertEqualString(preview, expected);	
-	}	
-
-	public void testVarInArray() throws Exception {
-		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
-		StringBuffer buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Object[] arr) {\n");
-		buf.append("        for (int i = 0; i > arr.lenght; i++) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		ICompilationUnit cu= pack1.createCompilationUnit("E.java", buf.toString(), false, null);
-		
-		CompilationUnit astRoot= getASTRoot(cu);
-		ArrayList proposals= collectCorrections(cu, astRoot);
-		assertNumberOf("proposals", proposals.size(), 1);
-		assertCorrectLabels(proposals);
-		
-		CUCorrectionProposal proposal= (CUCorrectionProposal) proposals.get(0);
-		String preview1= getPreviewContent(proposal);
-
-		buf= new StringBuffer();
-		buf.append("package test1;\n");
-		buf.append("public class E {\n");
-		buf.append("    void foo(Object[] arr) {\n");
-		buf.append("        for (int i = 0; i > arr.length; i++) {\n");
-		buf.append("        }\n");
-		buf.append("    }\n");
-		buf.append("}\n");
-		String expected1= buf.toString();
-		
-		assertEqualStringsIgnoreOrder(new String[] { preview1 }, new String[] { expected1 });	
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/FileAdapterTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/FileAdapterTest.java
deleted file mode 100644
index 5de1efc..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/FileAdapterTest.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.search;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.internal.ui.search.JavaSearchQuery;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResult;
-import org.eclipse.search.ui.text.IFileMatchAdapter;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- */
-public class FileAdapterTest extends TestCase {
-
-	public static Test allTests() {
-		return new JUnitSourceSetup(new TestSuite(FileAdapterTest.class));
-	}
-	
-	public static Test suite() {
-		return allTests();
-	}
-	
-	public FileAdapterTest(String name) {
-		super(name);
-	}
-	
-	public void testGetFile() throws Exception {
-		JavaSearchQuery query= SearchTest.runTypeRefQuery("junit.framework.Test");
-		JavaSearchResult result= (JavaSearchResult) query.getSearchResult();
-		IFileMatchAdapter adapter= result.getFileMatchAdapter();
-		Object[] elements= result.getElements();
-		for (int i= 0; i < elements.length; i++) {
-			IJavaElement je= (IJavaElement) elements[i];
-			IResource underlying= je.getUnderlyingResource();
-			if (underlying != null && underlying.getName().endsWith(".java")) {
-				assertEquals(underlying, adapter.getFile(je));
-			} else {
-				assertNull(adapter.getFile(je));
-			}
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/JUnitSourceSetup.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/JUnitSourceSetup.java
deleted file mode 100644
index 3ce70d0..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/JUnitSourceSetup.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.search;
-
-import java.io.File;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.search.SearchParticipantRecord;
-import org.eclipse.jdt.internal.ui.search.SearchParticipantsExtensionPoint;
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.testplugin.TestOptions;
-
-/**
- */
-public class JUnitSourceSetup extends TestSetup {
-	public static final String PROJECT_NAME= "JUnitSource";
-	public static final String SRC_CONTAINER= "src";
-	
-	private IJavaProject fProject;
-	private SearchParticipantsExtensionPoint fExtensionPoint;
-	
-	static class NullExtensionPoint extends SearchParticipantsExtensionPoint {
-		public SearchParticipantRecord[] getSearchParticipants(IProject[] concernedProjects) throws CoreException {
-			return new SearchParticipantRecord[0];
-		}
-	}
-	
-	public static IJavaProject getProject() {
-		IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
-		return JavaCore.create(project);
-	}
-
-	public JUnitSourceSetup(Test test, SearchParticipantsExtensionPoint participants) {
-		super(test);
-		fExtensionPoint= participants;
-	}
-	
-	public JUnitSourceSetup(Test test) {
-		this(test, new NullExtensionPoint());
-	}
-
-	protected void setUp() throws Exception {
-		SearchParticipantsExtensionPoint.debugSetInstance(fExtensionPoint);
-		fProject= JavaProjectHelper.createJavaProject(PROJECT_NAME, "bin"); //$NON-NLS-2$
-		IClasspathEntry jreLib= JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER"));  //$NON-NLS-1$
-		JavaProjectHelper.addToClasspath(fProject, jreLib);
-		File junitSrcArchive= JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.JUNIT_SRC);
-		JavaProjectHelper.addSourceContainerWithImport(fProject, SRC_CONTAINER, junitSrcArchive);
-		JavaCore.setOptions(TestOptions.getFormatterOptions());
-		TestOptions.initializeCodeGenerationOptions();
-		JavaPlugin.getDefault().getCodeTemplateStore().load();		
-	}
-	
-	/* (non-Javadoc)
-	 * @see junit.extensions.TestSetup#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		JavaProjectHelper.delete(fProject);
-		SearchParticipantsExtensionPoint.debugSetInstance(null);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/ParticipantTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/ParticipantTest.java
deleted file mode 100644
index a17fd09..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/ParticipantTest.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.search;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.search.JavaSearchQuery;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResult;
-import org.eclipse.jdt.internal.ui.search.SearchParticipantDescriptor;
-import org.eclipse.jdt.internal.ui.search.SearchParticipantRecord;
-import org.eclipse.jdt.internal.ui.search.SearchParticipantsExtensionPoint;
-import org.eclipse.jdt.ui.search.IQueryParticipant;
-
-/**
- */
-public class ParticipantTest extends TestCase {
-	
-	static class TestExtensionPoint extends SearchParticipantsExtensionPoint {
-		public SearchParticipantRecord[] getSearchParticipants(IProject[] concernedProjects) throws CoreException {
-			return new SearchParticipantRecord[] { new SearchParticipantRecord(new TestParticipantRecord(), new TestParticipant()) };
-		}
-	}
-	
-	static class TestParticipantRecord extends SearchParticipantDescriptor {
-
-		TestParticipantRecord() {
-			super(null);
-		}
-		
-		protected IStatus checkSyntax() {
-			return Status.OK_STATUS;
-		}
-
-		protected IQueryParticipant create() throws CoreException {
-			return new TestParticipant();
-		}
-
-		public String getID() {
-			return "TestParticipant1 ID";
-		}
-		
-		protected String getNature() {
-			return JavaCore.NATURE_ID;
-		}
-	}
-
-	public static Test allTests() {
-		return new JUnitSourceSetup(new TestSuite(ParticipantTest.class), new TestExtensionPoint());
-	}
-	
-	public static Test suite() {
-		return allTests();
-	}
-	
-	public ParticipantTest(String name) {
-		super(name);
-	}
-	
-	public void testSimpleParticipant() throws Exception {
-		JavaSearchQuery query= SearchTest.runMethodRefQuery("frufru", new String[0]);
-		JavaSearchResult result= (JavaSearchResult) query.getSearchResult();
-		assertEquals(20, result.getMatchCount());
-		
-		Object[] elements= result.getElements();
-		for (int i= 0; i < elements.length; i++) {
-			assertTrue(elements[i] instanceof Integer);
-		}
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchLeakTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchLeakTest.java
deleted file mode 100644
index 02cef7d..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchLeakTest.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.search;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.search2.internal.ui.InternalSearchUI;
-
-import org.eclipse.jdt.ui.leaktest.LeakTestCase;
-import org.eclipse.jdt.ui.leaktest.LeakTestSetup;
-
-import org.eclipse.jdt.internal.ui.search.JavaSearchQuery;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResult;
-
-/**
- */
-public class SearchLeakTest extends LeakTestCase {
-	public SearchLeakTest(String name) {
-		super(name);
-	}
-	
-	public static Test allTests() {
-		return new LeakTestSetup(new JUnitSourceSetup(new TestSuite(SearchLeakTest.class)));
-	}
-	
-	public static Test suite() {
-		return allTests();
-	}
-	
-	public void testRemoveSearchQueries() throws Exception {
-		JavaSearchQuery query1= SearchTest.runMethodRefQuery("junit.framework.Test", "countTestCases", new String[0]);
-		JavaSearchQuery query2= SearchTest.runMethodRefQuery("junit.framework.TestCase", "countTestCases", new String[0]);
-		InternalSearchUI.getInstance().removeQuery(query1);
-		InternalSearchUI.getInstance().removeQuery(query2);	
-		query1= null;
-		query2= null;
-		assertEquals(0, getInstanceCount(JavaSearchResult.class));
-	}
-	public void testRemoveAllQueries() throws Exception {
-		SearchTest.runMethodRefQuery("junit.framework.Test", "countTestCases", new String[0]);
-		SearchTest.runMethodRefQuery("junit.framework.TestCase", "countTestCases", new String[0]);
-		InternalSearchUI.getInstance().removeAllQueries();
-		assertEquals(0, getInstanceCount(JavaSearchResult.class));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchTest.java
deleted file mode 100644
index 63d0441..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchTest.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.search;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.search.ui.NewSearchUI;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-
-
-import org.eclipse.jdt.internal.ui.search.JavaSearchQuery;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResult;
-import org.eclipse.jdt.internal.ui.search.ReferenceScopeFactory;
-import org.eclipse.jdt.ui.search.ElementQuerySpecification;
-import org.eclipse.jdt.ui.search.PatternQuerySpecification;
-
-public class SearchTest {
-	public static Test suite() {
-		TestSuite suite= new TestSuite("Java Search Tests"); //$NON-NLS-1$
-		//suite.addTestSuite(WorkspaceScopeTest.class);
-		suite.addTest(WorkspaceReferenceTest.allTests());
-		suite.addTest(TreeContentProviderTest.allTests());
-		suite.addTest(ParticipantTest.allTests());
-		suite.addTest(FileAdapterTest.allTests());
-		return suite;
-	}
-
-	static int countMethodRefs(String TypeName, String methodName, String[] parameterTypes) throws JavaModelException {
-		JavaSearchQuery query= runMethodRefQuery(TypeName, methodName, parameterTypes);
-		JavaSearchResult result= (JavaSearchResult) query.getSearchResult();
-		return result.getMatchCount();
-	}
-	
-	static int countMethodRefs(String methodName, String[] parameterTypes) throws JavaModelException {
-		JavaSearchQuery query= runMethodRefQuery(methodName, parameterTypes);
-		JavaSearchResult result= (JavaSearchResult) query.getSearchResult();
-		return result.getMatchCount();
-	}
-
-
-	static JavaSearchQuery runMethodRefQuery(String TypeName, String methodName, String[] parameterTypes) throws JavaModelException {
-		IMethod method= getMethod(TypeName, methodName, parameterTypes);
-		NewSearchUI.activateSearchResultView();
-		JavaSearchQuery query= new JavaSearchQuery(new ElementQuerySpecification(method, IJavaSearchConstants.REFERENCES, ReferenceScopeFactory.createWorkspaceScope(true), "workspace scope"));
-		NewSearchUI.runQueryInForeground(null, query);
-		return query;
-	}
-
-	
-	static JavaSearchQuery runTypeRefQuery(String typeName) throws JavaModelException {
-		IType type= getType(typeName);
-		NewSearchUI.activateSearchResultView();
-		JavaSearchQuery query= new JavaSearchQuery(new ElementQuerySpecification(type, IJavaSearchConstants.REFERENCES, ReferenceScopeFactory.createWorkspaceScope(true), "workspace scope"));
-		NewSearchUI.runQueryInForeground(null, query);
-		return query;
-	}
-
-	static JavaSearchQuery runMethodRefQuery(String methodName, String[] parameterTypes) throws JavaModelException {
-		NewSearchUI.activateSearchResultView();
-		JavaSearchQuery query= new JavaSearchQuery(new PatternQuerySpecification(methodName, IJavaSearchConstants.METHOD, true, IJavaSearchConstants.REFERENCES, ReferenceScopeFactory.createWorkspaceScope(true), "workspace scope"));
-		NewSearchUI.runQueryInForeground(null, query);
-		return query;
-	}
-
-	static IMethod getMethod(String TypeName, String methodName, String[] parameterTypes) throws JavaModelException {
-		IType type= getType(TypeName);
-		if (type == null)
-			return null;
-		IMethod method= type.getMethod(methodName, parameterTypes);
-		return method;
-	}
-
-	static IType getType(String TypeName) throws JavaModelException {
-		IJavaProject p= JUnitSourceSetup.getProject();
-		IType type= p.findType(TypeName);
-		return type;
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/TestParticipant.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/TestParticipant.java
deleted file mode 100644
index 502f448..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/TestParticipant.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.search;
-
-import java.util.Random;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.search.IQueryParticipant;
-import org.eclipse.jdt.ui.search.ISearchRequestor;
-import org.eclipse.jdt.ui.search.IMatchPresentation;
-import org.eclipse.jdt.ui.search.QuerySpecification;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PartInitException;
-
-/**
- */
-public class TestParticipant implements IQueryParticipant {
-	private static final Random fgRandom= new Random();
-	private IMatchPresentation fUIParticipant;
-
-	public TestParticipant() {
-		fUIParticipant= new TestUIParticipant();
-	}
-	
-	public void search(ISearchRequestor requestor, QuerySpecification data, IProgressMonitor monitor) throws CoreException {
-		for (int i= 0; i < 20; i++) {
-			requestor.reportMatch(new Match(new Integer(fgRandom.nextInt()), -1, -1));
-		}
-	}
-
-	public int estimateTicks(QuerySpecification data) {
-		return 100;
-	}
-
-	public IMatchPresentation getUIParticipant() {
-		return fUIParticipant;
-	}
-
-}
-
-class TestLabelProvider extends LabelProvider {
-	public Image getImage(Object element) {
-		return JavaPluginImages.get(ISharedImages.IMG_OBJS_PROTECTED);
-	}
-	public String getText(Object element) {
-		return "Int: value= "+((Integer)element).toString();
-	}
-}
-
-class TestUIParticipant implements IMatchPresentation {
-
-	public void showMatch(Match match, int currentOffset, int currentLength, boolean activate) throws PartInitException {
-		MessageDialog.openInformation(null, "Showing element", "Showning an integer of value: "+((Integer)match.getElement()).intValue());
-		
-	}
-
-	public ILabelProvider createLabelProvider() {
-		return new TestLabelProvider();
-	}
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/TreeContentProviderTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/TreeContentProviderTest.java
deleted file mode 100644
index 582d1d4..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/TreeContentProviderTest.java
+++ /dev/null

@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.ui.tests.search;
-
-import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResult;
-import org.eclipse.jdt.internal.ui.search.JavaSearchResultPage;
-import org.eclipse.jdt.internal.ui.search.LevelTreeContentProvider;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.swt.events.TreeListener;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- */
-public class TreeContentProviderTest extends TestCase {
-	private LevelTreeContentProvider fProvider;
-	private JavaSearchResult fResult;
-	
-	public static Test allTests() {
-		return new JUnitSourceSetup(new TestSuite(TreeContentProviderTest.class));
-	}
-	
-	public static Test suite() {
-		return allTests();
-	}
-
-	static class MockTreeViewer extends AbstractTreeViewer {
-
-		protected void addTreeListener(Control control, TreeListener listener) {
-			// ignore
-		}
-
-		protected void doUpdateItem(Item item, Object element) {
-			// ignore
-		}
-
-		protected Item[] getChildren(Widget widget) {
-			return new Item[0];
-		}
-
-		protected boolean getExpanded(Item item) {
-			return false;
-		}
-
-		protected int getItemCount(Control control) {
-			return 0;
-		}
-
-		protected int getItemCount(Item item) {
-			return 0;
-		}
-
-		protected Item[] getItems(Item item) {
-			return new Item[0];
-		}
-
-		protected Item getParentItem(Item item) {
-			return null;
-		}
-
-		protected Item[] getSelection(Control control) {
-			return new Item[0];
-		}
-
-		protected Item newItem(Widget parent, int style, int index) {
-			return null;
-		}
-
-		protected void removeAll(Control control) {
-			// ignore
-		}
-
-		protected void setExpanded(Item item, boolean expand) {
-			// ignore
-		}
-
-		protected void setSelection(List items) {
-			// ignore
-		}
-
-		protected void showItem(Item item) {
-			// ignore
-		}
-
-		public Control getControl() {
-			return null;
-		}
-	}
-		
-
-	public TreeContentProviderTest(String name) {
-		super(name);
-		// TODO Auto-generated constructor stub
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		fProvider= new LevelTreeContentProvider(new JavaSearchResultPage() {
-			StructuredViewer fViewer= new MockTreeViewer();
-			protected StructuredViewer getViewer() {
-				return fViewer;
-			}
-			
-			public AbstractTextSearchResult getInput() {
-				return fResult;
-			}
-		}, LevelTreeContentProvider.LEVEL_PACKAGE);
-		fResult= new JavaSearchResult(null);
-		fProvider.inputChanged(null, null, fResult);
-	}
-	
-	public void testSimpleAdd() throws Exception {
-		IMethod method= SearchTest.getMethod("junit.framework.TestCase", "getName", new String[0]);
-		addMatch(new Match(method, 0, 1));
-		IType type= SearchTest.getType("junit.framework.TestCase");
-		IPackageFragment pkg= type.getPackageFragment();
-		IJavaProject project= pkg.getJavaProject();
-		IPackageFragmentRoot root= (IPackageFragmentRoot) pkg.getParent();
-		
-		fProvider.setLevel(LevelTreeContentProvider.LEVEL_TYPE);
-		assertEquals(type, fProvider.getParent(method));
-		assertEquals(fProvider.getParent(type), null);
-		
-		fProvider.setLevel(LevelTreeContentProvider.LEVEL_PACKAGE);
-		assertEquals(type, fProvider.getParent(method));
-		assertEquals(fProvider.getParent(type), pkg);
-		assertEquals(fProvider.getParent(pkg), null);
-
-		fProvider.setLevel(LevelTreeContentProvider.LEVEL_PROJECT);
-		assertEquals(type, fProvider.getParent(method));
-		assertEquals(fProvider.getParent(type), pkg);
-		assertEquals(fProvider.getParent(pkg), root);
-		assertEquals(fProvider.getParent(root), project);
-		assertEquals(fProvider.getParent(project), null);
-	}
-	
-	public void testRemove() throws Exception {
-		IMethod method= SearchTest.getMethod("junit.framework.TestCase", "getName", new String[0]);
-		IType type= method.getDeclaringType();
-		IPackageFragment pkg= type.getPackageFragment();
-		Match match= new Match(method, 0, 1);
-		addMatch(match);
-		Match match2= new Match(method, 0, 1);
-		addMatch(match2);
-		removeMatch(match);
-		assertEquals(1, fProvider.getChildren(type).length);
-		assertEquals(1, fProvider.getChildren(pkg).length);
-		assertEquals(1, fProvider.getElements(fResult).length);
-
-		removeMatch(match2);
-		
-		assertEquals(0, fProvider.getChildren(type).length);
-		assertEquals(0, fProvider.getChildren(pkg).length);
-		assertEquals(0, fProvider.getElements(fResult).length);
-	}
-	
-	public void testRemoveParentFirst() throws Exception {
-		IMethod method= SearchTest.getMethod("junit.framework.TestCase", "getName", new String[0]);
-		IType type= method.getDeclaringType();
-		IPackageFragment pkg= type.getPackageFragment();
-		
-		Match match1= new Match(method, 0, 1);
-		addMatch(match1);
-		
-		Match match2= new Match(type, 0, 1);
-		addMatch(match2);
-		
-		removeMatch(match2);
-		
-		assertEquals(1, fProvider.getChildren(type).length);
-		assertEquals(1, fProvider.getChildren(pkg).length);
-		assertEquals(1, fProvider.getElements(fResult).length);
-		
-		removeMatch(match1);
-		assertEquals(0, fProvider.getChildren(type).length);
-		assertEquals(0, fProvider.getChildren(pkg).length);
-		assertEquals(0, fProvider.getElements(fResult).length);
-	}
-
-	public void testRemoveParentLast() throws Exception {
-		IMethod method= SearchTest.getMethod("junit.framework.TestCase", "getName", new String[0]);
-		IType type= method.getDeclaringType();
-		IPackageFragment pkg= type.getPackageFragment();
-		
-		Match match1= new Match(method, 0, 1);
-		addMatch(match1);
-		
-		Match match2= new Match(type, 0, 1);
-		addMatch(match2);
-		
-		removeMatch(match1);
-		
-		assertEquals(0, fProvider.getChildren(type).length);
-		assertEquals(1, fProvider.getChildren(pkg).length);
-		assertEquals(1, fProvider.getElements(fResult).length);
-		
-		removeMatch(match2);
-		
-		assertEquals(0, fProvider.getChildren(type).length);
-		assertEquals(0, fProvider.getChildren(pkg).length);
-		assertEquals(0, fProvider.getElements(fResult).length);
-	}
-
-	private void removeMatch(Match match) {
-		fResult.removeMatch(match);
-		fProvider.elementsChanged(new Object[] { match.getElement() });
-	}
-
-	private void addMatch(Match match) {
-		fResult.addMatch(match);
-		fProvider.elementsChanged(new Object[] { match.getElement() });
-	}
-
-
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/WorkspaceReferenceTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/WorkspaceReferenceTest.java
deleted file mode 100644
index 0d3f9d4..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/WorkspaceReferenceTest.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.search;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- */
-public class WorkspaceReferenceTest extends TestCase {
-
-	public static Test allTests() {
-		return new JUnitSourceSetup(new TestSuite(WorkspaceReferenceTest.class));
-	}
-	
-	public static Test suite() {
-		return allTests();
-	}
-	
-	public WorkspaceReferenceTest(String name) {
-		super(name);
-	}
-	
-	public void testSimpleMethodRef() throws Exception {
-		assertEquals(9, SearchTest.countMethodRefs("junit.framework.Test", "countTestCases", new String[0]));
-	}
-
-	public void testFindOverridden() throws Exception {
-		assertEquals(6, SearchTest.countMethodRefs("junit.framework.TestCase", "countTestCases", new String[0]));
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/WorkspaceScopeTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/WorkspaceScopeTest.java
deleted file mode 100644
index f06c715..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/WorkspaceScopeTest.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.search;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-
-import org.eclipse.jdt.testplugin.JavaProjectHelper;
-
-import org.eclipse.jdt.internal.ui.search.ReferenceScopeFactory;
-
-/**
- * @author Thomas Mäder
- *
- */
-public class WorkspaceScopeTest extends TestCase {
-	private IJavaProject fProject1;
-	private IJavaProject fProject2;
-	private IJavaProject fProject3;
-	private IJavaProject fProject4;
-	private ICompilationUnit fCompilationUnit;
-	
-	public WorkspaceScopeTest(String name) {
-		super(name);
-	}
-	
-	protected void setUp() throws Exception {
-		fProject1= createStandardProject("Test", "test"); //$NON-NLS-1$ //$NON-NLS-2$
-		IPackageFragment pkg= fProject1.findPackageFragment(new Path("/Test/src/test")); //$NON-NLS-1$
-		fCompilationUnit= pkg.createCompilationUnit("Test.java", getSource(), true, null); //$NON-NLS-1$
-		
-		fProject2= createStandardProject("Test2", "test2");  //$NON-NLS-1$//$NON-NLS-2$
-		JavaProjectHelper.addRequiredProject(fProject2, fProject1);
-		
-		fProject3= createStandardProject("Test3", "test3"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		fProject4= createStandardProject("Test4", "test4", false);  //$NON-NLS-1$//$NON-NLS-2$
-	}
-	
-	private IJavaProject createStandardProject(String name, String pkgName) throws CoreException, JavaModelException {
-		return createStandardProject(name, pkgName, true);
-	}
-	private IJavaProject createStandardProject(String name, String pkgName, boolean includeJRE) throws CoreException, JavaModelException {
-		IJavaProject project= JavaProjectHelper.createJavaProject(name, "bin"); //$NON-NLS-1$ //$NON-NLS-2$
-		IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(project, "src"); //$NON-NLS-1$
-		root.createPackageFragment(pkgName, true, null); //$NON-NLS-1$
-		if (includeJRE) {
-			IClasspathEntry jreLib= JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER"));  //$NON-NLS-1$
-			JavaProjectHelper.addToClasspath(project, jreLib);
-		}
-		return project;
-	}
-
-	/**
-	 * @return
-	 */
-	private String getSource() {
-		return "package test;\n" + 
-				"\n" + 
-				"public class Test {\n" + 
-				"	public void publicMethod() {\n" + 
-				"	}\n" + 
-				"	\n" + 
-				"	private void privateMethod() {\n" + 
-				"	}\n" + 
-				"	\n" + 
-				"	protected void protectedMethod() {\n" + 
-				"	}\n" + 
-				"	\n" + 
-				"	void defaultMethod() {\n" + 
-				"	}\n" + 
-				"}\n";
-
-	}
-
-	public void testPrivateScope() throws JavaModelException {
-		IType type= fCompilationUnit.findPrimaryType();
-		IMethod privateMethod= type.getMethod("privateMethod", new String[0]); //$NON-NLS-1$
-		IJavaSearchScope scope= ReferenceScopeFactory.createWorkspaceScope(true);
-		
-		assertTrue(scope.encloses(fCompilationUnit));
-		
-		IPackageFragmentRoot[] roots= fProject1.getAllPackageFragmentRoots();
-		for (int i= 0; i < roots.length; i++) {
-			IJavaElement[] fragments= roots[i].getChildren();
-			for (int j= 0; j < fragments.length; j++) {
-				assertFalse(scope.encloses(fragments[j]));
-			}
-		}
-		
-		checkNoRoots(scope, fProject2);
-		checkNoRoots(scope, fProject3);
-	}
-	
-	public void testDefaultScope() throws JavaModelException {
-		IType type= fCompilationUnit.findPrimaryType();
-		IMethod privateMethod= type.getMethod("defaultMethod", new String[0]); //$NON-NLS-1$
-		IJavaSearchScope scope= ReferenceScopeFactory.createWorkspaceScope(true);
-		
-		assertTrue(scope.encloses(fCompilationUnit.getParent()));
-		
-		IPackageFragmentRoot[] roots= fProject1.getAllPackageFragmentRoots();
-		for (int i= 0; i < roots.length; i++) {
-			IJavaElement[] fragments= roots[i].getChildren();
-			for (int j= 0; j < fragments.length; j++) {
-				if (!fragments[j].equals(fCompilationUnit.getParent()))
-					assertFalse(scope.encloses(fragments[j]));
-			}
-		}
-		
-		checkNoRoots(scope, fProject2);
-		checkNoRoots(scope, fProject3);
-	}
-
-	
-	public void testPublicMethod() throws JavaModelException {
-		IType type= fCompilationUnit.findPrimaryType();
-		IMethod publicMethod= type.getMethod("publicMethod", new String[0]); //$NON-NLS-1$
-		IJavaSearchScope scope= ReferenceScopeFactory.createWorkspaceScope(true);
-		checkNoJreRoots(scope, fProject1);
-		checkNoJreRoots(scope, fProject2);
-		checkNoRoots(scope, fProject3);
-	}
-
-	public void testProtectedMethod() throws JavaModelException {
-		IType type= fCompilationUnit.findPrimaryType();
-		IMethod protectedMethod= type.getMethod("protectedMethod", new String[0]); //$NON-NLS-1$
-		IJavaSearchScope scope= ReferenceScopeFactory.createWorkspaceScope(true);
-		checkNoJreRoots(scope, fProject1);
-		checkNoJreRoots(scope, fProject2);
-		checkNoRoots(scope, fProject3);
-	}
-
-	private void checkNoJreRoots(IJavaSearchScope scope, IJavaProject project) throws JavaModelException {
-		IPackageFragmentRoot[] roots= project.getAllPackageFragmentRoots();
-		for (int i= 0; i < roots.length; i++) {
-			if(scope.encloses(roots[i])) {
-				assertFalse(roots[i].isExternal());
-			} else {
-				assertTrue(roots[i].isExternal());
-			}
-		}
-	}
-	
-	private void checkJreRoots(IJavaSearchScope scope, IJavaProject project) throws JavaModelException {
-		IPackageFragmentRoot[] roots= project.getAllPackageFragmentRoots();
-		for (int i= 0; i < roots.length; i++) {
-			if(scope.encloses(roots[i])) {
-				assertTrue(roots[i].isExternal());
-			} else {
-				assertFalse(roots[i].isExternal());
-			}
-		}
-	}
-
-	private void checkNoRoots(IJavaSearchScope scope, IJavaProject project) throws JavaModelException {
-		IPackageFragmentRoot[] roots= project.getAllPackageFragmentRoots();
-		for (int i= 0; i < roots.length; i++) {
-			assertFalse(scope.encloses(roots[i]));
-		}
-	}
-	
-	private void checkAllRoots(IJavaSearchScope scope, IJavaProject project) throws JavaModelException {
-		IPackageFragmentRoot[] roots= project.getAllPackageFragmentRoots();
-		for (int i= 0; i < roots.length; i++) {
-			assertTrue(scope.encloses(roots[i]));
-		}
-	}
-	
-	public void testJREProtected() throws JavaModelException {
-		IType object= fProject1.findType("java.lang.Object"); //$NON-NLS-1$
-		IMethod protectedMethod= object.getMethod("clone", new String [0]); //$NON-NLS-1$
-		IJavaSearchScope scope= ReferenceScopeFactory.createWorkspaceScope(true);
-		
-		checkAllRoots(scope, fProject1);
-		checkAllRoots(scope, fProject2);
-		checkJreRoots(scope, fProject3);
-		checkNoRoots(scope, fProject4);
-	}
-}

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/wizardapi/NewJavaProjectWizardTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/wizardapi/NewJavaProjectWizardTest.java
deleted file mode 100644
index 01a4b8f..0000000
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/wizardapi/NewJavaProjectWizardTest.java
+++ /dev/null

@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.ui.tests.wizardapi;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jdt.launching.JavaRuntime;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.wizards.NewJavaProjectWizardPage;
-
-public class NewJavaProjectWizardTest extends TestCase {
-	
-	
-	public static Test suite() {
-		return new TestSuite(NewJavaProjectWizardTest.class);
-	}		
-	
-	private class TestNewJavaProjectWizardPage extends NewJavaProjectWizardPage {
-	
-		private IProject fNewProject;
-	
-		public TestNewJavaProjectWizardPage(IWorkspaceRoot root) {
-			super(root, null);
-		}
-		
-		public void setProjectHandle(IProject newProject) {
-			fNewProject= newProject;
-		}	
-	
-		/**
-		 * @see NewJavaProjectWizardPage#getLocationPath()
-		 */
-		protected IPath getLocationPath() { 
-			return null;
-		}
-
-		/**
-		 * @see NewJavaProjectWizardPage#getProjectHandle()
-		 */
-		protected IProject getProjectHandle() {
-			return fNewProject;
-		}
-		
-		public void initBuildPath() {
-			super.initBuildPaths();
-		}
-		
-	}
-	
-	
-	private static final String PROJECT_NAME = "DummyProject";
-	private static final String OTHER_PROJECT_NAME = "OtherProject";
-	
-	
-	private TestNewJavaProjectWizardPage fWizardPage;
-
-	public NewJavaProjectWizardTest(String name) {
-		super(name);
-	}	
-
-	/**
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		
-		IProject project= root.getProject(PROJECT_NAME);
-		
-		fWizardPage= new TestNewJavaProjectWizardPage(root);
-		fWizardPage.setProjectHandle(project);
-	}
-
-	/**
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IProject project= root.getProject(PROJECT_NAME);
-		if (project.exists()) {
-			project.delete(true, null);
-		}
-		
-		project= root.getProject(OTHER_PROJECT_NAME);
-		if (project.exists()) {
-			project.delete(true, null);
-		}		
-	
-		super.tearDown();
-	}
-	
-	private IPath getJREEntryPath() {
-		return JavaRuntime.getDefaultJREContainerEntry().getPath();
-	}
-	
-	
-	private void assertBasicBuildPath(IProject project, IPath outputLocation, IClasspathEntry[] classpath) {
-		assertNotNull("a", outputLocation);
-		assertNotNull("b", classpath);
-		assertTrue("c", classpath.length == 2);
-		
-		if (PreferenceConstants.getPreferenceStore().getBoolean(PreferenceConstants.SRCBIN_FOLDERS_IN_NEWPROJ)) {
-			assertEquals("d", outputLocation, project.getFolder("bin").getFullPath());
-			assertEquals("e", classpath[0].getPath(), project.getFolder("src").getFullPath());
-		} else {
-			assertEquals("f", outputLocation, project.getFullPath());
-			assertEquals("g", classpath[0].getPath(), project.getFullPath());
-		}
-		assertEquals("h", classpath[1].getPath(), getJREEntryPath());		
-	}
-	
-	public void testBasicSet() throws Exception {
-		fWizardPage.initBuildPath();
-		IProject project= fWizardPage.getProjectHandle();
-		
-		IPath outputLocation= fWizardPage.getOutputLocation();
-		IClasspathEntry[] classpath= fWizardPage.getRawClassPath();
-		assertBasicBuildPath(project, outputLocation, classpath);
-	}
-			
-		
-	public void testBasicCreate() throws Exception {	
-		IProject project= fWizardPage.getProjectHandle();
-		
-		IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(fWizardPage.getRunnable());
-		op.run(null);
-	
-		IJavaProject jproj= fWizardPage.getNewJavaProject();
-		
-		assertEquals("a", jproj.getProject(), project);
-		
-		IPath outputLocation= jproj.getOutputLocation();
-		IClasspathEntry[] classpath= jproj.getRawClasspath();
-		assertBasicBuildPath(jproj.getProject(), outputLocation, classpath);		
-	}
-	
-	public void testProjectChange() throws Exception {	
-		fWizardPage.initBuildPath();
-		IProject project= fWizardPage.getProjectHandle();
-		
-		IPath outputLocation= fWizardPage.getOutputLocation();
-		IClasspathEntry[] classpath= fWizardPage.getRawClassPath();
-		assertBasicBuildPath(project, outputLocation, classpath);
-	
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IProject otherProject= root.getProject(OTHER_PROJECT_NAME);		
-		
-		// change the project before create
-		fWizardPage.setProjectHandle(otherProject);
-
-		IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(fWizardPage.getRunnable());
-		op.run(null);
-		
-		IJavaProject jproj= fWizardPage.getNewJavaProject();
-		
-		assertEquals("a", jproj.getProject(), otherProject);
-		
-		IPath outputLocation1= fWizardPage.getOutputLocation();
-		IClasspathEntry[] classpath1= fWizardPage.getRawClassPath();
-		assertBasicBuildPath(otherProject, outputLocation1, classpath1);			
-	}	
-	
-	private void assertUserBuildPath(IProject project, IPath outputLocation, IClasspathEntry[] classpath) {
-		assertNotNull("a", outputLocation);
-		assertNotNull("b", classpath);
-		assertTrue("c", classpath.length == 3);
-		
-		assertEquals("d", outputLocation, project.getFolder("dbin").getFullPath());
-		assertEquals("e", classpath[0].getPath(), project.getFolder("dsrc1").getFullPath());
-		assertEquals("f", classpath[1].getPath(), project.getFolder("dsrc2").getFullPath());
-		assertEquals("g", classpath[2].getPath(), getJREEntryPath());	
-	}
-	
-	public void testUserSet() throws Exception {	
-		IProject project= fWizardPage.getProjectHandle();
-		
-		IPath folderPath= project.getFolder("dbin").getFullPath();
-		
-		IClasspathEntry[] entries= new IClasspathEntry[] {
-			JavaCore.newSourceEntry(project.getFolder("dsrc1").getFullPath()),
-			JavaCore.newSourceEntry(project.getFolder("dsrc2").getFullPath())
-		};
-			
-		fWizardPage.setDefaultOutputFolder(folderPath);
-		fWizardPage.setDefaultClassPath(entries, true);
-		fWizardPage.initBuildPath();
-		
-		IPath outputLocation= fWizardPage.getOutputLocation();
-		IClasspathEntry[] classpath= fWizardPage.getRawClassPath();
-		assertUserBuildPath(project, outputLocation, classpath);
-		
-		fWizardPage.setDefaultOutputFolder(null);
-		fWizardPage.setDefaultClassPath(null, false);
-		fWizardPage.initBuildPath();
-		
-		IPath outputLocation1= fWizardPage.getOutputLocation();
-		IClasspathEntry[] classpath1= fWizardPage.getRawClassPath();
-		assertBasicBuildPath(project, outputLocation1, classpath1);
-	}
-	
-	public void testUserCreate() throws Exception {	
-		IProject project= fWizardPage.getProjectHandle();
-		
-		IPath folderPath= project.getFolder("dbin").getFullPath();
-		
-		IClasspathEntry[] entries= new IClasspathEntry[] {
-			JavaCore.newSourceEntry(project.getFolder("dsrc1").getFullPath()),
-			JavaCore.newSourceEntry(project.getFolder("dsrc2").getFullPath())
-		};
-			
-		fWizardPage.setDefaultOutputFolder(folderPath);
-		fWizardPage.setDefaultClassPath(entries, true);
-		
-		IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(fWizardPage.getRunnable());
-		op.run(null);
-	
-		IJavaProject jproj= fWizardPage.getNewJavaProject();
-		
-		assertEquals("a", jproj.getProject(), project);
-		
-		IPath outputLocation= jproj.getOutputLocation();
-		IClasspathEntry[] classpath= jproj.getRawClasspath();
-		assertUserBuildPath(jproj.getProject(), outputLocation, classpath);	
-	}
-	
-	public void testReadExisting() throws Exception {
-		IProject project= fWizardPage.getProjectHandle();
-		
-		IPath folderPath= project.getFolder("dbin").getFullPath();
-		IClasspathEntry[] entries= new IClasspathEntry[] {
-			JavaCore.newSourceEntry(project.getFolder("dsrc1").getFullPath()),
-			JavaCore.newSourceEntry(project.getFolder("dsrc2").getFullPath())
-		};	
-		
-		fWizardPage.setDefaultOutputFolder(folderPath);
-		fWizardPage.setDefaultClassPath(entries, true);		
-		
-		IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(fWizardPage.getRunnable());
-		op.run(null);
-	
-		IProject proj= fWizardPage.getNewJavaProject().getProject();
-	
-		fWizardPage.setDefaultClassPath(null, false);
-		fWizardPage.setDefaultOutputFolder(null);
-		fWizardPage.setProjectHandle(proj);
-		
-		// reads from existing
-		fWizardPage.initBuildPath();
-		
-		IPath outputLocation1= fWizardPage.getOutputLocation();
-		IClasspathEntry[] classpath1= fWizardPage.getRawClassPath();
-		assertUserBuildPath(project, outputLocation1, classpath1);
-	}
-	
-	public void testExistingOverwrite() throws Exception {
-		IProject project= fWizardPage.getProjectHandle();
-				
-		IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(fWizardPage.getRunnable());
-		op.run(null);
-	
-		IPath folderPath= project.getFolder("dbin").getFullPath();
-		IClasspathEntry[] entries= new IClasspathEntry[] {
-			JavaCore.newSourceEntry(project.getFolder("dsrc1").getFullPath()),
-			JavaCore.newSourceEntry(project.getFolder("dsrc2").getFullPath())
-		};	
-		
-		fWizardPage.setDefaultOutputFolder(folderPath);
-		fWizardPage.setDefaultClassPath(entries, true);
-		
-		// should overwrite existing
-		IRunnableWithProgress op1= new WorkspaceModifyDelegatingOperation(fWizardPage.getRunnable());
-		op1.run(null);
-		
-		IJavaProject jproj= fWizardPage.getNewJavaProject();
-		
-		IPath outputLocation1= jproj.getOutputLocation();
-		IClasspathEntry[] classpath1= jproj.getRawClasspath();
-		assertUserBuildPath(project, outputLocation1, classpath1);	
-	}	
-}
-
-
-

diff --git a/org.eclipse.jdt.ui.vcm/.classpath b/org.eclipse.jdt.ui.vcm/.classpath
deleted file mode 100644
index b2cd8dd..0000000
--- a/org.eclipse.jdt.ui.vcm/.classpath
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="vcm"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.vcm.core"/>
-    <classpathentry kind="src" path="/org.eclipse.vcm.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.jdt.ui.vcm/.cvsignore b/org.eclipse.jdt.ui.vcm/.cvsignore
deleted file mode 100644
index fe99505..0000000
--- a/org.eclipse.jdt.ui.vcm/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-

diff --git a/org.eclipse.jdt.ui.vcm/.project b/org.eclipse.jdt.ui.vcm/.project
deleted file mode 100644
index c59eeba..0000000
--- a/org.eclipse.jdt.ui.vcm/.project
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.jdt.ui.vcm</name>

-	<comment></comment>

-	<projects>

-		<project>org.eclipse.jdt.ui</project>

-		<project>org.eclipse.ui</project>

-		<project>org.eclipse.jdt.core</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.core.resources</project>

-		<project>org.eclipse.swt</project>

-		<project>org.eclipse.vcm.core</project>

-		<project>org.eclipse.vcm.ui</project>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>

-	</natures>

-</projectDescription>


diff --git a/org.eclipse.jdt.ui.vcm/.vcm_meta b/org.eclipse.jdt.ui.vcm/.vcm_meta
deleted file mode 100644
index 351bab6..0000000
--- a/org.eclipse.jdt.ui.vcm/.vcm_meta
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project-description>

-	<nature id="org.eclipse.jdt.core.javanature"/>

-	<reference project-name="org.eclipse.jdt.ui"/>

-	<reference project-name="org.eclipse.ui"/>

-	<reference project-name="org.eclipse.jdt.core"/>

-	<reference project-name="org.eclipse.core.boot"/>

-	<reference project-name="org.eclipse.core.runtime"/>

-	<reference project-name="org.eclipse.core.resources"/>

-	<reference project-name="org.eclipse.swt"/>

-	<reference project-name="org.eclipse.vcm.core"/>

-	<reference project-name="org.eclipse.vcm.ui"/>

-	<builder name="org.eclipse.jdt.core.javabuilder">

-	</builder>

-</project-description>


diff --git a/org.eclipse.jdt.ui.vcm/about.html b/org.eclipse.jdt.ui.vcm/about.html
deleted file mode 100644
index 768324e..0000000
--- a/org.eclipse.jdt.ui.vcm/about.html
+++ /dev/null

@@ -1,42 +0,0 @@
-<html>

-<head>

-<title>About</title>

-<style type="text/css">

-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}

-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}

-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}

-code { font-family: "Courier New", Courier, mono; font-size: 10pt}

-sup { font-family: arial,helvetica,geneva; font-size: 10px}

-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}

-li { font-family: arial, helvetica, geneva; font-size: 10pt}

-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}

-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}

-</style>

-</head>

-<body lang="EN-US" link="blue" vlink="purple">

-<table border="0" cellspacing="5" cellpadding="2" width="100%" >

-  <tr> 

-    <td align="LEFT" valign="TOP" colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF">About This Content</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-<p>11th December, 2001</p>	

-<h3>License</h3>

-<p>Eclipse.org makes available all content in this plug-in &quot;Content&quot;.  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> &quot;CPL&quot;.  For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>

-

-<h3>Contributions</h3>

-

-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise

-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such

-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>

-

-<p>If this Content is licensed to you under license terms and conditions other than the CPL &quot;Other License&quot;, any modifications, enhancements and/or

-other code and/or documentation &quot;Modifications&quot; uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the

-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of

-the CPL.</p>

-</td></tr></table>

-</body>

-</html>
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.vcm/build.properties b/org.eclipse.jdt.ui.vcm/build.properties
deleted file mode 100644
index 836c70a..0000000
--- a/org.eclipse.jdt.ui.vcm/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = plugin.xml,\

-               about.html,\

-               plugin.properties,\

-               *.jar

-source.jdtvcm.jar = vcm/


diff --git a/org.eclipse.jdt.ui.vcm/plugin.properties b/org.eclipse.jdt.ui.vcm/plugin.properties
deleted file mode 100644
index 6bab83a..0000000
--- a/org.eclipse.jdt.ui.vcm/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-#########################################

-# (c) Copyright IBM Corp. 2000, 2001.

-# All Rights Reserved.

-#########################################

-

-pluginName=Java Development Tools VCM UI

-

-TogglePackagesViewVersionLabels.label = Show &Version Info

-TogglePackagesViewVersionLabels.tooltip = Show Version Info in the Packages View

-Managing = Team

-ManageGroupMenu.label = &Team
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.vcm/plugin.xml.off b/org.eclipse.jdt.ui.vcm/plugin.xml.off
deleted file mode 100644
index 09d244e..0000000
--- a/org.eclipse.jdt.ui.vcm/plugin.xml.off
+++ /dev/null

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!-- ======================================================================= -->

-<!-- This plugin provides basic VCM functionality to the Eclipse Java UI     -->

-<!-- ======================================================================= -->

-<plugin

-	name="%pluginName"

-	id = "org.eclipse.jdt.ui.vcm"

-	version = "1.0"

-	provider-name = "Object Technology International, Inc.">

-

-	<requires>

-		<import plugin="org.eclipse.core.resources"/>

-		<import plugin="org.eclipse.ui"/>

-		<import plugin="org.eclipse.vcm.core"/>

-		<import plugin="org.eclipse.vcm.ui"/>

-		<import plugin="org.eclipse.vcm.ui.cvs"/>

-		<import plugin="org.eclipse.jdt.ui"/>

-		<import plugin="org.eclipse.jdt.core"/>

-	</requires> 

-

-<runtime>

-  <library name="jdtvcm.jar">  

-     <export name = "*"/>

-  </library> 

-</runtime>

-

-<extension point="org.eclipse.vcm.core.ignore">

-	<ignore pattern = "*.class" selected = "true"/>

-</extension>

-

-<!-- **************** View Actions ******************* -->

-<extension point="org.eclipse.ui.viewActions"> 

-	<viewContribution 

-		id="org.eclipse.vcm.packageViewContribution" 

-		targetID="org.eclipse.jdt.ui.PackageExplorer"> 

-		<action id="org.eclipse.vcm.vcminfoinpkg" 

-			label="%TogglePackagesViewVersionLabels.label" 

-			menubarPath="additions" 

-			state="false"

-			tooltip="%TogglePackagesViewVersionLabels.tooltip" 

-			class="org.eclipse.jdt.ui.vcm.TogglePackageViewVersionLabels">

-		</action> 

-	</viewContribution> 

-</extension> 

-   

-</plugin>
\ No newline at end of file

diff --git a/org.eclipse.jdt.ui.vcm/scripts/exportplugin.xml b/org.eclipse.jdt.ui.vcm/scripts/exportplugin.xml
deleted file mode 100644
index 35d3ba3..0000000
--- a/org.eclipse.jdt.ui.vcm/scripts/exportplugin.xml
+++ /dev/null

@@ -1,28 +0,0 @@
-<!-- build script to create a plugin from org.eclipse.jdt.ui.vcm -->
-<project name="org.eclipse.jdt.ui.vcm" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.jdt.ui.vcm" />
-		<property name="dest"  value="${destdir}/${plugin}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<jar 
-			jarfile="${dest}/jdtvcm.jar"
-			basedir="bin"
-		/>
-		<copy file="plugin.xml.off" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<zip zipfile="${dest}/jdtvcmsrc.zip">
-		    <fileset dir="vcm" />
-  		</zip>				
-	</target>
-</project>

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties
index fdeb672..420e8f3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties

@@ -84,7 +84,7 @@
 WhiteSpaceTabPage.annotation_types=Annotation types
 WhiteSpaceTabPage.enums=Enum types
 WhiteSpaceTabPage.wildcardtype=Wildcard type
-WhiteSpaceTabPage.param_type_ref=Parameterized type
+WhiteSpaceTabPage.param_type_ref=Type reference
 WhiteSpaceTabPage.type_arguments=Type arguments
 WhiteSpaceTabPage.type_parameters=Type parameters
 
@@ -96,7 +96,7 @@
 WhiteSpaceTabPage.declarations=Declarations
 WhiteSpaceTabPage.expressions=Expressions
 WhiteSpaceTabPage.arrays=Arrays
-WhiteSpaceTabPage.paramentrized_types=Parameterized types
+WhiteSpaceTabPage.parameterized_types=Parameterized types
 
 WhiteSpaceTabPage.category.label.text=&Category:
 WhiteSpaceTabPage.checktable.label.text=Ins&ert white space:

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java
index 69d2e9d..3c33d3f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java

@@ -279,7 +279,7 @@
     
     private final static PreviewSnippet TYPE_ARGUMENTS_PREVIEW= new PreviewSnippet(
             CodeFormatter.K_CLASS_BODY_DECLARATIONS,
-            "Map<String, Element> map=\n new <String, Element> HashMap();" //$NON-NLS-1$
+            "Map<String, Element> map=\n new HashMap<String, Element>();" //$NON-NLS-1$
         );
         
     private final static PreviewSnippet TYPE_PARAMETER_PREVIEW= new PreviewSnippet(
@@ -585,8 +585,8 @@
 		createArrayInitializerTree(workingValues, arrays);
 		createArrayElementAccessTree(workingValues, arrays);
 		
-		final InnerNode paramtypes= new InnerNode(null, workingValues, "WhiteSpaceTabPage.paramentrized_types"); //$NON-NLS-1$
-		createParametrizedTypeTree(workingValues, paramtypes);
+		final InnerNode paramtypes= new InnerNode(null, workingValues, "WhiteSpaceTabPage.parameterized_types"); //$NON-NLS-1$
+		createParameterizedTypeTree(workingValues, paramtypes);
 		createTypeArgumentTree(workingValues, paramtypes);
 		createTypeParameterTree(workingValues, paramtypes);
 		createWildcardTypeTree(workingValues, paramtypes);
@@ -681,7 +681,7 @@
 
     private static void createBeforeClosingAngleBracketTree(Map workingValues, final InnerNode parent) {
         createOption(parent, workingValues, "WhiteSpaceOptions.type_parameters", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_ANGLE_BRACKET_IN_TYPE_PARAMETERS, TYPE_PARAMETER_PREVIEW); //$NON-NLS-1$
-        createOption(parent, workingValues, "WhiteSpaceOptions.parametrized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
+        createOption(parent, workingValues, "WhiteSpaceOptions.parameterized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
         createOption(parent, workingValues, "WhiteSpaceOptions.type_arguments", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENTS, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
     }
     
@@ -694,7 +694,7 @@
     
     private static void createBeforeOpenAngleBracketTree(Map workingValues, final InnerNode parent) {
         createOption(parent, workingValues, "WhiteSpaceOptions.type_parameters", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETERS, TYPE_PARAMETER_PREVIEW); //$NON-NLS-1$
-        createOption(parent, workingValues, "WhiteSpaceOptions.parametrized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
+        createOption(parent, workingValues, "WhiteSpaceOptions.parameterized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
         createOption(parent, workingValues, "WhiteSpaceOptions.type_arguments", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_ARGUMENTS, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$        
     }
 
@@ -823,7 +823,7 @@
         createOption(parent, workingValues, "WhiteSpaceOptions.annotation_modifier_args", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_ANNOTATION, ANNOTATION_MODIFIER_PREVIEW); //$NON-NLS-1$
         
         createOption(parent, workingValues, "WhiteSpaceOptions.type_parameters", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_TYPE_PARAMETERS, TYPE_PARAMETER_PREVIEW); //$NON-NLS-1$
-        createOption(parent, workingValues, "WhiteSpaceOptions.parametrized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
+        createOption(parent, workingValues, "WhiteSpaceOptions.parameterized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
 	    createOption(parent, workingValues, "WhiteSpaceOptions.type_arguments", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
     }
 
@@ -844,7 +844,7 @@
     
     private static void createAfterOpenAngleBracketTree(Map workingValues, final InnerNode parent) {
         createOption(parent, workingValues, "WhiteSpaceOptions.type_parameters", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETERS, TYPE_PARAMETER_PREVIEW); //$NON-NLS-1$
-        createOption(parent, workingValues, "WhiteSpaceOptions.parametrized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
+        createOption(parent, workingValues, "WhiteSpaceOptions.parameterized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
         createOption(parent, workingValues, "WhiteSpaceOptions.type_arguments", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_ANGLE_BRACKET_IN_TYPE_ARGUMENTS, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
     }
     
@@ -866,7 +866,7 @@
     
     private static void createAfterClosingAngleBracketTree(Map workingValues, final InnerNode parent) {
         createOption(parent, workingValues, "WhiteSpaceOptions.type_parameters", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_PARAMETERS, TYPE_PARAMETER_PREVIEW); //$NON-NLS-1$
-        //createOption(parent, workingValues, "WhiteSpaceOptions.parametrized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
+        //createOption(parent, workingValues, "WhiteSpaceOptions.parameterized_type", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
         createOption(parent, workingValues, "WhiteSpaceOptions.type_arguments", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENTS, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$        
     }
     
@@ -1178,7 +1178,7 @@
         return root;
     }
     
-    private static InnerNode createParametrizedTypeTree(Map workingValues, InnerNode parent) {
+    private static InnerNode createParameterizedTypeTree(Map workingValues, InnerNode parent) {
         final InnerNode root= new InnerNode(parent, workingValues, "WhiteSpaceTabPage.param_type_ref"); //$NON-NLS-1$
         createOption(root, workingValues, "WhiteSpaceTabPage.before_opening_angle_bracket", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$
         createOption(root, workingValues, "WhiteSpaceTabPage.after_opening_angle_bracket", DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_OPENING_ANGLE_BRACKET_IN_PARAMETERIZED_TYPE_REFERENCE, TYPE_ARGUMENTS_PREVIEW); //$NON-NLS-1$

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java
index 3145e2e..b11e5ca 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java

@@ -412,9 +412,11 @@
         private void restoreSelection() {
             final boolean selectSyntax= fDialogSettings.getBoolean(PREF_VIEW_KEY);
             if (selectSyntax) {
+            	fSyntaxComponent.refreshState();
                 fSwitchCombo.setText(fItems[1]);
                 fPageBook.showPage(fSyntaxComponent.getControl());
 			} else {
+            	fJavaElementComponent.refreshState();
 			    fSwitchCombo.setText(fItems[0]);
 			    fPageBook.showPage(fJavaElementComponent.getControl());
 			}

diff --git a/org.eclipse.ltk.core.refactoring.tests/.classpath b/org.eclipse.ltk.core.refactoring.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.ltk.core.refactoring.tests/.cvsignore b/org.eclipse.ltk.core.refactoring.tests/.cvsignore
deleted file mode 100644
index fe99505..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-

diff --git a/org.eclipse.ltk.core.refactoring.tests/.project b/org.eclipse.ltk.core.refactoring.tests/.project
deleted file mode 100644
index e824a4c..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ltk.core.refactoring.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.ltk.core.refactoring.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ltk.core.refactoring.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index aab097f..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Wed Sep 01 11:52:19 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.ltk.core.refactoring.tests/.template b/org.eclipse.ltk.core.refactoring.tests/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/.template
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>


diff --git a/org.eclipse.ltk.core.refactoring.tests/about.html b/org.eclipse.ltk.core.refactoring.tests/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.ltk.core.refactoring.tests/build.properties b/org.eclipse.ltk.core.refactoring.tests/build.properties
deleted file mode 100644
index f51ba8d..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
-               about.html,\
-               plugin.properties,\
-               *.jar
-src.includes = about.html
-source.refcoretests.jar = src/

diff --git a/org.eclipse.ltk.core.refactoring.tests/plugin.properties b/org.eclipse.ltk.core.refactoring.tests/plugin.properties
deleted file mode 100644
index 1aae5f4..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName= Refactoring Core Test Plug-in
-providerName= Eclipse.org
-
-participant.name= Participant

diff --git a/org.eclipse.ltk.core.refactoring.tests/plugin.xml b/org.eclipse.ltk.core.refactoring.tests/plugin.xml
deleted file mode 100644
index 806bdeb..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/plugin.xml
+++ /dev/null

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ltk.core.refactoring.tests"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.ltk.core.refactoring.tests.RefactoringCoreTestPlugin">
-
-   <runtime>
-      <library name="refcoretests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ltk.core.refactoring"/>
-   </requires>
-   
-   <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-      <renameParticipant
-            class="org.eclipse.ltk.core.refactoring.tests.participants.FailingParticipant"
-            id="org.eclipse.ltk.core.refactoring.tests.participants.FailingParticipant"
-            name="org.eclipse.ltk.core.refactoring.tests.participants.FailingParticipant">
-         <enablement>
-           <with variable="element">
-             <instanceof value="org.eclipse.ltk.core.refactoring.tests.participants.Element"/>
-           </with>
-         </enablement>
-      </renameParticipant>
-      <renameParticipant
-            class="org.eclipse.ltk.core.refactoring.tests.participants.FailingParticipant2"
-            id="org.eclipse.ltk.core.refactoring.tests.participants.FailingParticipant2"
-            name="org.eclipse.ltk.core.refactoring.tests.participants.FailingParticipant2">
-         <enablement>
-           <with variable="element">
-             <instanceof value="org.eclipse.ltk.core.refactoring.tests.participants.Element"/>
-           </with>
-         </enablement>
-      </renameParticipant>
-   </extension>
-</plugin>

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/AllTests.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/AllTests.java
deleted file mode 100644
index 22a941d..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/AllTests.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ltk.core.refactoring.tests.participants.FailingParticipantTests;
-
-public class AllTests {
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite("All LTK Refactoring Core Tests"); //$NON-NLS-1$
-		suite.addTestSuite(EmptySuite.class);
-		suite.addTestSuite(FailingParticipantTests.class);
-		return suite;
-	}
-}
-

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/EmptySuite.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/EmptySuite.java
deleted file mode 100644
index eb4ef07..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/EmptySuite.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests;
-
-import junit.framework.TestCase;
-
-public class EmptySuite extends TestCase {
-
-	public void test0() {
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/RefactoringCoreTestPlugin.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/RefactoringCoreTestPlugin.java
deleted file mode 100644
index b617c88..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/RefactoringCoreTestPlugin.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests;
-
-import org.eclipse.core.runtime.Plugin;
-
-public class RefactoringCoreTestPlugin extends Plugin {
-	
-	private static RefactoringCoreTestPlugin fgDefault;
-	
-	public RefactoringCoreTestPlugin() {
-		fgDefault= this;
-	}
-
-	public static RefactoringCoreTestPlugin getDefault() {
-		return fgDefault;
-	}
-	
-	public static String getPluginId() {
-		return "org.eclipse.ltk.core.refactoring.tests"; //$NON-NLS-1$
-	}	
-}

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/Element.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/Element.java
deleted file mode 100644
index d9fc973..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/Element.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests.participants;
-
-/**
- * The element to be renamed
- */
-public class Element {
-}

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ElementRenameProcessor.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ElementRenameProcessor.java
deleted file mode 100644
index e459bfa..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ElementRenameProcessor.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests.participants;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.NullChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.ParticipantManager;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameProcessor;
-import org.eclipse.ltk.core.refactoring.participants.SharableParticipants;
-
-public class ElementRenameProcessor extends RenameProcessor {
-	
-	Object[] fElements= new Object[] { new Element() };
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object[] getElements() {
-		return fElements;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getIdentifier() {
-		return ElementRenameProcessor.class.getName();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getProcessorName() {
-		return ElementRenameProcessor.class.getName();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isApplicable() throws CoreException {
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		return new RefactoringStatus();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus checkFinalConditions(IProgressMonitor pm, CheckConditionsContext context) throws CoreException, OperationCanceledException {
-		return new RefactoringStatus();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		return new NullChange();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants sharedParticipants) throws CoreException {
-		return ParticipantManager.loadRenameParticipants(new RefactoringStatus(), this, fElements[0], 
-			new RenameArguments("test", true), new String[0], new SharableParticipants());
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ElementRenameRefactoring.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ElementRenameRefactoring.java
deleted file mode 100644
index cc56268..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ElementRenameRefactoring.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests.participants;
-
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-
-public class ElementRenameRefactoring extends RenameRefactoring {
-
-	public ElementRenameRefactoring() {
-		super(new ElementRenameProcessor());
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipant.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipant.java
deleted file mode 100644
index bf4b280..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipant.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests.participants;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-
-public class FailingParticipant extends RenameParticipant {
-
-	public static class Exception extends RuntimeException {
-		/** This class is not intended to be serialized. */
-		private static final long serialVersionUID= 1L;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected boolean initialize(Object element) {
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return FailingParticipant.class.getName();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException {
-		return new RefactoringStatus();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		throw new Exception();
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipant2.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipant2.java
deleted file mode 100644
index cb853bb..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipant2.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests.participants;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.NullChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-
-public class FailingParticipant2 extends RenameParticipant {
-
-	public static class Exception extends RuntimeException {
-		/** This class is not intended to be serialized. */
-		private static final long serialVersionUID= 1L;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected boolean initialize(Object element) {
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return FailingParticipant2.class.getName();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException {
-		return new RefactoringStatus();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		return new NullChange() {
-			public Change perform(IProgressMonitor monitor) throws CoreException {
-				throw new Exception();
-			}
-		};
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipantTests.java b/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipantTests.java
deleted file mode 100644
index ecdec6a..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/FailingParticipantTests.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.tests.participants;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.ltk.core.refactoring.Change;
-
-public class FailingParticipantTests extends TestCase {
-
-	private ElementRenameRefactoring fRefactoring;
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-	
-	public void test() throws Exception {
-		fRefactoring= new ElementRenameRefactoring();
-		fRefactoring.checkInitialConditions(new NullProgressMonitor());
-		fRefactoring.checkFinalConditions(new NullProgressMonitor());
-		
-		boolean exception= false;
-		try {
-			fRefactoring.createChange(new NullProgressMonitor());
-		} catch (FailingParticipant.Exception e) {
-			exception= true;
-		}
-		Assert.assertTrue("No exception generated", exception);
-		
-		
-		fRefactoring= new ElementRenameRefactoring();
-		fRefactoring.checkInitialConditions(new NullProgressMonitor());
-		fRefactoring.checkFinalConditions(new NullProgressMonitor());
-		// this time create change must pass, but execution still fails
-		Change change= fRefactoring.createChange(new NullProgressMonitor());
-		exception= false;
-		try {
-			change.perform(new NullProgressMonitor());
-		} catch (FailingParticipant2.Exception e) {
-			exception= true;
-		}
-		Assert.assertTrue("No exception generated", exception);
-
-		// this time everything must pass 
-		fRefactoring= new ElementRenameRefactoring();
-		fRefactoring.checkInitialConditions(new NullProgressMonitor());
-		fRefactoring.checkFinalConditions(new NullProgressMonitor());
-		change= fRefactoring.createChange(new NullProgressMonitor());
-		change.perform(new NullProgressMonitor());
-	}
-}
-

diff --git a/org.eclipse.ltk.core.refactoring.tests/test.xml b/org.eclipse.ltk.core.refactoring.tests/test.xml
deleted file mode 100644
index 29b86f2..0000000
--- a/org.eclipse.ltk.core.refactoring.tests/test.xml
+++ /dev/null

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.ltk.core.refactoring.tests"/>
-  <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="refactoring-core-folder" 
-              value="${eclipse-home}/refactoring_core_folder"/>
-    <delete dir="${refactoring-core-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${refactoring-core-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.ltk.core.refactoring.tests.AllTests"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-  <!-- This target runs the performance test suites. -->
-  <target name="performance">
-  </target>
-
-</project>

diff --git a/org.eclipse.ltk.core.refactoring/.classpath b/org.eclipse.ltk.core.refactoring/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.ltk.core.refactoring/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.ltk.core.refactoring/.cvsignore b/org.eclipse.ltk.core.refactoring/.cvsignore
deleted file mode 100644
index fe99505..0000000
--- a/org.eclipse.ltk.core.refactoring/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-

diff --git a/org.eclipse.ltk.core.refactoring/.project b/org.eclipse.ltk.core.refactoring/.project
deleted file mode 100644
index 90d3e96..0000000
--- a/org.eclipse.ltk.core.refactoring/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ltk.core.refactoring</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.ltk.core.refactoring/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ltk.core.refactoring/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 68b563a..0000000
--- a/org.eclipse.ltk.core.refactoring/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Wed Sep 01 11:49:59 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.ltk.core.refactoring/about.html b/org.eclipse.ltk.core.refactoring/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.ltk.core.refactoring/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.ltk.core.refactoring/build.properties b/org.eclipse.ltk.core.refactoring/build.properties
deleted file mode 100644
index 503a60c..0000000
--- a/org.eclipse.ltk.core.refactoring/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               *.jar
-src.includes = about.html,\
-               schema/
-source.refcore.jar = src/

diff --git a/org.eclipse.ltk.core.refactoring/buildnotes_ltk-core-refactoring.html b/org.eclipse.ltk.core.refactoring/buildnotes_ltk-core-refactoring.html
deleted file mode 100644
index a40fd7b..0000000
--- a/org.eclipse.ltk.core.refactoring/buildnotes_ltk-core-refactoring.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <meta name="GENERATOR" content="Mozilla/4.75 [en] (WinNT; U) [Netscape]">
-   <title>Core Expressions Release Notes</title>
-</head>
-<body>
-
-<h1>
-Eclipse Platform Build Notes&nbsp;<br>
-Core Expressions</h1>
-<h3>June 18, 2004</h3>
-<h4>Problem Reports Fixed</h4>
-<h4>Implemenation Changes</h4>
-<ul>
-  <li>To align the method RefactoringStatus#create(IStatus) with the implementation of IStatus
-      the method createStatus now returns a fatal error when IStatus has a severity of CANCEL.
-  </li>
-</ul>
-<h3>Mai 7, 2004</h3>
-<h4>Problem Reports Fixed</h4>
-<h4>Implemenation Changes</h4>
-<ul>
-  <li>The getPreview* and getContent* methods provided by class TextChange are now requiring 
-      a progress monitor.</li>
-</ul>
-</body>
-</html>
-

diff --git a/org.eclipse.ltk.core.refactoring/plugin.properties b/org.eclipse.ltk.core.refactoring/plugin.properties
deleted file mode 100644
index 5cd6d24..0000000
--- a/org.eclipse.ltk.core.refactoring/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName= Refactoring Core
-providerName= Eclipse.org
-
-renameParticipantsExtensionPoint= Rename Participants
-createParticipantsExtensionPoint= Create Participants
-deleteParticipantsExtensionPoint= Delete Participants
-moveParticipantsExtensionPoint= Move Participants
-copyParticipantsExtensionPoint= Copy Participants

diff --git a/org.eclipse.ltk.core.refactoring/plugin.xml b/org.eclipse.ltk.core.refactoring/plugin.xml
deleted file mode 100644
index 87e1478..0000000
--- a/org.eclipse.ltk.core.refactoring/plugin.xml
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ltk.core.refactoring"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.ltk.internal.core.refactoring.RefactoringCorePlugin">
-
-   <runtime>
-      <library name="refcore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.text"/>
-   </requires>
-
-   <extension-point id="renameParticipants" name="%renameParticipantsExtensionPoint" schema="schema/renameParticipants.exsd"/>
-   <extension-point id="moveParticipants" name="%moveParticipantsExtensionPoint"  schema="schema/moveParticipants.exsd"/>
-   <extension-point id="createParticipants" name="%createParticipantsExtensionPoint" schema="schema/createParticipants.exsd"/>
-   <extension-point id="deleteParticipants" name="%deleteParticipantsExtensionPoint"  schema="schema/deleteParticipants.exsd"/>
-
-</plugin>

diff --git a/org.eclipse.ltk.core.refactoring/schema/createParticipants.exsd b/org.eclipse.ltk.core.refactoring/schema/createParticipants.exsd
deleted file mode 100644
index 4869c94..0000000
--- a/org.eclipse.ltk.core.refactoring/schema/createParticipants.exsd
+++ /dev/null

@@ -1,149 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ltk.core.refactoring">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ltk.core.refactoring" id="createParticipants" name="Create Participants"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define refactoring create participants. The reader of the expression provides the following predefined variables which can be referenced via the &amp;lt;with variable=&quot;...&quot;&amp;gt; expression element:
-
-&lt;ul&gt;
-  &lt;li&gt;Object element: the element to be create or a corresponding descriptor&lt;/li&gt;
-  &lt;li&gt;List&amp;lt;String&amp;gt; affectedNatures: a list containing the natures of the projects affected 
-      by the refactoring&lt;/li&gt;
-  &lt;li&gt;String processorId: the id of the refactoring processor that will own the participant.
-&lt;/ul&gt;
-
-The default variable used during expression evaluation is bound to the element variable.
-      </documentation>
-   </annotation>
-
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="createParticipant" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="createParticipant">
-      <complexType>
-         <all>
-            <element ref="enablement"/>
-         </all>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  unique identifier for the create participant.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a human reabable name of the create participant
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that provides the participant implementation.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ltk.core.refactoring.participants.CreateParticipant"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The example below defines a create participant. The participant is enabled if one of the project affected by the refactoring has a Java nature and when the element to be created is a folder.
-
-&lt;pre&gt;
-&lt;createParticipant
-    id=&quot;org.myCompany.createParticipant&quot;
-    name=&quot;%CreateParticipant.name&quot; 
-    class=&quot;org.myCompany.CreateParticipant&quot;&gt;
-    &lt;enablement&gt;
-      &lt;with variable=&quot;affectedNatures&quot;&gt;
-        &lt;iterate operator=&quot;or&quot;&gt;
-          &lt;equals value=&quot;org.eclipse.jdt.core.javanature&quot;/&gt;
-        &lt;/iterate&gt;
-      &lt;/with&gt;
-      &lt;with variable=&quot;element&quot;&gt;
-        &lt;instanceof value=&quot;org.eclipse.core.resources.IFolder&quot;/&gt;
-      &lt;/with&gt;
-    &lt;/enablement&gt;
-&lt;/createParticipant&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must extend &lt;code&gt;org.eclipse.ltk.core.refactoring.participants.CreateParticipant&lt;/code&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2001, 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.ltk.core.refactoring/schema/deleteParticipants.exsd b/org.eclipse.ltk.core.refactoring/schema/deleteParticipants.exsd
deleted file mode 100644
index cdc2434..0000000
--- a/org.eclipse.ltk.core.refactoring/schema/deleteParticipants.exsd
+++ /dev/null

@@ -1,149 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ltk.core.refactoring">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ltk.core.refactoring" id="deleteParticipants" name="Delete Participants"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define refactoring delete participants. The reader of the expression provides the following predefined variables which can be referenced via the &amp;lt;with variable=&quot;...&quot;&amp;gt; expression element:
-
-&lt;ul&gt;
-  &lt;li&gt;Object element: the element to be deleted&lt;/li&gt;
-  &lt;li&gt;List&amp;lt;String&amp;gt; affectedNatures: a list containing the natures of the projects affected 
-      by the refactoring&lt;/li&gt;
-  &lt;li&gt;String processorId: the id of the refactoring processor that will own the participant.
-&lt;/ul&gt;
-
-The default variable used during expression evaluation is bound to the element variable.
-      </documentation>
-   </annotation>
-
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="deleteParticipant" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="deleteParticipant">
-      <complexType>
-         <all>
-            <element ref="enablement"/>
-         </all>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  unique identifier for the delete participant.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a human reabable name of the delete participant
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that provides the participant implementation.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ltk.core.refactoring.participants.DeleteParticipant"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The example below defines a delete participant. The participant is enabled if one of the project affected by the refactoring has a Java nature and when the element to be deleted is of type ICompilationUnit.
-
-&lt;pre&gt;
-&lt;deleteParticipant
-    id=&quot;org.myCompany.deleteParticipant&quot;
-    name=&quot;%DeleteParticipant.name&quot; 
-    class=&quot;org.myCompany.Participant&quot;&gt;
-    &lt;enablement&gt;
-      &lt;with variable=&quot;affectedNatures&quot;&gt;
-        &lt;iterate operator=&quot;or&quot;&gt;
-          &lt;equals value=&quot;org.eclipse.jdt.core.javanature&quot;/&gt;
-        &lt;/iterate&gt;
-      &lt;/with&gt;
-      &lt;with variable=&quot;element&quot;&gt;
-        &lt;instanceof value=&quot;org.eclipse.jdt.core.ICompilationUnit&quot;/&gt;
-      &lt;/with&gt;
-    &lt;/enablement&gt;
-&lt;/deleteParticipant&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must extend &lt;code&gt;org.eclipse.ltk.core.refactoring.participants.DeleteParticipant&lt;/code&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2001, 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.ltk.core.refactoring/schema/moveParticipants.exsd b/org.eclipse.ltk.core.refactoring/schema/moveParticipants.exsd
deleted file mode 100644
index 6f1226b..0000000
--- a/org.eclipse.ltk.core.refactoring/schema/moveParticipants.exsd
+++ /dev/null

@@ -1,150 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ltk.core.refactoring">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ltk.core.refactoring" id="moveParticipants" name="Move Participants"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define refactoring move participants. The reader of the expression provides the following predefined variables which can be referenced via the &amp;lt;with variable=&quot;...&quot;&amp;gt; expression element:
-
-&lt;ul&gt;
-  &lt;li&gt;Object element: the element to be moved&lt;/li&gt;
-  &lt;li&gt;List&amp;lt;String&amp;gt; affectedNatures: a list containing the natures of the projects affected 
-      by the refactoring&lt;/li&gt;
-  &lt;li&gt;String processorId: the id of the refactoring processor that will own the participant.
-&lt;/ul&gt;
-
-The default variable used during expression evaluation is bound to the element variable.
-      </documentation>
-   </annotation>
-
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="moveParticipant" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="moveParticipant">
-      <complexType>
-         <all>
-            <element ref="enablement"/>
-         </all>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  unique identifier for the move participant.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a human reabable name of the move participant
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that provides the participant implementation.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ltk.core.refactoring.participants.MoveParticipant"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The example below defines a type move participant. The participant is enabled if one of the project affected by the refactoring has a Java nature and when the type to be moved is a JUnit test.
-
-&lt;pre&gt;
-&lt;moveParticipant
-    id=&quot;org.eclipse.jdt.junit.moveTypeParticipant&quot;
-    name=&quot;%MoveTypeParticipant.name&quot; 
-    class=&quot;org.eclipse.jdt.internal.junit.ui.TypeMoveParticipant&quot;&gt;
-    &lt;enablement&gt;
-      &lt;with variable=&quot;affectedNatures&quot;&gt;
-        &lt;iterate operator=&quot;or&quot;&gt;
-          &lt;equals value=&quot;org.eclipse.jdt.core.javanature&quot;/&gt;
-        &lt;/iterate&gt;
-      &lt;/with&gt;
-      &lt;with variable=&quot;element&quot;&gt;
-        &lt;instanceof value=&quot;org.eclipse.jdt.core.IType&quot;/&gt;
-        &lt;test property=&quot;org.eclipse.jdt.junit.isTest&quot;/&gt;
-      &lt;/with&gt;
-    &lt;/enablement&gt;
-&lt;/moveParticipant&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must extend &lt;code&gt;org.eclipse.ltk.core.refactoring.participants.MoveParticipant&lt;/code&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2001, 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.ltk.core.refactoring/schema/renameParticipants.exsd b/org.eclipse.ltk.core.refactoring/schema/renameParticipants.exsd
deleted file mode 100644
index e717ba5..0000000
--- a/org.eclipse.ltk.core.refactoring/schema/renameParticipants.exsd
+++ /dev/null

@@ -1,152 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ltk.core.refactoring">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ltk.core.refactoring" id="renameParticipants" name="Rename Participants"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define refactoring rename participants. The reader of the expression provides the following predefined variables which can be referenced via the &amp;lt;with variable=&quot;...&quot;&amp;gt; expression element:
-
-&lt;ul&gt;
-  &lt;li&gt;Object element: the element to be renamed&lt;/li&gt;
-  &lt;li&gt;List&amp;lt;String&amp;gt; affectedNatures: a list containing the natures of the projects affected 
-      by the refactoring&lt;/li&gt;
-  &lt;li&gt;String processorId: the id of the refactoring processor that will own the participant.
-&lt;/ul&gt;
-
-The default variable used during expression evaluation is bound to the element variable.
-      </documentation>
-   </annotation>
-
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="renameParticipant" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="renameParticipant">
-      <complexType>
-         <all>
-            <element ref="enablement"/>
-         </all>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  unique identifier for the rename participant.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a human reabable name of the rename participant
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that provides the participant implementation.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ltk.core.refactoring.participants.RenameParticipant"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The example below defines a rename participant that participates in a type rename.
-The participant is enabled if one of the project affected by the refactoring has a
-Java nature and when the type to be renamed is a JUnit test.
-
-&lt;pre&gt;
-&lt;renameParticipant
-    id=&quot;org.eclipse.jdt.junit.renameTypeParticipant&quot;
-    name=&quot;%RenameTypeParticipant.name&quot; 
-    class=&quot;org.eclipse.jdt.internal.junit.ui.TypeRenameParticipant&quot;&gt;
-    &lt;enablement&gt;
-      &lt;with variable=&quot;affectedNatures&quot;&gt;
-        &lt;iterate operator=&quot;or&quot;&gt;
-          &lt;equals value=&quot;org.eclipse.jdt.core.javanature&quot;/&gt;
-        &lt;/iterate&gt;
-      &lt;/with&gt;
-      &lt;with variable=&quot;element&quot;&gt;
-        &lt;instanceof value=&quot;org.eclipse.jdt.core.IType&quot;/&gt;
-        &lt;test property=&quot;org.eclipse.jdt.junit.isTest&quot;/&gt;
-      &lt;/with&gt;
-    &lt;/enablement&gt;
-&lt;/renameParticipant&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must extend &lt;code&gt;org.eclipse.ltk.core.refactoring.participants.RenameParticipant&lt;/code&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2001, 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.ltk.core.refactoring/scripts/exportplugin.xml b/org.eclipse.ltk.core.refactoring/scripts/exportplugin.xml
deleted file mode 100644
index 7846f28..0000000
--- a/org.eclipse.ltk.core.refactoring/scripts/exportplugin.xml
+++ /dev/null

@@ -1,30 +0,0 @@
-<project name="org.eclipse.jdt.ui" default="export" basedir="..">
-<!-- build script to create a plugin from org.eclipse.core.expressions -->
-
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.ltk.core.refactoring" />
-		<property name="version"  value="_3.1.0" />
-		<property name="dest"  value="${destdir}/${plugin}${version}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<jar 
-			jarfile="${dest}/refcore.jar"
-			basedir="bin"
-		/>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<zip zipfile="${dest}/refcoresrc.zip">
-		    <fileset dir="src" />
-  		</zip>		
-	</target>
-</project>

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Change.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Change.java
deleted file mode 100644
index f2e33c4..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Change.java
+++ /dev/null

@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * An abstract base implementation for object representing a generic change 
- * to the workbench. A <code>Change</code> object is typically created by 
- * calling <code>Refactoring.createChange()</code>. This class should be
- * subclassed by clients wishing to provide new changes.
- * <p>
- * Changes are best executed by using a {@link PerformChangeOperation}. If clients
- * execute a change directly then the following life cycle has to be honored:
- * <ul>
- *   <li>after a single change or a tree of changes has been created, the
- *       method <code>initializeValidationState</code> has to be called.</li>
- *   <li>the method <code>isValid</code> can be used to determine if a change
- *       can still be applied to the workspace. If the method returns a {@link 
- *       RefactoringStatus} with a severity of FATAL then the change has to be 
- *       treated as invalid. Performing an invalid change isn't allowed and 
- *       results in an unspecified result. This method can be called multiple
- *       times.
- *   <li>then the method perform can be called. An disabled change must not
- *       be executed. The perform method can only be called once. After a change
- *       as been executed only the method <code>dispose</code> must be called.</li>
- *   <li>the method dispose has to be called either after the perform method
- *       has been called or if a change is no longer needed. The second case
- *       for example occurs when the undo stack gets flushed and all change
- *       objects managed by the undo stack are no longer needed. The method
- *       dispose is typically implemented to unregister listeners register during the
- *       method <code>initializeValidationState</code>. There is no guarantee 
- *       that <code>initializeValidationState</code>, <code>isValid</code>
- *       or <code>perform</code> has been called, before <code>dispose</code>
- *       is called.
- * </ul>
- * Below a code snippet that can be used to execute a change:
- * <pre>
- *   Change change= createChange();
- *   try {
- *     change.initializeValidationState(pm);
- * 
- *     ....
- * 
- *     if (!change.isEnabled())
- *         return;
- *     RefactoringStatus valid= change.isValid(new SubProgressMonitor(pm, 1));
- *     if (valid.hasFatalError())
- *         return;
- *     Change undo= change.perform(new SubProgressMonitor(pm, 1));
- *     if (undo != null) {
- *        undo.initializeValidationState(new SubProgressMonitor(pm, 1));
- *        // do something with the undo object
- *     }
- *   } finally {
- *     change.dispose();
- *   }
- * </pre>
- * </p>
- * <p>
- * It is important that implementors of this abstract class provide an adequate 
- * implementation of <code>isValid</code> and that they provide an undo change
- * via the return value of the method <code>perform</code>. If no undo can be
- * provided then the perform method is allowed to return <code>null</code>. But
- * implementors should be aware that not providing an undo object for a change 
- * object that is part of a larger change tree will result in the fact that for
- * the whole change tree no undo object will be present.    
- * </p>
- * <p>
- * Clients may subclass this class.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class Change implements IAdaptable {
-
-	private Change fParent;
-	private boolean fIsEnabled= true;
-	
-	/**
-	 * Constructs a new change object.
-	 */
-	protected Change() {
-	}
-	
-	/**
-	 * Returns the human readable name of this change. The
-	 * name <em>MUST</em> not be <code>null</code>.
-	 * 
-	 * @return the human readable name of this change
-	 */
-	public abstract String getName();
-	
-	/**
-	 * Returns whether this change is enabled or not. Disabled changes
-	 * must not be executed.
-	 *
-	 * @return <code>true</code> if the change is enabled; <code>false</code>
-	 *  otherwise.
-	 */
-	public boolean isEnabled() {
-		return fIsEnabled;
-	}
-	
-	/**
-	 * Sets whether this change is enabled or not.
-	 *
-	 * @param enabled <code>true</code> to enable this change; <code>
-	 *  false</code> otherwise
-	 */
-	public void setEnabled(boolean enabled) {
-		fIsEnabled= enabled;
-	}
-	
-	/**
-	 * Returns the parent change. Returns <code>null</code> if no
-	 * parent exists.
-	 * 
-	 * @return the parent change
-	 */
-	public Change getParent() {
-		return fParent;
-	}
-	
-	/**
-	 * Sets the parent of this change. Requires that this change isn't already
-	 * connected to a parent. The parent can be <code>null</code> to disconnect
-	 * this change from a parent.
-	 * 
-	 * @param parent the parent of this change or <code>null</code>
-	 */
-	/* package */ void setParent(Change parent) {
-		if (parent != null)
-			Assert.isTrue(fParent == null);
-		fParent= parent;
-	}
-	
-	/**
-	 * Hook method to initialize some internal state to provide an adequate answer
-	 * for the <code>isValid</code> method. This method gets called after a change
-	 * or a whole change tree has been created. 
-	 * <p>
-	 * Typically this method is implemented in one of the following ways: 
-	 * <ul>
-	 *   <li>the change hooks up a listener on some delta notification mechanism
-	 *       and marks itself as invalid if it receives a certain delta. Is this 
-	 *       the case the implementor must take care of unhooking the listener
-	 *       in <code>dispose</code>.</li>
-	 *   <li>the change remembers some information allowing to decide if a change
-	 *       object is still valid when <code>isValid</code> is called.</li>
-	 * </ul>
-	 * <p>
-	 * For example, a change object that manipulates the content of an <code>IFile</code>
-	 * could either listen to resource changes and detect that the file got changed or
-	 * it could remember some content stamp and compare it with the actual content stamp 
-	 * when <code>isValid</code> is called.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor
-	 */
-	public abstract void initializeValidationData(IProgressMonitor pm);
-	
-	/**
-	 * Verifies that this change object is still valid and can be executed by calling 
-	 * <code>perform</code>. If a refactoring status  with a severity of {@link 
-	 * RefactoringStatus#FATAL} is returned then the change has to be treated as invalid 
-	 * and can no longer be executed. Performing such a change produces an unspecified 
-	 * result and will very likely throw an exception.
-	 * <p>
-	 * This method is also called by the {@link IUndoManager UndoManager} to decide if
-	 * an undo or redo change is still valid and therefore can be executed.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor.
-	 * 
-	 * @return a refactoring status describing the outcome of the validation check
-	 * 
-	 * @throws CoreException if an error occurred during validation check. The change
-	 *  is to be treated as invalid if an exception occurs
-	 * 
-	 * @throws OperationCanceledException if the validation check got cancelled
-	 */
-	public abstract RefactoringStatus isValid(IProgressMonitor pm) throws CoreException, OperationCanceledException;
-	
-	/**
-	 * Performs this change. If this method is call on an invalid or disabled change 
-	 * object the result is unspecified. Changes should in general not respond to
-	 * {@link IProgressMonitor#isCanceled()} since canceling a change tree in the
-	 * middle of its execution leaves the workspace in a half changed state.   
-	 * 
-	 * @param pm a progress monitor
-	 * 
-	 * @return the undo change for this change object or <code>null</code> if no
-	 *  undo is provided
-	 * 
-	 * @throws CoreException if an error occurred during change execution
-	 */
-	public abstract Change perform(IProgressMonitor pm) throws CoreException;
-	
-	/**
-	 * Disposes this change. Subclasses that override this method typically 
-	 * unregister listeners which got registered during the call to <code>
-	 * initializeValidationState</code>. 
-	 * <p>
-	 * Subclasses may override this method.
-	 * </p>
-	 */
-	public void dispose() {
-		// empty default implementation
-	}
-	 
-	/**
-	 * Returns the element modified by this <code>Change</code>. The method may return 
-	 * <code>null</code> if the change isn't related to an element.
-	 * 
-	 * @return the element modified by this change
-	 */
-	public abstract Object getModifiedElement();
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getAdapter(Class adapter) {
-		if (fParent == null)
-			return null;
-		return fParent.getAdapter(adapter);
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CheckConditionsOperation.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CheckConditionsOperation.java
deleted file mode 100644
index 8fe0071..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CheckConditionsOperation.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * Operation that, when run, checks the preconditions of the {@link Refactoring}
- * passed on creation.
- * <p>
- * The operation should be executed via the run method offered by
- * <code>IWorkspace</code> to achieve proper delta batching.
- * </p>
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @see org.eclipse.ltk.core.refactoring.Refactoring#checkInitialConditions(IProgressMonitor)
- * @see org.eclipse.ltk.core.refactoring.Refactoring#checkFinalConditions(IProgressMonitor)
- * @see org.eclipse.ltk.core.refactoring.Refactoring#checkAllConditions(IProgressMonitor)
- * 
- * @since 3.0
- */
-public class CheckConditionsOperation implements IWorkspaceRunnable {
-	
-	private Refactoring fRefactoring;
-	private int fStyle;
-	private RefactoringStatus fStatus;
-	
-	/** Flag indicating that no conditions will be checked */
-	public final static int NONE=				0;
-	/** Flag indicating that only initial conditions will be checked*/
-	public final static int INITIAL_CONDITONS=	1 << 1;
-	/** Flag indicating that only final conditions will be checked */
-	public final static int FINAL_CONDITIONS=	1 << 2;
-	/** Flag indicating that all conditions will be checked */
-	public final static int ALL_CONDITIONS=		INITIAL_CONDITONS | FINAL_CONDITIONS;
-	
-	private final static int LAST=          	1 << 3;
-	
-	/**
-	 * Creates a new <code>CheckConditionsOperation</code>.
-	 * 
-	 * @param refactoring the refactoring for which the preconditions are to
-	 *  be checked.
-	 * @param style style to define which conditions to check. Must be one of
-	 *  <code>INITIAL_CONDITONS</code>, <code>FINAL_CONDITIONS</code> or 
-	 *  <code>ALL_CONDITIONS</code>
-	 */
-	public CheckConditionsOperation(Refactoring refactoring, int style) {
-		Assert.isNotNull(refactoring);
-		fRefactoring= refactoring;
-		fStyle= style;
-		Assert.isTrue(checkStyle(fStyle));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void run(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		try {
-			fStatus= null;
-			if ((fStyle & ALL_CONDITIONS) == ALL_CONDITIONS)
-				fStatus= fRefactoring.checkAllConditions(pm);
-			else if ((fStyle & INITIAL_CONDITONS) == INITIAL_CONDITONS)
-				fStatus= fRefactoring.checkInitialConditions(pm);
-			else if ((fStyle & FINAL_CONDITIONS) == FINAL_CONDITIONS)
-				fStatus= fRefactoring.checkFinalConditions(pm);
-		} finally {
-			pm.done();
-		}
-	}
-
-	/**
-	 * Returns the outcome of the operation or <code>null</code> if an exception 
-	 * has occurred while performing the operation or if the operation hasn't
-	 * been performed yet.
-	 * 
-	 * @return the {@link RefactoringStatus} of the condition checking
-	 */
-	public RefactoringStatus getStatus() {
-		return fStatus;
-	}
-	
-	/**
-	 * Returns the operation's refactoring
-	 * 
-	 * @return the operation's refactoring
-	 */
-	public Refactoring getRefactoring() {
-		return fRefactoring;
-	}
-	
-	/**
-	 * Returns the condition checking style.
-	 * 
-	 * @return the condition checking style
-	 */
-	public int getStyle() {
-		return fStyle;
-	}
-	
-	private boolean checkStyle(int style) {
-		return style > NONE && style < LAST;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CompositeChange.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CompositeChange.java
deleted file mode 100644
index d7b5b11..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CompositeChange.java
+++ /dev/null

@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCoreMessages;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCorePlugin;
-
-/**
- * Represents a composite change. Composite changes can be marked
- * as synthetic. A synthetic composite changes might not be rendered
- * in the refactoring preview tree to save display real-estate.
- * <p>
- * Clients may subclass this class.
- * </p>
- * 
- * @see Change
- * 
- * @since 3.0
- */
-public class CompositeChange extends Change {
-
-	private String fName;
-	private List fChanges;
-	private boolean fIsSynthetic;
-	private Change fUndoUntilException;
-	
-
-	/**
-	 * Creates a new composite change with the given name.
-	 * 
-	 * @param name the human readable name of the change. Will
-	 *  be used to display the change in the user interface 
-	 */
-	public CompositeChange(String name) {
-		this(name, new ArrayList(2));
-	}
-	
-	/**
-	 * Creates a new composite change with the given name and array
-	 * of children.
-	 * 
-	 * @param name the human readable name of the change. Will
-	 *  be used to display the change in the user interface
-	 * @param children the initial array of children
-	 */
-	public CompositeChange(String name, Change[] children) {
-		this(name, new ArrayList(children.length));
-		addAll(children);
-	}
-			
-	private CompositeChange(String name, List changes) {
-		Assert.isNotNull(changes);
-		Assert.isNotNull(name);
-		fChanges= changes;
-		fName= name;
-	}
-	
-	/**
-	 * Returns whether this change is synthetic or not.
-	 * 
-	 * @return <code>true</code>if this change is synthetic; otherwise
-	 *  <code>false</code>
-	 */
-	public boolean isSynthetic() {
-		return fIsSynthetic;
-	}
-
-	/**
-	 * Marks this change as synthetic.
-	 */
-	public void markAsSynthetic() {
-		fIsSynthetic= true;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/**
-	 * Adds the given change to the list of children. The change to be added
-	 * can be <code>null</code>. Adding a "null" change does nothing.
-	 * 
-	 * @param change the change to add
-	 */
-	public void add(Change change) {
-		if (change != null) {
-			Assert.isTrue(change.getParent() == null);
-			fChanges.add(change);
-			change.setParent(this);
-		}
-	}
-	
-	/**
-	 * Adds all changes in the given array to the list of children.
-	 * 
-	 * @param changes the changes to add
-	 */
-	public void addAll(Change[] changes) {
-		for (int i= 0; i < changes.length; i++) {
-			add(changes[i]);
-		}
-	}
-	
-	/**
-	 * Merges the children of the given composite change into this
-	 * change. This means the changes are removed from the given
-	 * composite change and added to this change.
-	 * 
-	 * @param change the change to merge
-	 */
-	public void merge(CompositeChange change) {
-		Change[] others= change.getChildren();
-		for (int i= 0; i < others.length; i++) {
-			Change other= others[i];
-			change.remove(other);
-			add(other);
-		}
-	}
-	
-	/**
-	 * Removes the given change from the list of children.
-	 *
-	 * @param change the change to remove
-	 * 
-	 * @return <code>true</code> if the change contained the given
-	 *  child; otherwise <code>false</code> is returned
-	 */
-	public boolean remove(Change change) {
-		Assert.isNotNull(change);
-		boolean result= fChanges.remove(change);
-		if (result) {
-			change.setParent(null);
-		}
-		return result;
-		
-	}
-	
-	/**
-	 * Returns the children managed by this composite change. 
-	 * 
-	 * @return the children of this change or an empty array if no
-	 *  children exist
-	 */
-	public Change[] getChildren() {
-		// This is false code. There is only one write access to fChanges in this
-		// code and this is in the private constructor CompositeChange(String name, List changes).
-		// And this one ensures that fChanges is not null. Code should be removed 
-		// after 3.0.
-		if (fChanges == null)
-			return null;
-		return (Change[])fChanges.toArray(new Change[fChanges.size()]);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * <p>
-	 * The composite change sends <code>setEnabled</code> to all its children.
-	 * </p>
-	 * <p>
-	 * Client are allowed to extend this method.
-	 * </p> 
-	 */
-	public void setEnabled(boolean enabled) {
-		for (Iterator iter= fChanges.iterator(); iter.hasNext(); ) {
-			((Change)iter.next()).setEnabled(enabled);
-		}
-	}	
-	/**
-	 * {@inheritDoc}
-	 * <p>
-	 * The composite change sends <code>initializeValidationData</code> to all its 
-	 * children.
-	 * </p>
-	 * <p>
-	 * Client are allowed to extend this method.
-	 * </p> 
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		pm.beginTask("", fChanges.size()); //$NON-NLS-1$
-		for (Iterator iter= fChanges.iterator(); iter.hasNext();) {
-			Change change= (Change)iter.next();
-			change.initializeValidationData(new SubProgressMonitor(pm, 1));
-			pm.worked(1);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * <p>
-	 * The composite change sends <code>isValid</code> to all its children
-	 * until the first one returns a status with a severity of <code>FATAL
-	 * </code>. If one of the children throws an exception the remaining children
-	 * will not receive the <code>isValid</code> call.
-	 * </p>
-	 * <p>
-	 * Client are allowed to extend this method.
-	 * </p> 
-	 */
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		RefactoringStatus result= new RefactoringStatus();
-		pm.beginTask("", fChanges.size()); //$NON-NLS-1$
-		for (Iterator iter= fChanges.iterator(); iter.hasNext() && !result.hasFatalError();) {
-			Change change= (Change)iter.next();
-			if (change.isEnabled())
-				result.merge(change.isValid(new SubProgressMonitor(pm, 1)));
-			else
-				pm.worked(1);
-			if (pm.isCanceled())
-				throw new OperationCanceledException();
-		}
-		pm.done();
-		return result;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * <p>
-	 * The composite change sends <code>perform</code> to all its <em>enabled</em>
-	 * children. If one of the children throws an exception the remaining children
-	 * will not receive the <code>perform</code> call. In this case the method <code>
-	 * getUndoUntilException</code> can be used to get an undo object containing the
-	 * undo objects of all executed children.
-	 * </p>
-	 * <p>
-	 * Client are allowed to extend this method.
-	 * </p> 
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		fUndoUntilException= null;
-		List undos= new ArrayList(fChanges.size());
-		pm.beginTask("", fChanges.size()); //$NON-NLS-1$
-		pm.setTaskName(RefactoringCoreMessages.getString("CompositeChange.performingChangesTask.name")); //$NON-NLS-1$
-		Change change= null;
-		try {
-			for (Iterator iter= fChanges.iterator(); iter.hasNext();) {
-				change= (Change)iter.next();
-				if (change.isEnabled()) {
-					Change undoChange= change.perform(new SubProgressMonitor(pm, 1));
-					if (undos != null) {
-						if (undoChange == null) {
-							undos= null;
-						} else {
-							undos.add(undoChange);
-						}
-					}
-				}
-				// remove the change from the list of children to give
-				// the garbage collector the change to collect the change. This
-				// ensures that the memory consumption doesn't go up when
-				// producing the undo change tree.
-				iter.remove();
-				// Make sure we dispose the change since it will now longer be
-				// in the list of children when call CompositeChange#dispose()
-				final Change changeToDispose= change;
-				Platform.run(new ISafeRunnable() {
-					public void run() throws Exception {
-						changeToDispose.dispose();
-					}
-					public void handleException(Throwable exception) {
-						RefactoringCorePlugin.log(exception);
-					}
-				});
-			}
-			if (undos != null) {
-				Collections.reverse(undos);
-				return createUndoChange((Change[]) undos.toArray(new Change[undos.size()]));
-			} else {
-				return null;
-			}
-		} catch (CoreException e) {
-			handleUndos(change, undos);
-			internalHandleException(change, e);
-			throw e;
-		} catch (RuntimeException e) {
-			handleUndos(change, undos);
-			internalHandleException(change, e);
-			throw e;
-		}
-	}
-	
-	private void handleUndos(Change failedChange, List undos) {
-		if (undos == null) {
-			fUndoUntilException= null;
-			return;
-		}
-		if (failedChange instanceof CompositeChange) {
-			Change partUndoChange= ((CompositeChange)failedChange).getUndoUntilException();
-			if (partUndoChange != null) {
-				undos.add(partUndoChange);
-			}
-		}
-		if (undos.size() == 0) {
-			fUndoUntilException= new NullChange(getName());
-			return;
-		}
-		Collections.reverse(undos);
-		fUndoUntilException= createUndoChange((Change[]) undos.toArray(new Change[undos.size()]));
-	}
-	
-	/**
-	 * Note: this is an internal method and should not be overridden outside of
-	 * the refacotring framework.
-	 * <p>
-	 * The method gets called if one of the changes managed by this
-	 * composite change generates and exception when performed.
-	 * </p>
-	 * 
-	 * @param change the change that caused the exception
-	 * @param t the exception itself
-	 */
-	protected void internalHandleException(Change change, Throwable t) {
-		// do nothing
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>
-	 * The composite change sends <code>dispose</code> to all its children. It is guaranteed
-	 * that all children receive the <code>dispose</code> call.
-	 * </p>
-	 */
-	public void dispose() {
-		for (Iterator iter= fChanges.iterator(); iter.hasNext(); ) {
-			final Change change= (Change)iter.next();
-			Platform.run(new ISafeRunnable() {
-				public void run() throws Exception {
-					change.dispose();
-				}
-				public void handleException(Throwable exception) {
-					RefactoringCorePlugin.log(exception);
-				}
-			});
-		}
-	}
-	
-	/**
-	 * Returns the undo object containing all undo changes of those children
-	 * that got successfully executed while performing this change. Returns
-	 * <code>null</code> if all changes were executed successfully.
-	 * <p>
-	 * This method is not intended to be overridden or extended.
-	 * </p>
-	 * @return the undo object containing all undo changes of those children
-	 *  that got successfully executed while performing this change
-	 */
-	public Change getUndoUntilException() {
-		return fUndoUntilException;
-	}
-		
-	/**
-	 * Hook to create an undo change. The method should be overridden
-	 * by clients which provide their own composite change to create
-	 * a corresponding undo change.
-	 * 
-	 * @param childUndos the child undo. The undos appear in the
-	 *  list in the reverse order of their execution. So the first
-	 *  change in the array is the undo change of the last change
-	 *  that got executed.
-	 * 
-	 * @return the undo change
-	 */
-	protected Change createUndoChange(Change[] childUndos) {
-		return new CompositeChange(getName(), childUndos);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getModifiedElement() {
-		return null;
-	}
-
-	public String toString() {
-		StringBuffer buff= new StringBuffer();
-		buff.append(getName());
-		buff.append("\n"); //$NON-NLS-1$
-		for (Iterator iter= fChanges.iterator(); iter.hasNext();) {
-			buff.append("<").append(iter.next().toString()).append("/>\n"); //$NON-NLS-2$ //$NON-NLS-1$
-		}
-		return buff.toString();
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/ContentStamp.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/ContentStamp.java
deleted file mode 100644
index 29a2b1c..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/ContentStamp.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-/**
- * A content stamp object represent the content of an <code>IFile</code>.
- * A content stamp object is updated whenever the content of a file
- * changes. In contrast to a modification stamp a content stamp is reverted
- * to its previous value if the content of the file is reverted back by
- * performing a corresponding undo change.
- * <p>
- * Clients of the refactoring framework don't need to take care of content
- * stamps. They are managed by the framework itself.
- * </p>
- * <p>
- * Not all files in the workspace are annotated with a content stamp. The 
- * refactoring framework only adds content stamp to those files where necessary.
- * </p>
- * <p>
- * Content stamp are to be compared using the <code>equals(Object)</code> method.
- * It is not guaranteed that content stamp are identical for identical files.
- * </p>
- * <p>
- * This class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class ContentStamp {
-
-	/**
-	 * Checks whether the stamp is the null stamp or not. A null stamp
-	 * is generated for files which either don't exist or exist in a 
-	 * closed project.
-	 * 
-	 * @return whether the stamp is the null stamp or not.
-	 */
-	public abstract boolean isNullStamp();
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CreateChangeOperation.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CreateChangeOperation.java
deleted file mode 100644
index 883fde0..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/CreateChangeOperation.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.NotCancelableProgressMonitor;
-
-/**
- * Operation that, when performed, creates a {@link Change} object for a given
- * refactoring. If created with a refactoring object directly, no precondition
- * checking is performed. If created with a {@link CheckConditionsOperation} the
- * requested precondition checking is performed before creating the change.
- * <p>
- * If the precondition checking returns a fatal error or the status's severity
- * exceeds a certain threshold then no change will be created.
- * </p>
- * <p>
- * If a change has been created the operation calls {@link Change#initializeValidationData(IProgressMonitor)}
- * to initialize the change's validation data.
- * </p>
- * <p>
- * The operation should be executed via the run method offered by
- * <code>IWorkspace</code> to achieve proper delta batching.
- * </p>
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class CreateChangeOperation implements IWorkspaceRunnable {
-
-	private Refactoring fRefactoring;
-	
-	private CheckConditionsOperation fCheckConditionOperation;
-	private int fConditionCheckingFailedSeverity;
-	
-	private Change fChange;
-	
-	/**
-	 * Creates a new operation with the given refactoring. No condition checking
-	 * is performed before creating the change object. It is assumed that the
-	 * condition checking has already been performed outside of this operation.
-	 * The operation might fail if the precondition checking has not been performed
-	 * yet.
-	 *
-	 * @param refactoring the refactoring for which the change is to be created
-	 */
-	public CreateChangeOperation(Refactoring refactoring) {
-		Assert.isNotNull(refactoring);
-		fRefactoring= refactoring;
-	}
-	
-	/**
-	 * Creates a new operation with the given {@link CheckConditionsOperation}. When
-	 * performed the operation first checks the conditions as specified by the <code>
-	 * CheckConditionsOperation</code>. Depending on the result of the condition 
-	 * checking a change object is created or not.
-	 * 
-	 * @param operation the condition checking operation
-	 * @param checkFailedSeverity the severity from which on the condition checking is
-	 *  interpreted as failed. The passed value must be greater than {@link RefactoringStatus#OK}
-	 *  and less than or equal {@link RefactoringStatus#FATAL}. 
-	 *  The standard value from which on a condition check should is to be interpreted as
-	 *  failed can be accessed via {@link RefactoringCore#getConditionCheckingFailedSeverity()}.
-	 * 
-	 */
-	public CreateChangeOperation(CheckConditionsOperation operation, int checkFailedSeverity) {
-		Assert.isNotNull(operation);
-		fCheckConditionOperation= operation;
-		fRefactoring= operation.getRefactoring();
-		Assert.isTrue (checkFailedSeverity > RefactoringStatus.OK && checkFailedSeverity <= RefactoringStatus.FATAL);
-		fConditionCheckingFailedSeverity= checkFailedSeverity;
-	}
-	
-	/**
-	 * Returns the condition checking failed severity used by this operation.
-	 * 
-	 * @return the condition checking failed severity
-	 * 
-	 * @see RefactoringStatus
-	 */
-	public int getConditionCheckingFailedSeverity() {
-		return fConditionCheckingFailedSeverity;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void run(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		fChange= null;
-		try {
-			fChange= null;
-			if (fCheckConditionOperation != null) {
-				pm.beginTask("", 7); //$NON-NLS-1$
-				pm.subTask(""); //$NON-NLS-1$
-				fCheckConditionOperation.run(new SubProgressMonitor(pm, 4));
-				RefactoringStatus status= fCheckConditionOperation.getStatus();
-				if (status != null && status.getSeverity() < fConditionCheckingFailedSeverity) {
-					fChange= fRefactoring.createChange(new SubProgressMonitor(pm, 2));
-					fChange.initializeValidationData(new NotCancelableProgressMonitor(
-							new SubProgressMonitor(pm, 1)));
-				} else {
-					pm.worked(3);
-				}
-			} else {
-				pm.beginTask("", 3); //$NON-NLS-1$
-				fChange= fRefactoring.createChange(new SubProgressMonitor(pm, 2));
-				fChange.initializeValidationData(new NotCancelableProgressMonitor(
-					new SubProgressMonitor(pm, 1)));
-			}
-		} finally {
-			pm.done();
-		}
-	}
-
-	/**
-	 * Returns the outcome of the operation or <code>null</code> if an exception 
-	 * occurred when performing the operation or the operation hasn't been
-	 * performed yet.
-	 * 
-	 * @return the created change or <code>null</code>
-	 */
-	public Change getChange() {
-		return fChange;
-	}
-	
-	/**
-	 * Returns the status of the condition checking. Returns <code>null</code> if
-	 * no condition checking has been requested.
-	 * 
-	 * @return the status of the condition checking
-	 */
-	public RefactoringStatus getConditionCheckingStatus() {
-		if (fCheckConditionOperation != null)
-			return fCheckConditionOperation.getStatus();
-		return null;
-	}
-	
-	/**
-	 * Returns the condition checking style as set to the {@link CheckConditionsOperation}.
-	 * If no condition checking operation is provided (e.g. the change is created directly
-	 * by calling {@link Refactoring#createChange(IProgressMonitor)} then {@link 
-	 * CheckConditionsOperation#NONE} is returned.
-	 * 
-	 * @return the condition checking style
-	 */
-	public int getConditionCheckingStyle() {
-		if (fCheckConditionOperation != null)
-			return fCheckConditionOperation.getStyle(); 
-		return CheckConditionsOperation.NONE;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/DocumentChange.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/DocumentChange.java
deleted file mode 100644
index c313293..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/DocumentChange.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.text.edits.UndoEdit;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.TextChanges;
-import org.eclipse.ltk.internal.core.refactoring.UndoDocumentChange;
-
-/**
- * A text change that operates directly on instances of {@link IDocument}.
- * The document change uses a simple length compare to check if it
- * is still valid. So as long as its length hasn't changed the text edits
- * managed have a valid range and can be applied to the document. The
- * same applies to the undo change returned from the perform method.
- * 
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class DocumentChange extends TextChange {
-
-	private IDocument fDocument;
-	private int fLength;
-	
-	/**
-	 * Creates a new <code>DocumentChange</code> for the given 
-	 * {@link IDocument}.
-	 * 
-	 * @param name the change's name. Has to be a human readable name.
-	 * @param document the document this change is working on
-	 */
-	public DocumentChange(String name, IDocument document) {
-		super(name);
-		Assert.isNotNull(document);
-		fDocument= document;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getModifiedElement(){
-		return fDocument;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		// as long as we don't have modification stamps on documents
-		// we can only remember its length.
-		fLength= fDocument.getLength();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		pm.beginTask("", 1); //$NON-NLS-1$
-		RefactoringStatus result= TextChanges.isValid(fDocument, fLength);
-		pm.worked(1);
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	protected IDocument acquireDocument(IProgressMonitor pm) throws CoreException {
-		return fDocument;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected void commit(IDocument document, IProgressMonitor pm) throws CoreException {
-		// do nothing
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected void releaseDocument(IDocument document, IProgressMonitor pm) throws CoreException {
-		//do nothing
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected Change createUndoChange(UndoEdit edit) {
-		return new UndoDocumentChange(getName(), fDocument, edit);
-	}	
-}
-

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/FileStatusContext.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/FileStatusContext.java
deleted file mode 100644
index 054bea1..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/FileStatusContext.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.jface.text.IRegion;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * A file context can be used to annotate a <code>RefactoringStatusEntry</code> with
- * detailed information about a problem detected in an <code>IFile</code>.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class FileStatusContext extends RefactoringStatusContext {
-
-	private IFile fFile;
-	private IRegion fSourceRegion;
-
-	/**
-	 * Creates an status entry context for the given file and source region.
-	 * 
-	 * @param file the file that has caused the problem. Must not be <code>
-	 *  null</code>
-	 * @param region the source region of the problem inside the given file or
-	 *  <code>null</code> if now source region is known
-	 */
-	public FileStatusContext(IFile file, IRegion region) {
-		Assert.isNotNull(file);
-		fFile= file;
-		fSourceRegion= region;
-	}
-
-	/**
-	 * Returns the context's file.
-	 * 
-	 * @return the context's file
-	 */
-	public IFile getFile() {
-		return fFile;
-	}
-	
-	/**
-	 * Returns the context's source region
-	 * 
-	 * @return the context's source region or <code>null</code> if no source region
-	 *  has been set
-	 */
-	public IRegion getTextRegion() {
-		return fSourceRegion;
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on RefactoringStatusContext.
-	 */
-	public Object getCorrespondingElement() {
-		return getFile();
-	}	
-}
-

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IRefactoringCoreStatusCodes.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IRefactoringCoreStatusCodes.java
deleted file mode 100644
index 6845d1e..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IRefactoringCoreStatusCodes.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-/**
- * Status codes used by the refactoring core plug-in.
- * <p>
- * Note: this interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.core.runtime.Status
- * 
- * @since 3.0
- */
-public interface IRefactoringCoreStatusCodes {
-
-	/**
-	 * Status code (value 10000) indicating an internal error.
-	 */
-	public static final int INTERNAL_ERROR= 10000;
-
-	/** 
-	 * Status code (value 10001) indicating that a bad location exception has 
-	 * occurred during change execution.
-	 * 
-	 * @see org.eclipse.jface.text.BadLocationException
-	 */ 
-	public static final int BAD_LOCATION= 10001;
-	
-	/**
-	 * Status code (value 10002) indicating that an validateEdit call has changed the
-	 * content of a file on disk.
-	 */
-	public static final int VALIDATE_EDIT_CHANGED_CONTENT= 10002;
-	
-	/**
-	 * Status code (value 10003) indicating that a condition checker already exists
-	 * in a shared condition checking context.
-	 */
-	public static final int CHECKER_ALREADY_EXISTS_IN_CONTEXT= 10003;	
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IUndoManager.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IUndoManager.java
deleted file mode 100644
index 3f6086e..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IUndoManager.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * An undo manager keeps track of performed changes. Use the method <code>addUndo</code>
- * to add change objects to the undo stack and <code>performUndo</code> and <code>
- * performRedo</code> to undo or redo changes.
- * <p>
- * This interface is not intended to be implemented by clients. Clients should use the  
- * method {@link RefactoringCore#getUndoManager()} to access the refactoring undo manager.
- * </p>
- * 
- * @since 3.0
- */
-public interface IUndoManager {
-
-	/**
-	 * Adds a listener to the undo manager. Does nothing if the listener
-	 * is already present.
-	 * 
-	 * @param listener the listener to be added to the undo manager
-	 */
-	public void addListener(IUndoManagerListener listener);
-	
-	/**
-	 * Removes the given listener from this undo manager. Does nothing if
-	 * the listener isn't registered with this undo manager
-	 * 
-	 * @param listener the listener to be removed
-	 */
-	public void removeListener(IUndoManagerListener listener);
-	
-	/**
-	 * The infrastructure is going to perform the given change.
-	 * 
-	 * @param change the change to be performed.
-	 */
-	public void aboutToPerformChange(Change change);
-	
-	/**
-	 * The infrastructure has performed the given change.
-	 * 
-	 * @param change the change that was performed
-	 */
-	public void changePerformed(Change change);
-
-	/**
-	 * Adds a new undo change to this undo manager.
-	 * 
-	 * @param name the name presented on the undo stack for the provided
-	 *  undo change. The name must be human readable.
-	 * @param change the undo change
-	 */
-	public void addUndo(String name, Change change);
-
-	/**
-	 * Returns <code>true</code> if there is anything to undo, otherwise
-	 * <code>false</code>.
-	 * 
-	 * @return <code>true</code> if there is anything to undo, otherwise
-	 *  <code>false</code>
-	 */
-	public boolean anythingToUndo();
-	
-	/**
-	 * Returns the name of the top most undo.
-	 * 
-	 * @return the top most undo name. Returns <code>null</code> if there 
-	 * aren't any changes to undo.
-	 */
-	public String peekUndoName();
-	
-	/**
-	 * Undo the top most undo change.
-	 * 
-	 * @param query a proceed query to decide how to proceed if the validation
-	 *  checking of the undo change to perform returns a non OK status and the
-	 *  status isn't a fatal error. If <code>null</code> is passed in the the 
-	 *  undo proceeds if the status is not a fatal error.
-	 * @param pm a progress monitor to report progress during performing
-	 *  the undo change
-	 * 
-	 * @throws CoreException if performing the undo caused an exception
-	 */	
-	public void performUndo(IValidationCheckResultQuery query, IProgressMonitor pm) throws CoreException;
-
-	/**
-	 * Returns <code>true</code> if there is anything to redo, otherwise
-	 * <code>false</code>.
-	 * 
-	 * @return <code>true</code> if there is anything to redo, otherwise
-	 *  <code>false</code>
-	 */
-	public boolean anythingToRedo();
-	
-	/**
-	 * Returns the name of the top most redo.
-	 * 
-	 * @return the top most redo name. Returns <code>null</code> if there 
-	 * are no any changes to redo.
-	 */
-	public String peekRedoName();
-	
-	/**
-	 * Redo the top most redo change.
-	 * 
-	 * @param query a proceed query to decide how to proceed if the validation
-	 *  checking of the redo change to perform returns a non OK status. If
-	 *  <code>null</code> is passed in the the undo proceeds if the status
-	 *  is not a fatal error.
-	 * @param pm a progress monitor to report progress during performing
-	 *  the redo change
-	 * 
-	 * @throws CoreException if performing the redo caused an exception
-	 */	
-	public void performRedo(IValidationCheckResultQuery query, IProgressMonitor pm) throws CoreException;
-	
-	/**
-	 * Flushes the undo manager's undo and redo stacks.
-	 */	
-	public void flush();
-	
-	/**
-	 * Shut down the undo manager. 
-	 */
-	public void shutdown();
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IUndoManagerListener.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IUndoManagerListener.java
deleted file mode 100644
index bd1c216..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IUndoManagerListener.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-
-/**
- * Listener to monitor state changes of an {@link IUndoManager}.
- * <p>
- * Clients may implement this interface to listen to undo manger changes.
- * </p>
- * @since 3.0
- */
-public interface IUndoManagerListener {
-	
-	/**
-	 * This method is called by the undo manager if the undo stack has
-	 * changed (for example a undo object got added or the undo stack
-	 * got flushed).
-	 * 
-	 * @param manager the manager this listener is registered to
-	 */
-	public void undoStackChanged(IUndoManager manager);
-	
-	/**
-	 * This method is called by the undo manager if the redo stack has
-	 * changed (for example a redo object got added or the redo stack 
-	 * got flushed).
-	 * 
-	 * @param manager the manager this listener is registered to
-	 */
-	public void redoStackChanged(IUndoManager manager);
-	
-	/**
-	 * This method gets called by the undo manager if a change gets
-	 * executed in the context of the undo manager.
-	 * 
-	 * @param manager the manager this listener is registered to
-	 * @param change the change to be executed
-	 */
-	public void aboutToPerformChange(IUndoManager manager, Change change);
-	
-	/**
-	 * This method gets called by the undo manager when a change has 
-	 * been executed in the context of the undo manager.
-	 * 
-	 * @param manager the manager this listener is registered to
-	 * @param change the change that has been executed
-	 */
-	public void changePerformed(IUndoManager manager, Change change);	
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IValidationCheckResultQuery.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IValidationCheckResultQuery.java
deleted file mode 100644
index 60442b5..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/IValidationCheckResultQuery.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * A query interface to decide if a undo change whose validation check
- * returned a status unequal {@link org.eclipse.ltk.core.refactoring.RefactoringStatus#OK}
- * should be executed or not.
- * <p>
- * Clients should be aware that the methods defined by this interface can be
- * called from a non UI thread.
- * </p>
- * <p>
- * The interface may be implemented by clients.
- * </p>
- * 
- * @since 3.0
- */
-public interface IValidationCheckResultQuery {
-
-	/**
-	 * Returns whether the undo proceeds or not. This method is called if the
-	 * validation check returned a status greater than <code>OK</code> and less 
-	 * than <code>FATAL</code>.
-	 * 
-	 * @param status the refactoring status returned from {@link Change#isValid(IProgressMonitor)}
-	 * 
-	 * @return <code>true</code> if the undo should proceed; <code>false</code>
-	 *  otherwise
-	 */
-	public boolean proceed(RefactoringStatus status);
-	
-	/**
-	 * Called when the validation check returned a fatal error. In this case the
-	 * undo can't proceed. The hook can be used to present a corresponding dialog
-	 * to the user.
-	 * 
-	 * @param status the refactoring status returned from {@link Change#isValid(IProgressMonitor)}
-	 */
-	public void stopped(RefactoringStatus status);
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/NullChange.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/NullChange.java
deleted file mode 100644
index c4dbc02..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/NullChange.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCoreMessages;
-
-/**
- * A refactoring change that does nothing. The reverse change of a
- * <code>NullChange</code> is a <code>NullChange</code>.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class NullChange extends Change {
-
-	private String fName;
-	
-	/**
-	 * Creates a new <code>NullChange</code> with a default name.
-	 */
-	public NullChange() {
-		this(RefactoringCoreMessages.getString("NullChange.name")); //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a new <code>NullChange</code> with the given name.
-	 * 
-	 * @param name the human readable name of this change
-	 */
-	public NullChange(String name) {
-		Assert.isNotNull(name);
-		fName= name;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		// do nothing
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		return new RefactoringStatus();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		return new NullChange();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getModifiedElement() {
-		return null;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java
deleted file mode 100644
index 9f62de6..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java
+++ /dev/null

@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.NotCancelableProgressMonitor;
-
-/**
- * Operation that, when run, performs a {@link Change} object. The operation
- * can be created in two different ways: with a given change or with a
- * {@link CreateChangeOperation}. If created the second way the given create
- * change operation will be used to create the actual change to perform.
- * <p>
- * If the change has been performed successfully (e.g. {@link #changeExecuted()} returns
- * <code>true</code>) then the operation has called {@link Change#dispose()} as well
- * to clear-up internal state in the change object. If it hasn't been executed the
- * change is still intact and the client is responsible to dispose the change object.
- * </p>
- * <p>
- * If an undo change has been provided by the change to execute then the operation 
- * calls {@link Change#initializeValidationData(IProgressMonitor)} to initialize the 
- * undo change's validation data.
- * </p>
- * <p>
- * If an undo manager has been set via the method {@link #setUndoManager(IUndoManager, String)}
- * then the undo object, if any has been provided, will be pushed onto the manager's
- * undo stack.
- * </p> 
- * <p>
- * The operation should be executed via the run method offered by
- * <code>IWorkspace</code> to achieve proper delta batching.
- * </p>
- * <p> 
- * Note: this class is not intended to be extended outside of the refactoring framework.
- * </p>
- * 
- * @since 3.0 
- */
-public class PerformChangeOperation implements IWorkspaceRunnable {
-
-	private Change fChange;
-	private CreateChangeOperation fCreateChangeOperation;
-	private RefactoringStatus fValidationStatus;
-	
-	private Change fUndoChange;
-	private String fUndoName;
-	private IUndoManager fUndoManager;
-	
-	private boolean fChangeExecuted;
-	private boolean fChangeExecutionFailed;
-	
-	/**
-	 * Creates a new perform change operation instance for the given change.
-	 * 
-	 * @param change the change to be applied to the workbench
-	 */
-	public PerformChangeOperation(Change change) {
-		Assert.isNotNull(change);
-		fChange= change;
-	}
-
-	/**
-	 * Creates a new <code>PerformChangeOperation</code> for the given {@link 
-	 * CreateChangeOperation}. The create change operation is used to create 
-	 * the actual change to execute.
-	 * 
-	 * @param op the <code>CreateChangeOperation</code> used to create the
-	 *  actual change object
-	 */
-	public PerformChangeOperation(CreateChangeOperation op) {
-		Assert.isNotNull(op);
-		fCreateChangeOperation= op;
-	}
-	
-	/**
-	 * Returns <code>true</code> if the change execution failed.
-	 *  
-	 * @return <code>true</code> if the change execution failed; 
-	 *  <code>false</code> otherwise
-	 * 
-	 */
-	public boolean changeExecutionFailed() {
-		return fChangeExecutionFailed;
-	}
-
-	/**
-	 * Returns <code>true</code> if the change has been executed. Otherwise <code>
-	 * false</code> is returned.
-	 * 
-	 * @return <code>true</code> if the change has been executed, otherwise
-	 *  <code>false</code>
-	 */
-	public boolean changeExecuted() {
-		return fChangeExecuted;
-	}
-	
-	/**
-	 * Returns the status of the condition checking. Returns <code>null</code> if
-	 * no condition checking has been requested.
-	 * 
-	 * @return the status of the condition checking
-	 */
-	public RefactoringStatus getConditionCheckingStatus() {
-		if (fCreateChangeOperation != null)
-			return fCreateChangeOperation.getConditionCheckingStatus();
-		return null;
-	}
-	
-	/**
-	 * Returns the change used by this operation. This is either the change passed to
-	 * the constructor or the one create by the <code>CreateChangeOperation</code>.
-	 * Method returns <code>null</code> if the create operation did not create
-	 * a corresponding change or hasn't been executed yet.
-	 * 
-	 * @return the change used by this operation or <code>null</code> if no change
-	 *  has been created
-	 */
-	public Change getChange() {
-		return fChange;
-	}
-	
-	/**
-	 * Returns the undo change of the change performed by this operation. Returns
-	 * <code>null</code> if the change hasn't been performed yet or if the change
-	 * doesn't provide a undo.
-	 * 
-	 * @return the undo change of the performed change or <code>null</code>
-	 */
-	public Change getUndoChange() {
-		return fUndoChange;
-	}
-	
-	/**
-	 * Returns the refactoring status returned from the call <code>IChange#isValid()</code>.
-	 * Returns <code>null</code> if the change has not been executed.
-	 * 
-	 * @return the change's validation status
-	 */
-	public RefactoringStatus getValidationStatus() {
-		return fValidationStatus;
-	}
-	
-	/**
-	 * Sets the undo manager. If the executed change provides an undo change,
-	 * then the undo change is pushed onto this manager.
-	 *  
-	 * @param manager the undo manager to use or <code>null</code> if no
-	 *  undo recording is desired
-	 * @param undoName the name used to present the undo change on the undo
-	 *  stack. Must be a human-readable string. Must not be <code>null</code>
-	 *  if manager is unequal <code>null</code>
-	 */
-	public void setUndoManager(IUndoManager manager, String undoName) {
-		if (manager != null) {
-			Assert.isNotNull(undoName);
-		}
-		fUndoManager= manager;
-		fUndoName= undoName;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void run(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		try {
-			fChangeExecuted= false;
-			if (createChange()) {
-				pm.beginTask("", 2); //$NON-NLS-1$
-				pm.subTask(""); //$NON-NLS-1$
-				fCreateChangeOperation.run(new SubProgressMonitor(pm, 1));
-				fChange= fCreateChangeOperation.getChange();
-				if (fChange != null) {
-					executeChange(new SubProgressMonitor(pm, 1));
-				} else {
-					pm.worked(1);
-				}
-			} else {
-				executeChange(pm);
-			}
-		} finally {
-			pm.done();
-		}	
-	}
-	
-	/**
-	 * Actually executes the change.
-	 * 
-	 * @param pm a progress monitor to report progress
-	 * 
-	 * @throws CoreException if an unexpected error occurs during
-	 *  change execution
-	 */
-	protected void executeChange(IProgressMonitor pm) throws CoreException {
-		fChangeExecuted= false;
-		if (!fChange.isEnabled())
-			return;
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				boolean undoInitialized= false;
-				try {
-					monitor.beginTask("", 10); //$NON-NLS-1$
-					fValidationStatus= fChange.isValid(new SubProgressMonitor(monitor, 1));
-					if (fValidationStatus.hasFatalError())
-						return;
-					if (fUndoManager != null) {
-						ResourcesPlugin.getWorkspace().checkpoint(false);
-						fUndoManager.aboutToPerformChange(fChange);
-					}
-					fChangeExecutionFailed= true;
-					fUndoChange= fChange.perform(new SubProgressMonitor(monitor, 9));
-					fChangeExecutionFailed= false;
-					fChangeExecuted= true;
-					if (fUndoManager != null) {
-						ResourcesPlugin.getWorkspace().checkpoint(false);
-						fUndoManager.changePerformed(fChange);
-					}
-					fChange.dispose();
-					if (fUndoChange != null) {
-						fUndoChange.initializeValidationData(new NotCancelableProgressMonitor(
-							new SubProgressMonitor(monitor, 1)));
-						undoInitialized= true;
-					}
-					if (fUndoManager != null) {
-						if (fUndoChange != null) {
-							fUndoManager.addUndo(fUndoName, fUndoChange);
-						} else {
-							fUndoManager.flush();
-						}
-					}
-				} catch (CoreException e) {
-					if (fUndoManager != null)
-						fUndoManager.flush();
-					if (fUndoChange != null && undoInitialized) {
-						Change ch= fUndoChange;
-						fUndoChange= null;
-						ch.dispose();
-					}
-					fUndoChange= null;
-					throw e;
-				} catch (RuntimeException e) {
-					if (fUndoManager != null)
-						fUndoManager.flush();
-					if (fUndoChange != null && undoInitialized) {
-						Change ch= fUndoChange;
-						fUndoChange= null;
-						ch.dispose();
-					}
-					fUndoChange= null;
-					throw e;
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, pm);
-	}
-	
-	private boolean createChange() {
-		return fCreateChangeOperation != null;
-	}
-}
-

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformRefactoringOperation.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformRefactoringOperation.java
deleted file mode 100644
index f53ce4e..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformRefactoringOperation.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * Operation that, when run, executes a refactoring. This includes
- * condition checking, change creation, change execution and remembering
- * of the undo change on the refactoring's undo stack.
- * <p>
- * The operation should be executed via the run method offered by
- * <code>IWorkspace</code> to achieve proper delta batching.
- * </p>
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @see org.eclipse.core.resources.IWorkspace
- * 
- * @since 3.0 
- */
-public class PerformRefactoringOperation implements IWorkspaceRunnable {
-	
-	private int fStyle;
-	private Refactoring fRefactoring;
-	
-	private RefactoringStatus fPreconditionStatus;
-	private RefactoringStatus fValidationStatus;
-	private Change fUndo;
-	
-	/**
-	 * Create a new perform refactoring operation. The operation will not
-	 * perform the refactoring if the refactoring's condition checking returns 
-	 * an error	of severity {@link RefactoringStatus#FATAL}. 
-	 * 
-	 * @param refactoring the refactoring to perform
-	 * @param style the condition checking style as defined by 
-	 *  {@link CheckConditionsOperation} 
-	 */
-	public PerformRefactoringOperation(Refactoring refactoring, int style) {
-		Assert.isNotNull(refactoring);
-		fRefactoring= refactoring;
-		fStyle= style;
-	}
-	
-	/**
-	 * Return the refactoring status of the condition checking.
-	 * 
-	 * @return the refactoring status of the condition checking or <code>null</code>
-	 *  if the operation hasn't been performed yet
-	 */
-	public RefactoringStatus getConditionStatus() {
-		return fPreconditionStatus;
-	}
-	
-	/**
-	 * Returns the refactoring status of the change's validation checking
-	 * or <code>null</code> if a change couldn't be created or the operation
-	 * hasn't been performed yet.  
-	 *
-	 * @return the refactoring status of the change's validation checking
-	 */
-	public RefactoringStatus getValidationStatus() {
-		return fValidationStatus;
-	}
-	
-	/**
-	 * The undo object or <code>null</code> if no undo exists. The undo
-	 * object is initialize via the call {@link Change#initializeValidationData(IProgressMonitor)}
-	 * 
-	 * @return the undo object or <code>null</code>
-	 */
-	public Change getUndoChange() {
-		return fUndo;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void run(IProgressMonitor monitor) throws CoreException {
-		if (monitor == null)
-			monitor= new NullProgressMonitor();
-		monitor.beginTask("", 10); //$NON-NLS-1$
-		CreateChangeOperation create= new CreateChangeOperation(
-			new CheckConditionsOperation(fRefactoring, fStyle),
-			RefactoringStatus.FATAL);
-		create.run(new SubProgressMonitor(monitor, 6));
-		fPreconditionStatus= create.getConditionCheckingStatus();
-		if (fPreconditionStatus.hasFatalError()) {
-			monitor.done();
-			return;
-		}
-		Change change= create.getChange();
-		PerformChangeOperation perform= new PerformChangeOperation(change);
-		perform.setUndoManager(RefactoringCore.getUndoManager(), fRefactoring.getName());
-		perform.run(new SubProgressMonitor(monitor, 2));
-		fValidationStatus= perform.getValidationStatus();
-		fUndo= perform.getUndoChange();
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Refactoring.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Refactoring.java
deleted file mode 100644
index 73befa7..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Refactoring.java
+++ /dev/null

@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-/**
- * Abstract super class for all refactorings. Refactorings are used to perform
- * behaviour preserving work space transformations. A refactoring offers two 
- * different kind of methods:
- * <ol> 
- *   <li>methods to check conditions to determine if the refactoring can be carried out 
- *       in general and if transformation will be behavioural persevering.
- *       </li>
- *   <li>a method to create a {@link org.eclipse.ltk.core.refactoring.Change} object
- *       that represents the actual work space modifications.
- *       </li> 
- * </ol>
- * The life cycle of a refactoring is as follows:
- * <ul>
- *   <li>the refactoring gets created</li>
- *   <li>the refactoring is initialized with the elements to be refactored. It is
- *       up to a concrete refactoring implementation to provide corresponding API.</li>
- *   <li>{@link #checkInitialConditions(IProgressMonitor)} is called. The method 
- *       can be called more than once.</li>
- *   <li>additional arguments are provided to perform the refactoring (for example
- *       the new name of a element in the case of a rename refactoring). It is up
- *       to a concrete implementation to provide corresponding API.</li>
- *   <li>{@link #checkFinalConditions(IProgressMonitor)} is called. The method 
- *       can be called more than once. The method must not be called if  
- *       {@link #checkInitialConditions(IProgressMonitor)} returns a refactoring
- *       status of severity {@link RefactoringStatus#FATAL}.</li>
- *   <li>{@link #createChange(IProgressMonitor)} is called. The method must only 
- *       called once and should not be called if one of the condition checking methods
- *       return a refactoring status of severity {@link RefactoringStatus#FATAL}.
- *       </li>
- * </ul>
- * 
- * <p>
- * A refactoring can not assume that all resources are saved before any methods
- * are called on it. Therefore a refactoring must be able to deal with unsaved
- * resources.
- * </p>
- * <p>
- * The class should be subclassed by clients wishing to implement new refactorings. 
- * </p>
- * 
- * @since 3.0
- */
-public abstract class Refactoring extends PlatformObject {
-	
-	private Object fValidationContext;
-
-	/**
-	 * Sets the validation context used when calling 
-	 * {@link org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)}.
-	 * 
-	 * @param context the <code>org.eclipse.swt.widgets.Shell</code> that is
-	 * to be used to parent any dialogs with the user, or <code>null</code> if
-	 * there is no UI context (declared as an <code>Object</code> to avoid any
-	 * direct references on the SWT component)
-	 */
-	public final void setValidationContext(Object context) {
-		fValidationContext= context;
-	}
-	
-	/**
-	 * Returns the validation context
-	 * 
-	 * @return the validation context or <code>null</code> if no validation
-	 *  context has been set.
-	 */
-	public final Object getValidationContext() {
-		return fValidationContext;
-	}
-	
-	/**
-	 * Returns the refactoring's name.
-	 * 
-	 * @return the refactoring's human readable name. Must not be
-	 *  <code>null</code>
-	 */ 
-	public abstract String getName();
-	
-	//---- Conditions ------------------------------------------------------------
-	
-	/**
-	 * Checks all conditions. This implementation calls <code>checkInitialConditions</code>
-	 * and <code>checkFinalConditions</code>. 
-	 * <p>
-	 * Subclasses may extend this method to provide additional condition checks.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor to report progress
-	 * 
-	 * @return a refactoring status. If the status is <code>RefactoringStatus#FATAL</code>
-	 *  the refactoring has to be considered as not being executable.
-	 * 
-	 * @throws CoreException if an exception occurred during condition checking.
-	 *  If this happens then the condition checking has to be interpreted as failed
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 * 
-	 * @see #checkInitialConditions(IProgressMonitor)
-	 * @see #checkFinalConditions(IProgressMonitor)
-	 */
-	public RefactoringStatus checkAllConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		pm.beginTask("", 11); //$NON-NLS-1$
-		RefactoringStatus result= new RefactoringStatus();
-		result.merge(checkInitialConditions(new SubProgressMonitor(pm, 1)));
-		if (!result.hasFatalError()) {
-			if (pm.isCanceled())
-				throw new OperationCanceledException();
-			result.merge(checkFinalConditions(new SubProgressMonitor(pm, 10)));
-		}	
-		pm.done();
-		return result;
-	}
-	
-	/**
-	 * Checks some initial conditions based on the element to be refactored. The 
-	 * method is typically called by the UI to perform an initial checks after an 
-	 * action has been executed.
-	 * <p>
-	 * The refactoring has to be considered as not being executable if the returned status
-	 * has the severity of <code>RefactoringStatus#FATAL</code>.
-	 * </p>
-	 * <p>
-	 * This method can be called more than once.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor to report progress. Although initial checks 
-	 *  are supposed to execute fast, there can be certain situations where progress
-	 *  reporting is necessary. For example rebuilding a corrupted index may report
-	 *  progress.
-	 * 
-	 * @return a refactoring status. If the status is <code>RefactoringStatus#FATAL</code>
-	 *  the refactoring has to be considered as not being executable.
-	 * 
-	 * @throws CoreException if an exception occurred during initial condition checking.
-	 *  If this happens then the initial condition checking has to be interpreted as failed
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 * 
-	 * @see #checkFinalConditions(IProgressMonitor)
-	 * @see RefactoringStatus#FATAL
-	 */ 
-	public abstract RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException;
-	
-	/**
-	 * After <code>checkInitialConditions</code> has been performed and the user has 
-	 * provided all input necessary to perform the refactoring this method is called 
-	 * to check the remaining preconditions.
-	 * <p>
-	 * The refactoring has to be considered as not being executable if the returned status
-	 * has the severity of <code>RefactoringStatus#FATAL</code>.
-	 * </p>
-	 * <p>
-	 * This method can be called more than once.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor to report progress
-	 * 
-	 * @return a refactoring status. If the status is <code>RefactoringStatus#FATAL</code>
-	 *  the refactoring is considered as not being executable.
-	 * 
-	 * @throws CoreException if an exception occurred during final condition checking
-	 *  If this happens then the final condition checking is interpreted as failed
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 * 
-	 * @see #checkInitialConditions(IProgressMonitor)
-	 * @see RefactoringStatus#FATAL
-	 */ 		
-	public abstract RefactoringStatus checkFinalConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException;
-	
-	//---- change creation ------------------------------------------------------
-		
-	/**
-	 * Creates a {@link Change} object that performs the actual workspace
-	 * transformation.
-	 * 
-	 * @param pm a progress monitor to report progress
-	 * 
-	 * @return the change representing the workspace modifications of the
-	 *  refactoring
-	 * 
-	 * @throws CoreException if an error occurred while creating the change
-	 *  
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 */
-	public abstract Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException;
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.isInstance(this))
-			return this;
-		return super.getAdapter(adapter);
-	}
-	
-	/* (non-Javadoc)
-	 * for debugging only
-	 */
-	public String toString() {
-		return getName();
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringCore.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringCore.java
deleted file mode 100644
index 77e3f54..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringCore.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCorePreferences;
-import org.eclipse.ltk.internal.core.refactoring.UndoManager;
-
-/**
- * Central access point to access resources managed by the refactoring
- * core plug-in.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class RefactoringCore {
-
-	private static IUndoManager fgUndoManager= null;
-
-	private RefactoringCore() {
-		// no instance
-	}
-	
-	/**
-	 * Returns the singleton undo manager for the refactoring undo
-	 * stack.
-	 * 
-	 * @return the refactoring undo manager.
-	 */
-	public static IUndoManager getUndoManager() {
-		if (fgUndoManager == null)
-			fgUndoManager= createUndoManager();
-		return fgUndoManager;
-	}
-	
-	/**
-	 * When condition checking is performed for a refactoring then the
-	 * condition check is interpreted as failed if the refactoring status
-	 * severity return from the condition checking operation is equal
-	 * or greater than the value returned by this method. 
-	 * 
-	 * @return the condition checking failed severity
-	 */
-	public static int getConditionCheckingFailedSeverity() {
-		return RefactoringCorePreferences.getStopSeverity();
-	}
-	
-	/**
-	 * Creates a new empty undo manager.
-	 * 
-	 * @return a new undo manager
-	 */
-	private static IUndoManager createUndoManager() {
-		return new UndoManager();
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatus.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatus.java
deleted file mode 100644
index 485e011..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatus.java
+++ /dev/null

@@ -1,640 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * A <code>RefactoringStatus</code> object represents the outcome of a
- * condition checking operation. It manages a list of <code>
- * RefactoringStatusEntry</code> objects. Each <code>RefactoringStatusEntry
- * </code> object describes one particular problem detected during
- * condition checking.
- * <p>
- * Additionally a problem severity is managed. Severities are ordered as follows: 
- * <code>OK</code> &lt; <code>INFO</code> &lt; <code>WARNING</code> &lt; <code>
- * ERROR</code> &lt; <code>FATAL</code>. The status's problem severity is the maximum 
- * of the severities of all entries. If the status doesn't have any entry the status's 
- * severity is <code>OK</code>.
- * </p>
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @see RefactoringStatusEntry
- * @see Refactoring#checkAllConditions(IProgressMonitor)
- * 
- * @since 3.0
- */
-public class RefactoringStatus {
-
-	/** 
-	 * Status severity constant (value 0) indicating this status represents the nominal case.
-	 */
-	public static final int OK= 0;
-
-	/** 
-	 * Status severity constant (value 1) indicating this status is informational only.
-	 */
-	public static final int INFO= 1;
-
-	/** 
-	 * Status severity constant (value 2) indicating this status represents a warning.
-	 */
-	public static final int WARNING= 2;
-
-	/** 
-	 * Status severity constant (value 3) indicating this status represents an error.
-	 */
-	public static final int ERROR= 3;
-
-	/** 
-	 * Status severity constant (value 4) indicating this status represents a fatal error.
-	 * This is used when the refactoring can't be executed.
-	 */
-	public static final int FATAL= 4;
-
-	/**
-	 * List of refactoring status entries.
-	 */
-	private List fEntries;
-
-	/**
-	 * The status's severity. The following invariant holds for
-	 * <code>fSeverity</code>: <code>OK</code> &le; fSeverity &le; 
-	 * <code>FATAL</code>.
-	 */
-	private int fSeverity= OK;
-
-	/**
-	 * Creates a new refactoring status with an empty list of
-	 * status entries and a severity of <code>OK</code>.
-	 */
-	public RefactoringStatus() {
-		fEntries= new ArrayList(0);
-	}
-	
-	/**
-	 * Returns the severity.
-	 * 
-	 * @return the severity.
-	 */
-	public int getSeverity() {
-		return fSeverity;
-	}
-
-	/**
-	 * Returns the list of refactoring status entries.
-	 * 
-	 * @return the list of refactoring status entries. Returns an empty array
-	 *  if not entries are managed.
-	 */
-	public RefactoringStatusEntry[] getEntries() {
-		return (RefactoringStatusEntry[])fEntries.toArray(new RefactoringStatusEntry[fEntries.size()]);
-	}
-	
-	/**
-	 * Returns whether the status has entries or not.
-	 * 
-	 * @return <code>true</code> if the status as any entries; otherwise
-	 *  <code>false</code> is returned.
-	 */
-	public boolean hasEntries() {
-		return !fEntries.isEmpty();
-	}
-
-	/**
-	 * Returns the <code>RefactoringStatusEntry</code> at the specified index.
-	 * 
-	 * @param index the index of the entry to return
-	 * @return the entry at the specified index
-	 * 
-	 * @throws IndexOutOfBoundsException if the index is out of range
-	 */
-	public RefactoringStatusEntry getEntryAt(int index) {
-		return (RefactoringStatusEntry)fEntries.get(index);
-	}
-
-	/**
-	 * Returns the first entry managed by this refactoring status that
-	 * matches the given plug-in identifier and code. If more than one
-	 * entry exists that matches the criteria the first one in the list
-	 * of entries is returned. Returns <code>null</code> if no entry
-	 * matches.
-	 * 
-	 * @param pluginId the entry's plug-in identifier
-	 * @param code the entry's code
-	 * @return the entry that matches the given plug-in identifier and
-	 *  code; <code>null</code> otherwise 
-	 */
-	public RefactoringStatusEntry getEntryMatchingCode(String pluginId, int code) {
-		Assert.isTrue(pluginId != null);
-		for (Iterator iter= fEntries.iterator(); iter.hasNext(); ) {
-			RefactoringStatusEntry entry= (RefactoringStatusEntry)iter.next();
-			if (pluginId.equals(entry.getPluginId()) && entry.getCode() == code)
-				return entry;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the first entry which severity is equal or greater than the
-	 * given severity. If more than one entry exists that matches the 
-	 * criteria the first one is returned. Returns <code>null</code> if no 
-	 * entry matches.
-	 * 
-	 * @param severity the severity to search for. Must be one of <code>FATAL
-	 *  </code>, <code>ERROR</code>, <code>WARNING</code> or <code>INFO</code>
-	 * @return the entry that matches the search criteria
-	 */
-	public RefactoringStatusEntry getEntryMatchingSeverity(int severity) {
-		Assert.isTrue(severity >= OK && severity <= FATAL);
-		if (severity > fSeverity)
-			return null;
-		Iterator iter= fEntries.iterator();
-		while (iter.hasNext()) {
-			RefactoringStatusEntry entry= (RefactoringStatusEntry)iter.next();
-			if (entry.getSeverity() >= severity)
-				return entry;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the first message which severity is equal or greater than the
-	 * given severity. If more than one entry exists that matches the criteria
-	 * the first one is returned. Returns <code>null</code> if no entry matches.
-	 * 
-	 * @param severity the severity to search for. Must be one of <code>FATAL
-	 *  </code>, <code>ERROR</code>, <code>WARNING</code> or <code>INFO</code>
-	 * @return the message of the entry that matches the search criteria
-	 */
-	public String getMessageMatchingSeverity(int severity) {
-		RefactoringStatusEntry entry= getEntryMatchingSeverity(severity);
-		if (entry == null)
-			return null;
-		return entry.getMessage();
-	}
-
-	/**
-	 * Creates a new <code>RefactoringStatus</code> with one entry filled with the given
-	 * arguments.
-	 * 
-	 * @param severity the severity
-	 * @param msg the message
-	 * @param context the context. Can be <code>null</code>
-	 * @param pluginId the plug-in identifier. Can be <code>null</code> if argument <code>
-	 *  code</code> equals <code>NO_CODE</code>
-	 * @param code the problem code. Must be either <code>NO_CODE</code> or a positive integer
-	 * @param data application specific data
-	 * 
-	 * @return the newly created refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createStatus(int severity, String msg, RefactoringStatusContext context, String pluginId, int code, Object data) {
-		RefactoringStatus result= new RefactoringStatus();
-		result.fEntries.add(new RefactoringStatusEntry(severity, msg, context, pluginId, code, data));
-		result.fSeverity= severity;
-		return result;
-	}
-
-	/**
-	 * Creates a new <code>RefactorngStatus</code> with one <code>INFO</code> entry
-	 * filled with the given message. 
-	 * 
-	 * @param msg the message of the info entry
-	 * @return the refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createInfoStatus(String msg) {
-		return createStatus(INFO, msg, null, null, RefactoringStatusEntry.NO_CODE, null);
-	}
-
-	/**
-	 * Creates a new <code>RefactorngStatus</code> with one <code>INFO</code> entry
-	 * filled with the given message and context.
-	 * 
-	 * @param msg the message of the info entry
-	 * @param context the context of the info entry
-	 * @return the refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createInfoStatus(String msg, RefactoringStatusContext context) {
-		return createStatus(INFO, msg, context, null, RefactoringStatusEntry.NO_CODE, null);
-	}
-
-	/**
-	 * Creates a new <code>RefactorngStatus</code> with one <code>WARNING</code> entry
-	 * filled with the given message.
-	 * 
-	 * @param msg the message of the warning entry
-	 * @return the refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createWarningStatus(String msg) {
-		return createStatus(WARNING, msg, null, null, RefactoringStatusEntry.NO_CODE, null);
-	}
-
-	/**
-	 * Creates a <code>RefactorngStatus</code> with one <code>WARNING</code> entry
-	 * fill with the given message and context.
-	 * 
-	 * @param msg the message of the warning entry
-	 * @param context the context of the warning entry
-	 * @return the refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createWarningStatus(String msg, RefactoringStatusContext context) {
-		return createStatus(WARNING, msg, context, null, RefactoringStatusEntry.NO_CODE, null);
-	}
-
-	/**
-	 * Creates a new <code>RefactorngStatus</code> with one <code>ERROR</code> entry
-	 * filled with the given message.
-	 * 
-	 * @param msg the message of the error entry
-	 * @return the refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createErrorStatus(String msg) {
-		return createStatus(ERROR, msg, null, null, RefactoringStatusEntry.NO_CODE, null);
-	}
-
-	/**
-	 * Creates a <code>RefactorngStatus</code> with one <code>ERROR</code> entry
-	 * fill with the given message and context.
-	 * 
-	 * @param msg the message of the error entry
-	 * @param context the context of the error entry
-	 * @return the refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createErrorStatus(String msg, RefactoringStatusContext context) {
-		return createStatus(ERROR, msg, context, null, RefactoringStatusEntry.NO_CODE, null);
-	}
-
-	/**
-	 * Creates a new <code>RefactorngStatus</code> with one <code>FATAL</code> entry
-	 * filled with the given message.
-	 * 
-	 * @param msg the message of the fatal entry
-	 * @return the refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createFatalErrorStatus(String msg) {
-		return createStatus(FATAL, msg, null, null, RefactoringStatusEntry.NO_CODE, null);
-	}
-
-	/**
-	 * Creates a <code>RefactorngStatus</code> with one <code>FATAL</code> entry
-	 * fill with the given message and context.
-	 * 
-	 * @param msg the message of the fatal entry
-	 * @param context the context of the fatal entry
-	 * @return the refactoring status
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public static RefactoringStatus createFatalErrorStatus(String msg, RefactoringStatusContext context) {
-		return createStatus(FATAL, msg, context, null, RefactoringStatusEntry.NO_CODE, null);
-	}
-
-	/**
-	 * Creates a new <code>RefactorngStatus</code> from the given <code>IStatus</code>. An
-	 * OK status is mapped to an OK refactoring status, an information status is mapped 
-	 * to a warning refactoring status, a warning status is mapped to an error refactoring 
-	 * status and an error or cancel status is mapped to a fatal refactoring status. An unknown
-	 * status is converted into a fatal error status as well. If the status is a <code>MultiStatus
-	 * </code> then the first level of children of the status will be added as refactoring status 
-	 * entries to the created refactoring status.
-	 * 
-	 * @param status the status to create a refactoring status from
-	 * @return the refactoring status
-	 * 
-	 * @see IStatus
-	 */
-	public static RefactoringStatus create(IStatus status) {
-		if (status.isOK())
-			return new RefactoringStatus();
-
-		if (!status.isMultiStatus()) {
-			switch (status.getSeverity()) {
-				case IStatus.OK :
-					return new RefactoringStatus();
-				case IStatus.INFO :
-					return RefactoringStatus.createWarningStatus(status.getMessage());
-				case IStatus.WARNING :
-					return RefactoringStatus.createErrorStatus(status.getMessage());
-				case IStatus.ERROR :
-					return RefactoringStatus.createFatalErrorStatus(status.getMessage());
-				case IStatus.CANCEL :
-					return RefactoringStatus.createFatalErrorStatus(status.getMessage());
-				default :
-					return RefactoringStatus.createFatalErrorStatus(status.getMessage());
-			}
-		} else {
-			IStatus[] children= status.getChildren();
-			RefactoringStatus result= new RefactoringStatus();
-			for (int i= 0; i < children.length; i++) {
-				result.merge(RefactoringStatus.create(children[i]));
-			}
-			return result;
-		}
-	}
-
-	/**
-	 * Merges the receiver and the parameter statuses. The resulting list of
-	 * entries in the receiver will contain entries from both. The resulting
-	 * severity in the receiver will be the more severe of its current severity
-	 * and the parameter's severity. Merging with <code>null</code> is
-	 * allowed - it has no effect.
-	 * 
-	 * @param other the refactoring status to merge with
-	 */
-	public void merge(RefactoringStatus other) {
-		if (other == null)
-			return;
-		fEntries.addAll(other.fEntries);
-		fSeverity= Math.max(fSeverity, other.getSeverity());
-	}
-
-	/**
-	 * Adds an <code>INFO</code> entry filled with the given message to this status. 
-	 * If the current severity is <code>OK</code> it will be changed to <code>INFO
-	 * </code>. It will remain unchanged otherwise.
-	 * 
-	 * @param msg the message of the info entry
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public void addInfo(String msg) {
-		addInfo(msg, null);
-	}
-
-	/**
-	 * Adds an <code>INFO</code> entry filled with the given message and context to 
-	 * this status. If the current severity is <code>OK</code> it will be changed to 
-	 * <code>INFO</code>. It will remain unchanged otherwise.
-	 * 
-	 * @param msg the message of the info entry
-	 * @param context the context of the info entry
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public void addInfo(String msg, RefactoringStatusContext context) {
-		fEntries.add(new RefactoringStatusEntry(RefactoringStatus.INFO, msg, context));
-		fSeverity= Math.max(fSeverity, INFO);
-	}
-
-	/**
-	 * Adds a <code>WARNING</code> entry filled with the given message to this status.
-	 * If the current severity is <code>OK</code> or <code>INFO</code> it will be 
-	 * changed to <code>WARNING</code>. It will remain unchanged otherwise.
-	 * 
-	 * @param msg the message of the warning entry
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public void addWarning(String msg) {
-		addWarning(msg, null);
-	}
-
-	/**
-	 * Adds a <code>WARNING</code> entry filled with the given message and context to 
-	 * this status. If the current severity is <code>OK</code> or <code>INFO</code> it 
-	 * will be changed to <code>WARNING</code>. It will remain unchanged otherwise.
-	 * 
-	 * @param msg the message of the warning entry
-	 * @param context the context of the warning entry
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public void addWarning(String msg, RefactoringStatusContext context) {
-		fEntries.add(new RefactoringStatusEntry(RefactoringStatus.WARNING, msg, context));
-		fSeverity= Math.max(fSeverity, WARNING);
-	}
-
-	/**
-	 * Adds an <code>ERROR</code> entry filled with the given message to this status. 
-	 * If the current severity is <code>OK</code>, <code>INFO</code> or <code>WARNING
-	 * </code> it will be changed to <code>ERROR</code>. It will remain unchanged 
-	 * otherwise.
-	 * 
-	 * @param msg the message of the error entry
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public void addError(String msg) {
-		addError(msg, null);
-	}
-
-	/**
-	 * Adds an <code>ERROR</code> entry filled with the given message and context to 
-	 * this status. If the current severity is <code>OK</code>, <code>INFO</code> or 
-	 * <code>WARNING</code> it will be changed to <code>ERROR</code>. It will remain 
-	 * unchanged otherwise.
-	 * 
-	 * @param msg the message of the error entry
-	 * @param context the context of the error entry
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public void addError(String msg, RefactoringStatusContext context) {
-		fEntries.add(new RefactoringStatusEntry(RefactoringStatus.ERROR, msg, context));
-		fSeverity= Math.max(fSeverity, ERROR);
-	}
-
-	/**
-	 * Adds a <code>FATAL</code> entry filled with the given message to this status.
-	 * The severity of this status will changed to <code>FATAL</code>. 
-	 * 
-	 * @param msg the message of the fatal entry
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public void addFatalError(String msg) {
-		addFatalError(msg, null);
-	}
-
-	/**
-	 * Adds a <code>FATAL</code> entry filled with the given message and status to
-	 * this status. The severity of this status will changed to <code>FATAL</code>. 
-	 * 
-	 * @param msg the message of the fatal entry
-	 * @param context the context of the fatal entry
-	 * 
-	 * @see RefactoringStatusEntry
-	 */
-	public void addFatalError(String msg, RefactoringStatusContext context) {
-		fEntries.add(new RefactoringStatusEntry(RefactoringStatus.FATAL, msg, context));
-		fSeverity= Math.max(fSeverity, FATAL);
-	}
-
-	/**
-	 * Adds a new entry filled with the given arguments to this status. The severity
-	 * of this status is set to the maximum of <code>fSeverity</code> and 
-	 * <code>severity</code>. 
-	 * 
-	 * @param severity the severity of the entry
-	 * @param msg the message of the entry
-	 * @param context the context of the entry. Can be <code>null</code>
-	 * @param pluginId the plug-in identifier of the entry. Can be <code>null</code> if 
-	 *  argument <code>code</code> equals <code>NO_CODE</code>
-	 * @param code the problem code of the entry. Must be either <code>NO_CODE</code> 
-	 *  or a positive integer
-	 */
-	public void addEntry(int severity, String msg, RefactoringStatusContext context, String pluginId, int code) {
-		fEntries.add(new RefactoringStatusEntry(severity, msg, context, pluginId, code));
-		fSeverity= Math.max(fSeverity, severity);
-	}
-
-	/**
-	 * Adds a new entry filled with the given arguments to this status. The severity
-	 * of this status is set to the maximum of <code>fSeverity</code> and 
-	 * <code>severity</code>. 
-	 * 
-	 * @param severity the severity of the entry
-	 * @param msg the message of the entry
-	 * @param context the context of the entry. Can be <code>null</code>
-	 * @param pluginId the plug-in identifier of the entry. Can be <code>null</code> if 
-	 *  argument <code>code</code> equals <code>NO_CODE</code>
-	 * @param code the problem code of the entry. Must be either <code>NO_CODE</code> 
-	 *  or a positive integer
-	 * @param data application specific data of the entry
-	 */
-	public void addEntry(int severity, String msg, RefactoringStatusContext context, String pluginId, int code, Object data) {
-		fEntries.add(new RefactoringStatusEntry(severity, msg, context, pluginId, code, data));
-		fSeverity= Math.max(fSeverity, severity);
-	}
-
-	/**
-	 * Adds the given <code>RefactoringStatusEntry</code>. The severity of this
-	 * status is set to the maximum of <code>fSeverity</code> and the severity of
-	 * the entry.
-	 * 
-	 * @param entry the <code>RefactoringStatusEntry</code> to be added
-	 */
-	public void addEntry(RefactoringStatusEntry entry) {
-		Assert.isNotNull(entry);
-		fEntries.add(entry);
-		fSeverity= Math.max(fSeverity, entry.getSeverity());
-	}
-
-	/**
-	 * Returns whether the status's severity is <code>OK</code> or not. 
-	 * 
-	 * @return <code>true</code> if the severity is <code>OK</code>; 
-	 *  otherwise <code>false</code> is returned
-	 */
-	public boolean isOK() {
-		return fSeverity == OK;
-	}
-
-	/**
-	 * Returns <code>true</code> if the current severity is <code>
-	 * FATAL</code>.
-	 * 
-	 * @return <code>true</code> if the current severity is <code>
-	 *  FATAL</code>; otherwise <code>false</code> is returned
-	 */
-	public boolean hasFatalError() {
-		return fSeverity == FATAL;
-	}
-
-	/**
-	 * Returns <code>true</code> if the current severity is <code>
-	 * FATAL</code> or <code>ERROR</code>.
-	 * 
-	 * @return <code>true</code> if the current severity is <code>
-	 *  FATAL</code> or <code>ERROR</code>; otherwise <code>false
-	 *  </code> is returned
-	 */
-	public boolean hasError() {
-		return fSeverity == FATAL || fSeverity == ERROR;
-	}
-
-	/**
-	 * Returns <code>true</code> if the current severity is <code>
-	 * FATAL</code>, <code>ERROR</code> or <code>WARNING</code>.
-	 * 
-	 * @return <code>true</code> if the current severity is <code>
-	 *  FATAL</code>, <code>ERROR</code> or <code>WARNING</code>; 
-	 *  otherwise <code>false</code> is returned
-	 */
-	public boolean hasWarning() {
-		return fSeverity == FATAL || fSeverity == ERROR || fSeverity == WARNING;
-	}
-
-	/**
-	 * Returns <code>true</code> if the current severity is <code>
-	 * FATAL</code>, <code>ERROR</code>, <code>WARNING</code> or 
-	 * <code>INFO</code>.
-	 * 
-	 * @return <code>true</code> if the current severity is <code>
-	 *  FATAL</code>, <code>ERROR</code>, <code>WARNING</code> or 
-	 *  <code>INFO</code>; otherwise <code>false</code> is returned
-	 */
-	public boolean hasInfo() {
-		return fSeverity == FATAL || fSeverity == ERROR || fSeverity == WARNING || fSeverity == INFO;
-	}
-
-	/*
-	 * (non java-doc) 
-	 * for debugging only
-	 */
-	public String toString() {
-		StringBuffer buff= new StringBuffer();
-		buff.append("<") //$NON-NLS-1$
-			.append(getSeverityString(fSeverity)).append("\n"); //$NON-NLS-1$
-		if (!isOK()) {
-			for (Iterator iter= fEntries.iterator(); iter.hasNext(); ) {
-				buff.append("\t") //$NON-NLS-1$
-					.append(iter.next()).append("\n"); //$NON-NLS-1$
-			}
-		}
-		buff.append(">"); //$NON-NLS-1$
-		return buff.toString();
-	}
-	
-	/*
-	 * non java-doc 
-	 * for debugging only not for nls
-	 */
-	/* package */static String getSeverityString(int severity) {
-		Assert.isTrue(severity >= OK && severity <= FATAL);
-		if (severity == RefactoringStatus.OK)
-			return "OK"; //$NON-NLS-1$
-		if (severity == RefactoringStatus.INFO)
-			return "INFO"; //$NON-NLS-1$
-		if (severity == RefactoringStatus.WARNING)
-			return "WARNING"; //$NON-NLS-1$
-		if (severity == RefactoringStatus.ERROR)
-			return "ERROR"; //$NON-NLS-1$
-		if (severity == RefactoringStatus.FATAL)
-			return "FATALERROR"; //$NON-NLS-1$
-		return null;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatusContext.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatusContext.java
deleted file mode 100644
index 22ea8d6..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatusContext.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-/**
- * A <code>RefactoringStatusContext</code> can be used to annotate a 
- * {@link RefactoringStatusEntry} with additional information 
- * typically presented in the user interface.
- * <p>
- * To present a context in the user interface a corresponding context
- * viewer can be registered via the extension point <code>
- * org.eclipse.ltk.ui.refactoring.statusContextViewers</code>. 
- * </p>
- * <p>
- * This class may be subclassed by clients.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class RefactoringStatusContext {
-	/**
-	 * Returns the element that corresponds directly to this context,
-	 * or <code>null</code> if there is no corresponding element.
-	 * <p>
-	 * For example, the corresponding element of a context for a problem 
-	 * detected in an <code>IResource</code> would the the resource itself.
-	 * <p>
-	 *
-	 * @return the corresponding element
-	 */
-	public abstract Object getCorrespondingElement();
-	
-	/*
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		Object element= getCorrespondingElement();
-		return element == null ? null : element.toString();
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatusEntry.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatusEntry.java
deleted file mode 100644
index 950b6aa..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/RefactoringStatusEntry.java
+++ /dev/null

@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * An immutable object representing an entry in the list in <code>RefactoringStatus</code>.
- * A refactoring status entry consists of a severity, a message, a problem code
- * (represented by a tuple(plug-in identifier and code number)), a context object and a
- * generic data pointer. The context object is used to provide context information for
- * the problem itself. An example context is a tuple consisting of the resource that contains
- * the problem and a corresponding line number.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class RefactoringStatusEntry {
-	
-	/** 
-	 * A special problem code indicating that no problem code is provided. If 
-	 * <code>NO_CODE</code> is used then the plug-in identifier can be <code>
-	 * null</code>
-	 */
-	public static final int NO_CODE= -1;
-
-	/** The severity */
-	private final int fSeverity;
-
-	/** The message */
-	private final String fMessage;
-
-	/** A plug-in specific problem code */
-	private final int fCode;
-	
-	/** A plug-in identifier to make the problem code unique */
-	private final String fPluginId;
-
-	/** A context providing detailed information of where the problem occurred */
-	private final RefactoringStatusContext fContext;
-
-	/** A generic data pointer */
-	private final Object fData;
-
-	/**
-	 * Creates a new refactoring status entry. The context is set to <code>
-	 * null</code> the problem code is set to <code>NO_CODE</code>, the 
-	 * plug-in identifier is set to <code>null</code> and the data pointer 
-	 * is set to <code>null</code> as well.
-	 * 
-	 * @param severity the severity
-	 * @param msg the message
-	 */
-	public RefactoringStatusEntry(int severity, String msg) {
-		this(severity, msg, null);
-	}
-
-	/**
-	 * Creates a new refactoring status entry. The problem code is set to <code>
-	 * NO_CODE</code>, the plug-in identifier is set to <code>null</code> and
-	 * the data pointer is set to <code>null</code> as well.
-	 * 
-	 * @param severity the severity
-	 * @param msg the message
-	 * @param context the context. Can be <code>null</code>
-	 */
-	public RefactoringStatusEntry(int severity, String msg, RefactoringStatusContext context) {
-		this(severity, msg, context, null, NO_CODE, null);
-	}
-
-	/**
-	 * Creates a new refactoring status entry.
-	 * 
-	 * @param severity the severity
-	 * @param msg the message
-	 * @param context the context. Can be <code>null</code>
-	 * @param pluginId the plug-in identifier. Can be <code>null</code> if argument <code>
-	 *  code</code> equals <code>NO_CODE</code>
-	 * @param code the problem code. Must be either <code>NO_CODE</code> or equals or greater
-	 *  than zero
-	 */
-	public RefactoringStatusEntry(int severity, String msg, RefactoringStatusContext context, String pluginId, int code) {
-		this(severity, msg, context, pluginId, code, null);
-	}
-
-	/**
-	 * Creates a new refactoring status entry.
-	 * 
-	 * @param severity the severity
-	 * @param msg the message
-	 * @param context the context. Can be <code>null</code>
-	 * @param pluginId the plug-in identifier. Can be <code>null</code> if argument <code>
-	 *  code</code> equals <code>NO_CODE</code>
-	 * @param code the problem code. Must be either <code>NO_CODE</code> or a positive integer
-	 * @param data application specific data
-	 */
-	public RefactoringStatusEntry(int severity, String msg, RefactoringStatusContext context, String pluginId, int code, Object data) {
-		Assert.isTrue(severity == RefactoringStatus.INFO || severity == RefactoringStatus.WARNING
-			|| severity == RefactoringStatus.ERROR || severity == RefactoringStatus.FATAL);
-		Assert.isNotNull(msg);
-		Assert.isTrue(code == NO_CODE || code >= 0);
-		if (code != NO_CODE) Assert.isTrue(pluginId != null);
-		fMessage= msg;
-		fSeverity= severity;
-		fContext= context;
-		fPluginId= pluginId;
-		fCode= code;
-		fData= data;
-	}
-
-	/**
-	 * Returns the message of the status entry.
-	 * 
-	 * @return the message
-	 */
-	public String getMessage() {
-		return fMessage;
-	}
-
-	/**
-	 * Returns the severity level.
-	 * 
-	 * @return the severity level
-	 * 
-	 * @see RefactoringStatus#INFO
-	 * @see RefactoringStatus#WARNING
-	 * @see RefactoringStatus#ERROR
-	 * @see RefactoringStatus#FATAL
-	 */
-	public int getSeverity() {
-		return fSeverity;
-	}
-
-	/**
-	 * Returns the context which can be used to show more detailed information regarding
-	 * this status entry in the UI. The method may return <code>null</code> indicating
-	 * that no context is available.
-	 * 
-	 * @return the status entry's context
-	 */
-	public RefactoringStatusContext getContext() {
-		return fContext;
-	}
-
-	/**
-	 * Returns the plug-in identifier associated with the
-	 * problem code. Might return <code>null</code> if the
-	 * problem code equals <code>NO_CODE</code>.
-	 * 
-	 * @return the plug-in identifier
-	 */
-	public String getPluginId() {
-		return fPluginId;
-	}
-	
-	/**
-	 * Returns the problem code.
-	 * 
-	 * @return the problem code
-	 */
-	public int getCode() {
-		return fCode;
-	}
-	
-	/**
-	 * Returns the application defined entry data associated
-	 * with the receiver, or <code>null</code> if it has not 
-	 * been set.
-	 * 
-	 * @return the entry data
-	 */
-	public Object getData() {
-		return fData;
-	}
-
-	/**
-	 * Returns whether the entry represents a fatal error or not.
-	 * 
-	 * @return <code>true</code> if (severity ==<code>RefactoringStatus.FATAL</code>)
-	 */
-	public boolean isFatalError() {
-		return fSeverity == RefactoringStatus.FATAL;
-	}
-
-	/**
-	 * Returns whether the entry represents an error or not.
-	 * 
-	 * @return <code>true</code> if (severity ==<code>RefactoringStatus.ERROR</code>).
-	 */
-	public boolean isError() {
-		return fSeverity == RefactoringStatus.ERROR;
-	}
-
-	/**
-	 * Returns whether the entry represents a warning or not.
-	 * 
-	 * @return <code>true</code> if (severity ==<code>RefactoringStatus.WARNING</code>).
-	 */
-	public boolean isWarning() {
-		return fSeverity == RefactoringStatus.WARNING;
-	}
-
-	/**
-	 * Returns whether the entry represents an information or not.
-	 * 
-	 * @return <code>true</code> if (severity ==<code>RefactoringStatus.INFO</code>).
-	 */
-	public boolean isInfo() {
-		return fSeverity == RefactoringStatus.INFO;
-	}
-
-	/*
-	 * non java-doc for debugging only
-	 */
-	public String toString() {
-		String contextString= fContext == null ? "<Unspecified context>" : fContext.toString(); //$NON-NLS-1$
-		return "\n" //$NON-NLS-1$
-			+ RefactoringStatus.getSeverityString(fSeverity) + ": " + fMessage + //$NON-NLS-1$
-			"\nContext: " + contextString + //$NON-NLS-1$
-			(fCode == NO_CODE ? "\ncode: none" : "\nplug-in id: " + fPluginId + "code: " + fCode) +  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			"\nData: " + fData;  //$NON-NLS-1$
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextChange.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextChange.java
deleted file mode 100644
index e0309bd..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextChange.java
+++ /dev/null

@@ -1,730 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.text.edits.TextEditCopier;
-import org.eclipse.text.edits.TextEditGroup;
-import org.eclipse.text.edits.TextEditProcessor;
-import org.eclipse.text.edits.UndoEdit;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.Changes;
-
-/**
- * A text change is a special change object that applies a {@link TextEdit
- * text edit tree} to a document. The text change manages the text edit tree. 
- * Access to the document must be provided by concrete subclasses via the method
- * {@link #acquireDocument(IProgressMonitor) aquireDocument}, 
- * {@link #commit(IDocument document, IProgressMonitor pm) commitDocument}, and
- * {@link #releaseDocument(IDocument, IProgressMonitor) releaseDocument}.
- * <p>
- * A text change offers the ability to access the original content of
- * the document as well as creating a preview of the change. The edit
- * tree gets copied when creating any king of preview. Therefore no region
- * updating on the original edit tree takes place when requesting a preview
- * (for more information on region updating see class {@link TextEdit TextEdit}. 
- * If region tracking is required for a preview it can be enabled via a call 
- * to the method {@link #setKeepPreviewEdits(boolean) setKeepPreviewEdits}.
- * If enabled the text change keeps the copied edit tree executed for the
- * preview allowing clients to map an original edit to an executed edit. The
- * executed edit can then be used to determine its position in the preview.
- * </p>
- * <p> 
- * Note: this class is not intended to be subclassed outside the refactoring
- * framework.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class TextChange extends Change {
-
-	private static class LocalTextEditProcessor extends TextEditProcessor {
-		public static final int EXCLUDE= 1;
-		public static final int INCLUDE= 2;
-
-		private TextEdit[] fExcludes;
-		private TextEdit[] fIncludes;
-		
-		public LocalTextEditProcessor(IDocument document, TextEdit root, int flags) {
-			super(document, root, flags);
-		}
-		public void setIncludes(TextEdit[] includes) {
-			Assert.isNotNull(includes);
-			Assert.isTrue(fExcludes == null);
-			fIncludes= flatten(includes);
-		}
-		public void setExcludes(TextEdit[] excludes) {
-			Assert.isNotNull(excludes);
-			Assert.isTrue(fIncludes == null);
-			fExcludes= excludes;
-		}
-		protected boolean considerEdit(TextEdit edit) {
-			if (fExcludes != null) {
-				for (int i= 0; i < fExcludes.length; i++) {
-					if (edit.equals(fExcludes[i]))
-						return false;
-				}
-				return true;
-			}
-			if (fIncludes != null) {
-				for (int i= 0; i < fIncludes.length; i++) {
-					if (edit.equals(fIncludes[i]))
-						return true;
-				}
-				return false;
-			}
-			return true;
-		}
-		private TextEdit[] flatten(TextEdit[] edits) {
-			List result= new ArrayList(5);
-			for (int i= 0; i < edits.length; i++) {
-				flatten(result, edits[i]);
-			}
-			return (TextEdit[])result.toArray(new TextEdit[result.size()]);
-		}
-		private void flatten(List result, TextEdit edit) {
-			result.add(edit);
-			TextEdit[] children= edit.getChildren();
-			for (int i= 0; i < children.length; i++) {
-				flatten(result, children[i]);
-			}
-		}
-	}
-	
-	private static class PreviewAndRegion {
-		public PreviewAndRegion(IDocument d, IRegion r) {
-			document= d;
-			region= r;
-		}
-		public IDocument document;
-		public IRegion region;
-	}
-	
-	private String fName;
-	private List fTextEditChangeGroups;
-	private TextEditCopier fCopier;
-	private TextEdit fEdit;
-	private boolean fTrackEdits;
-	private String fTextType;
-
-	/**
-	 * A special object denoting all edits managed by the text change. This even 
-	 * includes those edits not managed by a <code>TextEditChangeGroup</code> 
-	 */
-	private static final TextEditChangeGroup[] ALL_EDITS= new TextEditChangeGroup[0]; 
-	
-	/**
-	 * Creates a new text change with the specified name.  The name is a 
-	 * human-readable value that is displayed to users.  The name does not 
-	 * need to be unique, but it must not be <code>null</code>.
-	 * <p>
-	 * The text type of this text change is set to <code>txt</code>.
-	 * </p>
-	 * 
-	 * @param name the name of the text change
-	 * 
-	 * @see #setTextType(String)
-	 */
-	protected TextChange(String name) {
-		Assert.isNotNull(name);
-		fName= name;
-		fTextEditChangeGroups= new ArrayList(5);
-		fTextType= "txt"; //$NON-NLS-1$
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		for (Iterator iter= fTextEditChangeGroups.iterator(); iter.hasNext();) {
-			TextEditChangeGroup element= (TextEditChangeGroup) iter.next();
-			element.setEnabled(enabled);
-		}
-	}
-	
-	/**
-	 * Sets the text type. The text type is used to determine the content
-	 * merge viewer used to present the difference between the original
-	 * and the preview content in the user interface. Content merge viewers
-	 * are defined via the extension point <code>org.eclipse.compare.contentMergeViewers</code>.
-	 * <p>
-	 * The default text type is <code>txt</code>. 
-	 * </p>
-	 * 
-	 * @param type the text type. If <code>null</code> is passed the text type is 
-	 *  reseted to the default text type <code>txt</code>.
-	 */
-	public void setTextType(String type) {
-		if (type == null)
-			type= "txt"; //$NON-NLS-1$
-		fTextType= type;
-	}
-	
-	/**
-	 * Returns the text change's text type.
-	 * 
-	 * @return the text change's text type
-	 */
-	public String getTextType() {
-		return fTextType;
-	}
-	
-	//---- Edit management -----------------------------------------------
-	
-	/**
-	 * Sets the root text edit that should be applied to the 
-	 * document represented by this text change.
-	 * 
-	 * @param edit the root text edit. The root text edit
-	 *  can only be set once. 
-	 */
-	public void setEdit(TextEdit edit) {
-		Assert.isTrue(fEdit == null, "Root edit can only be set once"); //$NON-NLS-1$
-		Assert.isTrue(edit != null);
-		fEdit= edit;
-	}
-	
-	/**
-	 * Returns the root text edit.
-	 * 
-	 * @return the root text edit or <code>null</code> if no root edit has been
-	 *  set
-	 */
-	public TextEdit getEdit() {
-		return fEdit;
-	}	
-	
-	/**
-	 * Adds a {@link TextEditGroup text edit group}. This method is a convenient
-	 * method for calling <code>change.addTextEditChangeGroup(new 
-	 * TextEditChangeGroup(change, group));</code>.
-	 * 
-	 * @param group the text edit group to add
-	 */
-	public void addTextEditGroup(TextEditGroup group) {
-		addTextEditChangeGroup(new TextEditChangeGroup(this, group));
-	}
-	
-	/**
-	 * Adds a {@link TextEditChangeGroup text edit change group}. Calling the methods 
-	 * requires that a root edit has been set via the method {@link #setEdit(TextEdit)
-	 * setEdit}. The edits managed by the given text edit change group must be part of 
-	 * the change's root edit. 
-	 * 
-	 * @param group the text edit change group to add
-	 */
-	public void addTextEditChangeGroup(TextEditChangeGroup group) {
-		Assert.isTrue(fEdit != null, "Can only add a description if a root edit exists"); //$NON-NLS-1$
-		Assert.isTrue(group != null);
-		fTextEditChangeGroups.add(group);
-	}
-	
-	/**
-	 * Returns the {@link TextEditChangeGroup text edit change groups} managed by this 
-	 * text change.
-	 * 
-	 * @return the text edit change groups
-	 */
-	public TextEditChangeGroup[] getTextEditChangeGroups() {
-		return (TextEditChangeGroup[])fTextEditChangeGroups.toArray(new TextEditChangeGroup[fTextEditChangeGroups.size()]);
-	}
-	
-	/**
-	 * Acquires a reference to the document to be changed by this text
-	 * change. A document acquired by this call <em>MUST</em> be released
-	 * via a call to {@link #releaseDocument(IDocument, IProgressMonitor)}.
-	 * <p>
-	 * The method <code>releaseDocument</code> must be call as many times as 
-	 * <code>aquireDocument</code> has been called.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor
-	 * 
-	 * @return a reference to the document to be changed
-	 * 
-	 * @throws CoreException if the document can't be acquired
-	 */
-	protected abstract IDocument acquireDocument(IProgressMonitor pm) throws CoreException;
-	
-	/**
-	 * Commits the document acquired via a call to {@link #acquireDocument(IProgressMonitor)
-	 * aquireDocument}. It is up to the implementors of this method to decide what committing
-	 * a document means. Typically, the content of the document is written back to the file
-	 * system.
-	 * 
-	 * @param document the document to commit
-	 * @param pm a progress monitor
-	 * 
-	 * @throws CoreException if the document can't be committed
-	 */
-	protected abstract void commit(IDocument document, IProgressMonitor pm) throws CoreException;
-	
-	/**
-	 * Releases the document acquired via a call to {@link #acquireDocument(IProgressMonitor)
-	 * aquireDocument}.
-	 * 
-	 * @param document the document to release
-	 * @param pm a progress monitor
-	 * 
-	 * @throws CoreException if the document can't be released
-	 */
-	protected abstract void releaseDocument(IDocument document, IProgressMonitor pm) throws CoreException;
-	
-	/**
-	 * Hook to create an undo change for the given undo edit. This hook 
-	 * gets called while performing the change to construct the corresponding 
-	 * undo change object.
-	 * 
-	 * @param edit the {@link UndoEdit} to create an undo change for
-	 * 
-	 * @return the undo change or <code>null</code> if no undo change can
-	 *  be created. Returning <code>null</code> results in the fact that
-	 *  the whole change tree can't be undone. So returning <code>null</code>
-	 *  is only recommended if an exception occurred during creating the
-	 *  undo change.
-	 */
-	protected abstract Change createUndoChange(UndoEdit edit);
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		pm.beginTask("", 3); //$NON-NLS-1$
-		IDocument document= null;
-		try {
-			document= acquireDocument(new SubProgressMonitor(pm, 1));
-			TextEditProcessor processor= createTextEditProcessor(document, TextEdit.CREATE_UNDO, false);
-			UndoEdit undo= processor.performEdits();
-			commit(document, new SubProgressMonitor(pm, 1));
-			return createUndoChange(undo);
-		} catch (BadLocationException e) {
-			throw Changes.asCoreException(e);
-		} finally {
-			if (document != null)
-				releaseDocument(document, new SubProgressMonitor(pm, 1));
-			pm.done();
-		}
-	}
-	
-	//---- Method to access the current content of the text change ---------
-
-	/**
-	 * Returns the document this text change is associated to. The 
-	 * document returned is computed at the point in time when this
-	 * method is called. So calling this method multiple times may
-	 * return different document instances.  
-	 * <p>
-	 * The returned document must not be modified by the client. Doing 
-	 * so will result in an unexpected behaviour when the change is 
-	 * performed.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor to report progress or <code>null</code>
-	 *  if no progress reporting is desired
-	 * @return the document this change is working on
-	 * 
-	 * @throws CoreException if the document can't be acquired
-	 */
-	public IDocument getCurrentDocument(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		IDocument result= null;
-		pm.beginTask("", 2); //$NON-NLS-1$
-		try{
-			result= acquireDocument(new SubProgressMonitor(pm, 1));
-		} finally {
-			if (result != null)
-				releaseDocument(result, new SubProgressMonitor(pm, 1));
-		}
-		pm.done();
-		return result;
-	}
-	
-	/**
-	 * Returns the current content of the document this text
-	 * change is associated with.
-	 * 
-	 * @param pm a progress monitor to report progress or <code>null</code>
-	 *  if no progress reporting is desired
-	 * @return the current content of the text change
-	 * 
-	 * @exception CoreException if the content can't be accessed
-	 */
-	public String getCurrentContent(IProgressMonitor pm) throws CoreException {
-		return getCurrentDocument(pm).get();
-	}
-	
-	/**
-	 * Returns the current content of the text change clipped to a specific
-	 * region. The region is determined as follows:
-	 * <ul>
-	 *   <li>if <code>expandRegionToFullLine</code> is <code>false</code>
-	 *       then the parameter <code>region</code> determines the clipping.
-	 *   </li>
-	 *   <li>if <code>expandRegionToFullLine</code> is <code>true</code>
-	 *       then the region determined by the parameter <code>region</code>
-	 *       is extended to cover full lines. 
-	 *   </li>
-	 *   <li>if <code>surroundingLines</code> &gt; 0 then the given number
-	 *       of surrounding lines is added. The value of <code>surroundingLines
-	 *       </code> is only considered if <code>expandRegionToFullLine</code>
-	 *       is <code>true</code>
-	 *   </li>
-	 * </ul> 
-	 * 
-	 * @param region the starting region for the text to be returned
-	 * @param expandRegionToFullLine if <code>true</code> is passed the region
-	 *  is extended to cover full lines
-	 * @param surroundingLines the number of surrounding lines to be added to 
-	 *  the clipping region. Is only considered if <code>expandRegionToFullLine
-	 *  </code> is <code>true</code>
-	 * @param pm a progress monitor to report progress or <code>null</code>
-	 *  if no progress reporting is desired
-	 * 
-	 * @return the current content of the text change clipped to a region
-	 *  determined by the given parameters.
-	 * 
-	 * @throws CoreException if an exception occurs while accessing the current content
-	 */
-	public String getCurrentContent(IRegion region, boolean expandRegionToFullLine, int surroundingLines, IProgressMonitor pm) throws CoreException {
-		Assert.isNotNull(region);
-		Assert.isTrue(surroundingLines >= 0);
-		IDocument document= getCurrentDocument(pm);
-		Assert.isTrue(document.getLength() >= region.getOffset() + region.getLength());
-		return getContent(document, region, expandRegionToFullLine, surroundingLines);
-	}
-
-	//---- Method to access the preview content of the text change ---------
-
-	/**
-	 * Controls whether the text change should keep executed edits during 
-	 * preview generation.
-	 * 
-	 * @param keep if <code>true</code> executed preview edits are kept
-	 */
-	public void setKeepPreviewEdits(boolean keep) {
-		fTrackEdits= keep;
-		if (!fTrackEdits)
-			fCopier= null;
-	}
-	
-	/**
-	 * Returns whether preview edits are remembered for further region
-	 * tracking or not.
-	 * 
-	 * @return <code>true</code> if executed text edits are remembered
-	 * during preview generation; otherwise <code>false</code>
-	 */
-	public boolean getKeepPreviewEdits() {
-		return fTrackEdits;
-	}
-	
-	/**
-	 * Returns the edit that got executed during preview generation
-	 * instead of the given original. The method requires that <code>
-	 * setKeepPreviewEdits</code> is set to <code>true</code> and that 
-	 * a preview has been requested via one of the <code>getPreview*
-	 * </code> methods.
-	 * <p>
-	 * The method returns <code>null</code> if the original isn't managed
-	 * by this text change.
-	 * </p>
-	 * 
-	 * @param original the original edit managed by this text change
-	 * 
-	 * @return the edit executed during preview generation
-	 */
-	public TextEdit getPreviewEdit(TextEdit original) {
-		Assert.isTrue(fTrackEdits && fCopier != null && original != null);
-		return fCopier.getCopy(original);
-	}
-	
-	/**
-	 * Returns the edits that were executed during preview generation
-	 * instead of the given array of original edits. The method requires 
-	 * that <code>setKeepPreviewEdits</code> is set to <code>true</code> 
-	 * and that a preview has been requested via one of the <code>
-	 * getPreview*</code> methods.
-	 * <p>
-	 * The method returns an empty array if none of the original edits
-	 * is managed by this text change.
-	 * </p>
-	 * 
-	 * @param originals an array of original edits managed by this text
-	 *  change
-	 * 
-	 * @return an array of edits containing the corresponding edits 
-	 *  executed during preview generation
-	 */
-	public TextEdit[] getPreviewEdits(TextEdit[] originals) {
-		Assert.isTrue(fTrackEdits && fCopier != null && originals != null);
-		if (originals.length == 0)
-			return new TextEdit[0];
-		List result= new ArrayList(originals.length);
-		for (int i= 0; i < originals.length; i++) {
-			TextEdit copy= fCopier.getCopy(originals[i]);
-			if (copy != null)
-				result.add(copy);
-		}
-		return (TextEdit[]) result.toArray(new TextEdit[result.size()]);
-	}
-	
-	/**
-	 * Returns a document containing a preview of the text change. The
-	 * preview is computed by executing the all managed text edits. The
-	 * method considers the active state of the added {@link TextEditChangeGroup
-	 * text edit change groups}.
-	 * 
-	 * @param pm a progress monitor to report progress or <code>null</code>
-	 *  if no progress reporting is desired
-	 * @return a document containing the preview of the text change
-	 * 
-	 * @throws CoreException if the preview can't be created
-	 */
-	public IDocument getPreviewDocument(IProgressMonitor pm) throws CoreException {
-		PreviewAndRegion result= getPreviewDocument(ALL_EDITS, pm);
-		return result.document;
-	}
-	
-	/**
-	 * Returns the preview content as a string. This is a convenient
-	 * method for calling <code>getPreviewDocument(IProgressMonitor).get()</code>.
-	 * 
-	 * @param pm a progress monitor to report progress or <code>null</code>
-	 *  if no progress reporting is desired
-	 * @return the preview 
-	 * 
-	 * @throws CoreException if the preview can't be created
-	 */
-	public String getPreviewContent(IProgressMonitor pm) throws CoreException {
-		return getPreviewDocument(pm).get();
-	}
-	
-	/**
-	 * Returns a preview of the text change clipped to a specific region.
-	 * The preview is created by applying the text edits managed by the
-	 * given array of {@link TextEditChangeGroup text edit change groups}. 
-	 * The region is determined as follows:
-	 * <ul>
-	 *   <li>if <code>expandRegionToFullLine</code> is <code>false</code>
-	 *       then the parameter <code>region</code> determines the clipping.
-	 *   </li>
-	 *   <li>if <code>expandRegionToFullLine</code> is <code>true</code>
-	 *       then the region determined by the parameter <code>region</code>
-	 *       is extended to cover full lines. 
-	 *   </li>
-	 *   <li>if <code>surroundingLines</code> &gt; 0 then the given number
-	 *       of surrounding lines is added. The value of <code>surroundingLines
-	 *       </code> is only considered if <code>expandRegionToFullLine</code>
-	 *       is <code>true</code>
-	 *   </li>
-	 * </ul> 
-	 * 
-	 * @param changeGroups a set of change groups for which a preview is to be
-	 *  generated
-	 * @param region the starting region for the clipping
-	 * @param expandRegionToFullLine if <code>true</code> is passed the region
-	 *  is extended to cover full lines
-	 * @param surroundingLines the number of surrounding lines to be added to 
-	 *  the clipping region. Is only considered if <code>expandRegionToFullLine
-	 *  </code> is <code>true</code>
-	 * @param pm a progress monitor to report progress or <code>null</code>
-	 *  if no progress reporting is desired
-	 * 
-	 * @return the current content of the text change clipped to a region
-	 *  determined by the given parameters.
-	 * 
-	 * @throws CoreException if an exception occurs while generating the preview
-	 * 
-	 * @see #getCurrentContent(IRegion, boolean, int, IProgressMonitor)
-	 */
-	public String getPreviewContent(TextEditChangeGroup[] changeGroups, IRegion region, boolean expandRegionToFullLine, int surroundingLines, IProgressMonitor pm) throws CoreException {
-		IRegion currentRegion= getRegion(changeGroups);
-		Assert.isTrue(region.getOffset() <= currentRegion.getOffset() && 
-			currentRegion.getOffset() + currentRegion.getLength() <= region.getOffset() + region.getLength());
-		PreviewAndRegion result= getPreviewDocument(changeGroups, pm);
-		int delta= result.region.getLength() - currentRegion.getLength();
-		return getContent(result.document, new Region(region.getOffset(), region.getLength() + delta), expandRegionToFullLine, surroundingLines);
-		
-	}
-
-	//---- private helper methods --------------------------------------------------
-	
-	private PreviewAndRegion getPreviewDocument(TextEditChangeGroup[] changes, IProgressMonitor pm) throws CoreException {
-		IDocument document= new Document(getCurrentDocument(pm).get());
-		boolean trackChanges= fTrackEdits;
-		setKeepPreviewEdits(true);
-		TextEditProcessor processor= changes == ALL_EDITS
-			? createTextEditProcessor(document, TextEdit.NONE, true)
-			: createTextEditProcessor(document, TextEdit.NONE, changes);
-		try {
-			processor.performEdits();
-			return new PreviewAndRegion(document, getNewRegion(changes));
-		} catch (BadLocationException e) {
-			throw Changes.asCoreException(e);
-		} finally {
-			setKeepPreviewEdits(trackChanges);
-		}
-	}
-	
-	private TextEditProcessor createTextEditProcessor(IDocument document, int flags, boolean preview) {
-		if (fEdit == null)
-			return new TextEditProcessor(document, new MultiTextEdit(0,0), flags);
-		List excludes= new ArrayList(0);
-		for (Iterator iter= fTextEditChangeGroups.iterator(); iter.hasNext(); ) {
-			TextEditChangeGroup edit= (TextEditChangeGroup)iter.next();
-			if (!edit.isEnabled()) {
-				excludes.addAll(Arrays.asList(edit.getTextEditGroup().getTextEdits()));
-			}
-		}
-		if (preview) {
-			fCopier= new TextEditCopier(fEdit);
-			TextEdit copiedEdit= fCopier.perform();
-			if (fTrackEdits)
-				flags= flags | TextEdit.UPDATE_REGIONS;
-			LocalTextEditProcessor result= new LocalTextEditProcessor(document, copiedEdit, flags);
-			result.setExcludes(mapEdits(
-				(TextEdit[])excludes.toArray(new TextEdit[excludes.size()]),
-				fCopier));	
-			if (!fTrackEdits)
-				fCopier= null;
-			return result;
-		} else {
-			LocalTextEditProcessor result= new LocalTextEditProcessor(document, fEdit, flags | TextEdit.UPDATE_REGIONS);
-			result.setExcludes((TextEdit[])excludes.toArray(new TextEdit[excludes.size()]));
-			return result;
-		}
-	}
-	
-	private TextEditProcessor createTextEditProcessor(IDocument document, int flags, TextEditChangeGroup[] changes) {
-		if (fEdit == null)
-			return new TextEditProcessor(document, new MultiTextEdit(0,0), flags);
-		List includes= new ArrayList(0);
-		for (int c= 0; c < changes.length; c++) {
-			TextEditChangeGroup change= changes[c];
-			Assert.isTrue(change.getTextChange() == this);
-			if (change.isEnabled()) {
-				includes.addAll(Arrays.asList(change.getTextEditGroup().getTextEdits()));
-			}
-		}
-		fCopier= new TextEditCopier(fEdit);
-		TextEdit copiedEdit= fCopier.perform();
-		if (fTrackEdits)
-			flags= flags | TextEdit.UPDATE_REGIONS;
-		LocalTextEditProcessor result= new LocalTextEditProcessor(document, copiedEdit, flags);
-		result.setIncludes(mapEdits(
-			(TextEdit[])includes.toArray(new TextEdit[includes.size()]),
-			fCopier));
-		if (!fTrackEdits)
-			fCopier= null;
-		return result;
-	}
-	
-	private TextEdit[] mapEdits(TextEdit[] edits, TextEditCopier copier) {
-		if (edits == null)
-			return null;
-		for (int i= 0; i < edits.length; i++) {
-			edits[i]= copier.getCopy(edits[i]);
-		}
-		return edits;
-	}
-	
-	private String getContent(IDocument document, IRegion region, boolean expandRegionToFullLine, int surroundingLines) throws CoreException {
-		try {
-			if (expandRegionToFullLine) {
-				int startLine= Math.max(document.getLineOfOffset(region.getOffset()) - surroundingLines, 0);
-				int endLine;
-				if (region.getLength() == 0) {
-					endLine= Math.min(
-						document.getLineOfOffset(region.getOffset()) + surroundingLines,
-						document.getNumberOfLines() - 1);
-				} else {
-					endLine= Math.min(
-						document.getLineOfOffset(region.getOffset() + region.getLength() - 1) + surroundingLines,
-						document.getNumberOfLines() - 1);
-				}
-				
-				int offset= document.getLineInformation(startLine).getOffset();
-				IRegion endLineRegion= document.getLineInformation(endLine);
-				int length = endLineRegion.getOffset() + endLineRegion.getLength() - offset;
-				return document.get(offset, length);
-				
-			} else {
-				return document.get(region.getOffset(), region.getLength());
-			}
-		} catch (BadLocationException e) {
-			throw Changes.asCoreException(e);
-		}
-	}
-	
-	private IRegion getRegion(TextEditChangeGroup[] changes) {
-		if (changes == ALL_EDITS) {
-			if (fEdit == null)
-				return null;
-			return fEdit.getRegion();
-		} else {
-			List edits= new ArrayList();
-			for (int i= 0; i < changes.length; i++) {
-				edits.addAll(Arrays.asList(changes[i].getTextEditGroup().getTextEdits()));
-			}
-			if (edits.size() == 0)
-				return null;
-			return TextEdit.getCoverage((TextEdit[]) edits.toArray(new TextEdit[edits.size()]));
-		}
-	}
-	
-	private IRegion getNewRegion(TextEditChangeGroup[] changes) {
-		if (changes == ALL_EDITS) {
-			if (fEdit == null)
-				return null;
-			return fCopier.getCopy(fEdit).getRegion();
-		} else {
-			List result= new ArrayList();
-			for (int c= 0; c < changes.length; c++) {
-				TextEdit[] edits= changes[c].getTextEditGroup().getTextEdits();
-				for (int e= 0; e < edits.length; e++) {
-					TextEdit copy= fCopier.getCopy(edits[e]);
-					if (copy != null)
-						result.add(copy);
-				}
-			}
-			if (result.size() == 0)
-				return null;
-			return TextEdit.getCoverage((TextEdit[]) result.toArray(new TextEdit[result.size()]));
-		}
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextEditChangeGroup.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextEditChangeGroup.java
deleted file mode 100644
index cef34a4..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextEditChangeGroup.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.text.edits.TextEditGroup;
-
-import org.eclipse.jface.text.IRegion;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * This class is a wrapper around a {@link TextEditGroup TextEditGroup}
- * adding support for marking a group as active and inactive.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @see TextEditGroup
- * 
- * @since 3.0
- */
-public class TextEditChangeGroup {
-	
-	private boolean fIsEnabled;
-	private TextChange fTextChange;
-	private TextEditGroup fTextEditGroup;
-	
-	/**
-	 * Creates new <code>TextEditChangeGroup</code> for the given <code>
-	 * TextChange</code> and <code>TextEditGroup</code>.
-	 * 
-	 * @param change the change owning this text edit change group
-	 * @param group the underlying text edit group
-	 */
-	public TextEditChangeGroup(TextChange change, TextEditGroup group) {
-		Assert.isNotNull(change);
-		Assert.isNotNull(group);
-		fTextChange= change;
-		fIsEnabled= true;
-		fTextEditGroup= group;
-	}
-	
-	/**
-	 * Returns the groups's name by forwarding the method
-	 * to the underlying text edit group.
-	 * 
-	 * @return the group's name
-	 */
-	public String getName() {
-		return fTextEditGroup.getName();
-	}
-	
-	/**
-	 * Marks the group as enabled or disabled. If a group
-	 * is marked as disabled the text edits managed by the
-	 * underlying text edit group aren't executed when
-	 * performing the text change that owns this group.
-	 * 
-	 * @param enabled <code>true</code> to mark this group
-	 *  as enabled, <code>false</code> to mark it as disabled
-	 */
-	public void setEnabled(boolean enabled) {
-		fIsEnabled= enabled;
-	}
-	
-	/**
-	 * Returns whether the group is enabled or not.
-	 * 
-	 * @return <code>true</code> if the group is marked as
-	 *  enabled; <code>false</code> otherwise
-	 */
-	public boolean isEnabled() {
-		return fIsEnabled;
-	}
-	
-	/**
-	 * Returns the text change this group belongs to.
-	 * 
-	 * @return the text change this group belongs to
-	 */
-	public TextChange getTextChange() {
-		return fTextChange;
-	}
-	
-	/**
-	 * Returns the underlying text edit group.
-	 * 
-	 * @return the underlying text edit group
-	 */
-	public TextEditGroup getTextEditGroup() {
-		return fTextEditGroup;
-	}
-	
-	/**
-	 * Returns the region covered by the underlying 
-	 * text edit group.
-	 * 
-	 * @return the region covered by the underlying
-	 *  text edit group
-	 */
-	public IRegion getRegion() {
-		return fTextEditGroup.getRegion();
-	}
-	
-	/**
-	 * Returns the text edits managed by the underlying
-	 * text edit group.
-	 * 
-	 * @return the text edits managed by the underlying
-	 *  text edit group
-	 */
-	public TextEdit[] getTextEdits() {
-		return fTextEditGroup.getTextEdits();
-	}	
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextFileChange.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextFileChange.java
deleted file mode 100644
index 0e5c51e..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextFileChange.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.text.edits.UndoEdit;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.BufferValidationState;
-import org.eclipse.ltk.internal.core.refactoring.Changes;
-import org.eclipse.ltk.internal.core.refactoring.ContentStamps;
-
-/**
- * A special {@link TextChange} that operates on a <code>IFile</code>.
- * <p>
- * The class should be subclassed by clients which need to perform 
- * special operation when acquiring or releasing a document. 
- * </p>
- * @since 3.0 
- */
-public class TextFileChange extends TextChange {
-	
-	/** 
-	 * Flag (value 1) indicating that the file's save state has to be kept. This means an 
-	 * unsaved file is still unsaved after performing the change and a saved one 
-	 * will be saved. 
-	 */
-	public static final int KEEP_SAVE_STATE= 1 << 0;
-	
-	/**
-	 * Flag (value 2) indicating that the file is to be saved after the change has been applied.
-	 */
-	public static final int FORCE_SAVE= 1 << 1;
-	
-	/**
-	 * Flag (value 4) indicating that the file will not be saved after the change has been applied.
-	 */
-	public static final int LEAVE_DIRTY= 1 << 2;
-	
-	
-	// the file to change
-	private IFile fFile;
-	private int fSaveMode= KEEP_SAVE_STATE;
-	
-	// the mapped text buffer
-	private int fAquireCount;
-	private ITextFileBuffer fBuffer;
-	
-	private boolean fDirty;
-	private BufferValidationState fValidationState;
-	private ContentStamp fContentStamp;
-	
-	/**
-	 * Creates a new <code>TextFileChange</code> for the given file.
-	 * 
-	 * @param name the change's name mainly used to render the change in the UI
-	 * @param file the file this text change operates on
-	 */
-	public TextFileChange(String name, IFile file) {
-		super(name);
-		Assert.isNotNull(file);
-		fFile= file;
-	}
-	
-	/**
-	 * Sets the save state. Must be one of <code>KEEP_SAVE_STATE</code>,
-	 * <code>FORCE_SAVE</code> or <code>LEAVE_DIRTY</code>.
-	 * 
-	 * @param saveMode indicating how save is handled when the document
-	 *  gets committed
-	 */
-	public void setSaveMode(int saveMode) {
-		fSaveMode= saveMode;
-	}
-	
-	/**
-	 * Returns the save state set via {@link #setSaveMode(int)}.
-	 * 
-	 * @return the save state
-	 */
-	public int getSaveMode() {
-		return fSaveMode;
-	}
-	
-	/**
-	 * Returns the <code>IFile</code> this change is working on.
-	 * 
-	 * @return the file this change is working on
-	 */
-	public IFile getFile() {
-		return fFile;
-	}
-	
-	/**
-	 * Hook to create an undo change for the given undo edit and content stamp. 
-	 * This hook gets called while performing the change to construct the 
-	 * corresponding undo change object.
-	 * 
-	 * @param edit the {@link UndoEdit} to create an undo change for
-	 * @param stampToRestore the content stamp to restore when the undo
-	 *  edit is executed.
-	 * 
-	 * @return the undo change or <code>null</code> if no undo change can
-	 *  be created. Returning <code>null</code> results in the fact that
-	 *  the whole change tree can't be undone. So returning <code>null</code>
-	 *  is only recommended if an exception occurred during creating the
-	 *  undo change.
-	 */
-	protected Change createUndoChange(UndoEdit edit, ContentStamp stampToRestore) {
-		return new UndoTextFileChange(getName(), fFile, edit, stampToRestore, fSaveMode);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getModifiedElement(){
-		return fFile;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		pm.beginTask("", 1); //$NON-NLS-1$
-		fValidationState= BufferValidationState.create(fFile);
-		ITextFileBuffer buffer= FileBuffers.getTextFileBufferManager().getTextFileBuffer(fFile.getFullPath());
-		fDirty= buffer != null && buffer.isDirty();
-		pm.worked(1);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		pm.beginTask("", 1); //$NON-NLS-1$
-		RefactoringStatus result= fValidationState.isValid();
-		if (needsSaving()) {
-			result.merge(Changes.validateModifiesFiles(new IFile[] {fFile}));
-		}
-		pm.worked(1);
-		return result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void dispose() {
-		fValidationState.dispose();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected IDocument acquireDocument(IProgressMonitor pm) throws CoreException {
-		if (fAquireCount > 0)
-			return fBuffer.getDocument();
-		
-		ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-		IPath path= fFile.getFullPath();
-		manager.connect(path, pm);
-		fAquireCount++;
-		fBuffer= manager.getTextFileBuffer(path);
-		fContentStamp= ContentStamps.get(fFile, true);
-		return fBuffer.getDocument();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected void commit(IDocument document, IProgressMonitor pm) throws CoreException {
-		if (needsSaving()) {
-			fBuffer.commit(pm, false);
-			ContentStamps.increment(fFile);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected void releaseDocument(IDocument document, IProgressMonitor pm) throws CoreException {
-		Assert.isTrue(fAquireCount > 0);
-		if (fAquireCount == 1) {
-			ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-			manager.disconnect(fFile.getFullPath(), pm);
-		}
-		fAquireCount--;
- 	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected final Change createUndoChange(UndoEdit edit) {
-		return createUndoChange(edit, fContentStamp);
-	}
-	
-	private boolean needsSaving() {
-		return (fSaveMode & FORCE_SAVE) != 0 || (!fDirty && (fSaveMode & KEEP_SAVE_STATE) != 0);
-	}
-}
-

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/UndoManagerAdapter.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/UndoManagerAdapter.java
deleted file mode 100644
index d9b84f2..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/UndoManagerAdapter.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-/**
- * This adapter class provides default implementations for the
- * methods defined by the {@link IUndoManagerListener} interface.
- * <p>
- * This class may be subclassed by clients.
- * </p>
- * @since 3.0
- */
-public class UndoManagerAdapter implements IUndoManagerListener {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void undoStackChanged(IUndoManager manager) {
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void redoStackChanged(IUndoManager manager) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void aboutToPerformChange(IUndoManager manager, Change change) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void changePerformed(IUndoManager manager, Change change) {
-	}
-}
-

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/UndoTextFileChange.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/UndoTextFileChange.java
deleted file mode 100644
index ea1a4cc..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/UndoTextFileChange.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring;
-
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.text.edits.UndoEdit;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.BufferValidationState;
-import org.eclipse.ltk.internal.core.refactoring.Changes;
-import org.eclipse.ltk.internal.core.refactoring.ContentStamps;
-
-/**
- * A change to perform the reverse change of a {@link TextFileChange}.
- * <p>
- * This class is not intended to be instantiated by clients. It is
- * usually created by a <code>TextFileChange</code> object.
- * </p>
- * <p>
- * The class should be subclassed by clients also subclassing <code>
- * TextFileChange</code> to provide a proper undo change object.
- * </p>
- * @since 3.0
- */
-public class UndoTextFileChange extends Change {
-	
-	private String fName;
-	private UndoEdit fUndo;
-	private IFile fFile;
-	private ContentStamp fContentStampToRestore;
-	private int fSaveMode;
-	
-	private boolean fDirty;
-	private BufferValidationState fValidationState;
-	
-	/**
-	 * Create a new undo text file change object.
-	 * 
-	 * @param name the human readable name of the change 
-	 * @param file the file the change is working on
-	 * @param stamp the content stamp to restore when the undo is executed
-	 * @param undo the edit representing the undo modifications 
-	 * @param saveMode the save mode as specified by {@link TextFileChange}
-	 * 
-	 * @see TextFileChange#KEEP_SAVE_STATE
-	 * @see TextFileChange#FORCE_SAVE
-	 * @see TextFileChange#LEAVE_DIRTY
-	 */
-	protected UndoTextFileChange(String name, IFile file, UndoEdit undo, ContentStamp stamp, int saveMode) {
-		Assert.isNotNull(name);
-		Assert.isNotNull(file);
-		Assert.isNotNull(undo);
-		fName= name;
-		fFile= file;
-		fUndo= undo;
-		fContentStampToRestore= stamp;
-		fSaveMode= saveMode;
-	}
-	
-	/**
-	 * Returns the change's save mode.
-	 * 
-	 * @return the change's save mode
-	 * 
-	 * @see TextFileChange#KEEP_SAVE_STATE
-	 * @see TextFileChange#FORCE_SAVE
-	 * @see TextFileChange#LEAVE_DIRTY
-	 */
-	public int getSaveMode() {
-		return fSaveMode;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/**
-	 * Hook to create an undo change for the given undo edit. This hook 
-	 * gets called while performing the change to construct the corresponding 
-	 * undo change object.
-	 * <p>
-	 * Subclasses may override it to create a different undo change.
-	 * </p>
-	 * @param edit the {@link UndoEdit undo edit} to create a undo change for
-	 * @param stampToRestore the content stamp to restore when the undo
-	 *  edit is executed.
-	 * 
-	 * @return the undo change
-	 * 
-	 * @throws CoreException if an undo change can't be created
-	 */
-	protected Change createUndoChange(UndoEdit edit, ContentStamp stampToRestore) throws CoreException {
-		return new UndoTextFileChange(getName(), fFile, edit, stampToRestore, fSaveMode);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getModifiedElement() {
-		return fFile;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		pm.beginTask("", 1); //$NON-NLS-1$
-		fValidationState= BufferValidationState.create(fFile);
-		ITextFileBuffer buffer= FileBuffers.getTextFileBufferManager().getTextFileBuffer(fFile.getFullPath());
-		fDirty= buffer != null && buffer.isDirty();
-		pm.worked(1);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		pm.beginTask("", 1); //$NON-NLS-1$
-		RefactoringStatus result= fValidationState.isValid();
-		pm.worked(1);
-		return result;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-		pm.beginTask("", 2); //$NON-NLS-1$
-		ITextFileBuffer buffer= null;
-		try {
-			manager.connect(fFile.getFullPath(), new SubProgressMonitor(pm, 1));
-			buffer= manager.getTextFileBuffer(fFile.getFullPath());
-			IDocument document= buffer.getDocument();
-			UndoEdit redo= fUndo.apply(document, TextEdit.CREATE_UNDO);
-			ContentStamp currentStamp= ContentStamps.get(fFile, true);
-			if (needsSaving())
-				buffer.commit(pm, false);
-			ContentStamps.set(fFile, fContentStampToRestore);
-			return createUndoChange(redo, currentStamp);
-		} catch (BadLocationException e) {
-			throw Changes.asCoreException(e);
-		} finally {
-			if (buffer != null)
-				manager.disconnect(fFile.getFullPath(), new SubProgressMonitor(pm, 1));
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void dispose() {
-		fValidationState.dispose();
-	}
-	
-	private boolean needsSaving() {
-		return (fSaveMode & TextFileChange.FORCE_SAVE) != 0 || (!fDirty && (fSaveMode & TextFileChange.KEEP_SAVE_STATE) != 0);
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/package.html b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/package.html
deleted file mode 100644
index 9e752eb..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/package.html
+++ /dev/null

@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-                    
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-                    
-  <meta name="Author" content="IBM">
-                    
-  <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-  <title>Package-level Javadoc</title>
-    
-</head>
-<body>
-Application programmer interface to implement semantic preserving workspace transformations.
-</body>
-</html>

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.java
deleted file mode 100644
index 254e4bc..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.ltk.core.refactoring.IRefactoringCoreStatusCodes;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCoreMessages;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCorePlugin;
-
-/**
- * A context that is shared between the refactoring processor and all its
- * associated participants during condition checking.
- * <p>
- * The context manages a set of {@link IConditionChecker}objects to collect
- * condition checks that should be perform across all participants and the
- * processor. For example validating if a file can be changed (see
- * {@link org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)}
- * should only be called once for all files modified by the processor and all
- * participants.
- * </p>
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class CheckConditionsContext {
-	
-	private Map fCheckers= new HashMap();
-	
-	/**
-	 * Returns the condition checker of the given type.
-	 * 
-	 * @param clazz the type of the condition checker
-	 * 
-	 * @return the condition checker or <code>null</code> if
-	 *  no checker is registered for the given type
-	 */
-	public IConditionChecker getChecker(Class clazz) {
-		return (IConditionChecker)fCheckers.get(clazz);
-	}
-	
-	/**
-	 * Adds the given condition checker. An exception will be
-	 * thrown if a checker of the same type already exists in
-	 * this context.
-	 * 
-	 * @param checker the checker to add
-	 * @throws CoreException if a checker of the same type already
-	 *  exists
-	 */
-	public void add(IConditionChecker checker) throws CoreException {
-		Object old= fCheckers.put(checker.getClass(), checker);
-		if (old != null) {
-			fCheckers.put(checker.getClass(), old);
-			throw new CoreException(new Status(IStatus.ERROR, RefactoringCorePlugin.getPluginId(),
-				IRefactoringCoreStatusCodes.CHECKER_ALREADY_EXISTS_IN_CONTEXT, 
-				RefactoringCoreMessages.getFormattedString("CheckConditionContext.error.checker_exists", checker.getClass().toString()), //$NON-NLS-1$
-				null));  
-		}
-	}
-	
-	/**
-	 * Checks the condition of all registered condition checkers and returns a
-	 * merge status result.
-	 * 
-	 * @param pm a progress monitor or <code>null</code> if no progress 
-	 *  reporting is desired
-	 * 
-	 * @return the combined status result
-	 * 
-	 * @throws CoreException if an error occurs during condition checking
-	 */
-	public RefactoringStatus check(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		RefactoringStatus result= new RefactoringStatus();
-		Collection values = fCheckers.values();
-		pm.beginTask("", values.size()); //$NON-NLS-1$
-		for (Iterator iter= values.iterator(); iter.hasNext();) {
-			IConditionChecker checker= (IConditionChecker)iter.next();
-			result.merge(checker.check(new SubProgressMonitor(pm, 1)));
-			if (pm.isCanceled())
-				throw new OperationCanceledException();
-		}
-		return result;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CreateArguments.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CreateArguments.java
deleted file mode 100644
index 62ae9ad..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CreateArguments.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * Create arguments describe the data that a processor 
- * provides to its create participants.
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- *  
- * @since 3.0
- */
-public class CreateArguments extends RefactoringArguments {
-	
-	/**
-	 * Creates a new create arguments object.
-	 */
-	public CreateArguments() {
-	}	
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CreateParticipant.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CreateParticipant.java
deleted file mode 100644
index db898a9..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CreateParticipant.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A participant to participate in refactorings that create elements. A create
- * participant can't assume that its associated processor is of a specific type.
- * A create could be triggered as a side effect of another refactoring.
- * <p>
- * Create participants are registered via the extension point <code>
- * org.eclipse.ltk.core.refactoring.createParticipants</code>. Extensions to
- * this extension point must therefore extend this abstract class.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class CreateParticipant extends RefactoringParticipant {
-	
-	private CreateArguments fArguments;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	protected final void initialize(RefactoringArguments arguments) {
-		fArguments= (CreateArguments)arguments;
-	}
-	
-	/**
-	 * Returns the create arguments.
-	 * 
-	 * @return the create arguments
-	 */
-	public CreateArguments getArguments() {
-		return fArguments;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteArguments.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteArguments.java
deleted file mode 100644
index 92765b9..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteArguments.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * Delete arguments describes the data that a processor provides 
- * to its delete participants.
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- *  
- * @since 3.0
- */
-public class DeleteArguments extends RefactoringArguments {
-	
-	/**
-	 * Creates a new delete arguments object.
-	 */
-	public DeleteArguments() {
-	}	
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteParticipant.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteParticipant.java
deleted file mode 100644
index c7c453d..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteParticipant.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A participant to participate in refactorings that delete elements. A delete
- * participant can't assume that its associated refactoring processor is a
- * delete processor. A delete operation might be a side effect of another
- * refactoring operation.
- * <p>
- * Delete participants are registered via the extension point <code>
- * org.eclipse.ltk.core.refactoring.deleteParticipants</code>.
- * Extensions to this extension point must therefore extend this abstract class.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class DeleteParticipant extends RefactoringParticipant {
-
-	private DeleteArguments fArguments;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	protected final void initialize(RefactoringArguments arguments) {
-		fArguments= (DeleteArguments)arguments;
-	}
-
-	/**
-	 * Returns the delete arguments.
-	 * 
-	 * @return the delete arguments
-	 */
-	public DeleteArguments getArguments() {
-		return fArguments;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteProcessor.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteProcessor.java
deleted file mode 100644
index fd931d2..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteProcessor.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A special processor that performs delete operations. A delete processor is
- * responsible for actually deleting the elements. Additionally it may update
- * other resources of the same domain which are affected by the delete
- * operation. For example, a Java delete processor could also delete additional
- * Java elements which refer to the elements to be deleted.
- * <p>
- * This class should be subclassed by clients wishing to provide a special delete
- * processor.
- * </p>
- * <p>
- * The main purpose of this class is type safety for the generic delete
- * refactoring
- * </p>
- * 
- * @since 3.0
- */
-public abstract class DeleteProcessor extends RefactoringProcessor {
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteRefactoring.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteRefactoring.java
deleted file mode 100644
index 8510f15..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/DeleteRefactoring.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * A generic delete refactoring. The actual refactoring is done
- * by the delete processor passed to the constructor.
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- * @since 3.0
- */
-public class DeleteRefactoring extends ProcessorBasedRefactoring {
-
-	private DeleteProcessor fProcessor;
-	
-	/**
-	 * Constructs a new delete refactoring for the given processor.
-	 * 
-	 * @param processor the delete processor
-	 */
-	public DeleteRefactoring(DeleteProcessor processor) {
-		Assert.isNotNull(processor);
-		fProcessor= processor;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringProcessor getProcessor() {
-		return fProcessor;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/IConditionChecker.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/IConditionChecker.java
deleted file mode 100644
index 10658fa..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/IConditionChecker.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * A condition checker can be used to share condition checks
- * across the main processor and all its associated participants.
- * <p>
- * This interface should be implemented by clients wishing to provide a
- * special refactoring processor with special shared condition checks. 
- * </p>
- * 
- * @see org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext
- * 
- * @since 3.0 
- */
-public interface IConditionChecker {
-
-	/**
-	 * Performs the actual condition checking.
-	 * 
-	 * @param monitor a progress monitor to report progress
-	 * @return the outcome of the condition check
-	 * 
-	 * @throws CoreException if an error occurred during condition
-	 *  checking. The check is interpreted as failed if this happens
-	 */
-	public RefactoringStatus check(IProgressMonitor monitor) throws CoreException;
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ISharableParticipant.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ISharableParticipant.java
deleted file mode 100644
index 0af0a4d..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ISharableParticipant.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A tagging interface to share a concrete participant instance across
- * multiple elements to be refactored. Consider the example of moving
- * more than one file: if a corresponding move participant is not
- * tagged as a <code>ISharableParticipant</code> then a separate instance
- * of a participant is created for every file to be moved. If the
- * participant is marked as shared then only one instance is created
- * and the participant is responsible to handle all files to be moved.
- * <p>
- * The first element to be refactored will be added to the participant
- * via the participant specific <code>initialize(Object element)</code>
- * method. All subsequent elements will be added via the generic <code>
- * addElement(Object, RefactoringArguments)</code> method. Implementors
- * of this interface can assume that the refactoring arguments passed
- * to the <code>addElement</code> method conform to the participant. For
- * example the arguments are of type <code>MoveArguments</code> if this
- * interface is mixed into a move participant.
- * </p>
- * <p>
- * Clients may implement this interface to tag participants as shared.
- * </p>
- * 
- * @since 3.0 
- */
-public interface ISharableParticipant {
-
-	/**
-	 * Adds the given element and argument to the refactoring participant.
-	 * 
-	 * @param element the element to add
-	 * @param arguments the corresponding arguments
-	 */
-	public void addElement(Object element, RefactoringArguments arguments);
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveArguments.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveArguments.java
deleted file mode 100644
index 4c93257..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveArguments.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * Move arguments describe the data that a processor
- * provides to its move participants.
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class MoveArguments extends RefactoringArguments {
-	
-	private Object fDestination;
-	private boolean fUpdateReferences;
-	
-	/**
-	 * Creates new move arguments.
-	 * 
-	 * @param destination the destination of the move
-	 * @param updateReferences <code>true</code> if reference
-	 *  updating is requested; <code>false</code> otherwise
-	 */
-	public MoveArguments(Object destination, boolean updateReferences) {
-		Assert.isNotNull(destination);
-		fDestination= destination;
-		fUpdateReferences= updateReferences;
-	}
-	
-	/**
-	 * Returns the destination of the move
-	 * 
-	 * @return the move's destination
-	 */
-	public Object getDestination() {
-		return fDestination;
-	}
-	
-	/**
-	 * Returns whether reference updating is requested or not.
-	 * 
-	 * @return returns <code>true</code> if reference
-	 *  updating is requested; <code>false</code> otherwise
-	 */
-	public boolean getUpdateReferences() {
-		return fUpdateReferences;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveParticipant.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveParticipant.java
deleted file mode 100644
index a4ab26f..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveParticipant.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A participant to participate in refactorings that move elements. A move
- * participant can't assume that its associated refactoring processor is a
- * move processor. A move operation might be a side effect of another
- * refactoring operation.
- * <p>
- * Move participants are registered via the extension point <code>
- * org.eclipse.ltk.core.refactoring.moveParticipants</code>.
- * Extensions to this extension point must therefore extend this abstract class.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class MoveParticipant extends RefactoringParticipant {
-
-	private MoveArguments fArguments;
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected final void initialize(RefactoringArguments arguments) {
-		fArguments= (MoveArguments)arguments;
-	}
-	
-	/**
-	 * Returns the move arguments.
-	 * 
-	 * @return the move arguments
-	 */
-	public MoveArguments getArguments() {
-		return fArguments;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveProcessor.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveProcessor.java
deleted file mode 100644
index c6c6a9b..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveProcessor.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A special processor that performs move operations. A move processor is
- * responsible for actually moving the elements. Additionally it may update
- * other resources of the same domain which are affected by the move operation.
- * For example, a Java type move processor also updates all references in Java
- * code to the type to be moved.
- * <p>
- * This class should be subclassed by clients wishing to provide a special move
- * processor.
- * </p>
- * <p>
- * The main purpose of this class is type safety for the generic move
- * refactoring
- * </p>
- * 
- * @since 3.0
- */
-public abstract class MoveProcessor extends RefactoringProcessor {
-
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveRefactoring.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveRefactoring.java
deleted file mode 100644
index f834a53..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/MoveRefactoring.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * A generic move refactoring. The actual refactoring is done
- * by the move processor passed to the constructor.
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class MoveRefactoring extends ProcessorBasedRefactoring {
-
-	private MoveProcessor fProcessor;
-
-	/**
-	 * Creates a new move refactoring with the given move processor.
-	 * 
-	 * @param processor the move processor
-	 */
-	public MoveRefactoring(MoveProcessor processor) {
-		Assert.isNotNull(processor);
-		fProcessor= processor; 
-	}
-	
-	/**
-	 * Returns the move processor associated with this move refactoring.
-	 * 
-	 * @return returns the move processor associated with this move refactoring 
-	 */
-	public MoveProcessor getMoveProcessor() {
-		return fProcessor;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringProcessor getProcessor() {
-		return fProcessor;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ParticipantExtensionPoint.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ParticipantExtensionPoint.java
deleted file mode 100644
index 3a20e37..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ParticipantExtensionPoint.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.core.expressions.EvaluationContext;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.ParticipantDescriptor;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCoreMessages;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCorePlugin;
-
-/* package */ class ParticipantExtensionPoint {
-	
-	private String fName;
-		
-	private String fParticipantID;
-	private List fParticipants;
-	private Class fParticipantClass;
-	
-	//---- debuging----------------------------------------
-	/*
-	private static final boolean EXIST_TRACING;
-	static {
-		String value= Platform.getDebugOption("org.eclipse.jdt.ui/processor/existTracing"); //$NON-NLS-1$
-		EXIST_TRACING= value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	private void printTime(long start) {
-		System.out.println("[" + fName +  //$NON-NLS-1$
-			" extension manager] - existing test: " +  //$NON-NLS-1$
-			(System.currentTimeMillis() - start) + " ms"); //$NON-NLS-1$
-	}
-	*/
-	
-	public ParticipantExtensionPoint(String name, String participantId, Class clazz) {
-		Assert.isNotNull(name);
-		Assert.isNotNull(participantId);
-		Assert.isNotNull(clazz);
-		fName= name;
-		fParticipantID= participantId;
-		fParticipantClass= clazz;
-	}
-	
-	public String getName() {
-		return fName;
-	}
-
-	public RefactoringParticipant[] getParticipants(RefactoringStatus status, RefactoringProcessor processor, Object element, RefactoringArguments arguments, String[] affectedNatures, SharableParticipants shared) {
-		if (fParticipants == null)
-			init();
-		
-		EvaluationContext evalContext= createEvaluationContext(processor, element, affectedNatures);
-		List result= new ArrayList();
-		for (Iterator iter= fParticipants.iterator(); iter.hasNext();) {
-			ParticipantDescriptor descriptor= (ParticipantDescriptor)iter.next();
-			if (!descriptor.isEnabled()) {
-				iter.remove();
-			} else {
-				try {
-					if (descriptor.matches(evalContext)) {
-						RefactoringParticipant participant= shared.get(descriptor);
-						if (participant != null) {
-							((ISharableParticipant)participant).addElement(element, arguments);
-						} else {
-							try {
-								participant= descriptor.createParticipant();
-								if (!fParticipantClass.isInstance(participant))
-									throw new ClassCastException();
-								if (participant.initialize(processor, element, arguments)) {
-									participant.setDescriptor(descriptor);
-									result.add(participant);
-									if (participant instanceof ISharableParticipant)
-										shared.put(descriptor, participant);
-								}
-							} catch(ClassCastException e) {
-								status.addError(RefactoringCoreMessages.getFormattedString(
-									"ParticipantExtensionPoint.participant_removed",  //$NON-NLS-1$
-									descriptor.getName()));
-								RefactoringCorePlugin.logErrorMessage(
-									RefactoringCoreMessages.getFormattedString(
-										"ParticipantExtensionPoint.wrong_type", //$NON-NLS-1$
-										new String[] {descriptor.getName(), fParticipantClass.getName()}));
-								iter.remove();
-							}
-						}
-					}
-				} catch (CoreException e) {
-					status.addError(RefactoringCoreMessages.getFormattedString(
-						"ParticipantExtensionPoint.participant_removed",  //$NON-NLS-1$
-						descriptor.getName()));
-					RefactoringCorePlugin.logRemovedParticipant(descriptor, e);
-					iter.remove();
-				}
-			}
-		}
-		
-		return (RefactoringParticipant[])result.toArray(new RefactoringParticipant[result.size()]);
-	}
-	
-	private void init() {
-		IExtensionRegistry registry= Platform.getExtensionRegistry();
-		IConfigurationElement[] ces= registry.getConfigurationElementsFor(
-			RefactoringCorePlugin.getPluginId(), 
-			fParticipantID);
-		fParticipants= new ArrayList(ces.length); 
-		for (int i= 0; i < ces.length; i++) {
-			ParticipantDescriptor descriptor= new ParticipantDescriptor(ces[i]);
-			IStatus status= descriptor.checkSyntax();
-			switch (status.getSeverity()) {
-				case IStatus.ERROR:
-					RefactoringCorePlugin.log(status);
-					break;
-				case IStatus.WARNING:
-				case IStatus.INFO:
-					RefactoringCorePlugin.log(status);
-					// fall through
-				default:
-					fParticipants.add(descriptor);
-			}
-		}
-	}
-	
-	//---- Helper methods ------------------------------------------------------------------
-	
-	private static EvaluationContext createEvaluationContext(RefactoringProcessor processor, Object element, String[] affectedNatures) {
-		EvaluationContext result= new EvaluationContext(null, element);
-		result.addVariable("element", element); //$NON-NLS-1$
-		result.addVariable("affectedNatures", Arrays.asList(affectedNatures)); //$NON-NLS-1$
-		result.addVariable("processorIdentifier", processor.getIdentifier()); //$NON-NLS-1$
-		return result;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ParticipantManager.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ParticipantManager.java
deleted file mode 100644
index 94d8755..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ParticipantManager.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * Facade to access the rename, move, delete, create and copy participant
- * extension point provided by the org.eclipse.ltk.core.refactoring plug-in.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class ParticipantManager {
-	
-	private ParticipantManager() {
-		// no instance 
-	}
-	
-	//---- Rename participants ----------------------------------------------------------------
-	
-	private static final String RENAME_PARTICIPANT_EXT_POINT= "renameParticipants"; //$NON-NLS-1$
-	private static ParticipantExtensionPoint fgRenameInstance= 
-		new ParticipantExtensionPoint("Rename", RENAME_PARTICIPANT_EXT_POINT, RenameParticipant.class); //$NON-NLS-1$
-	
-	/**
-	 * Loads the rename participants for the given element.
-	 * 
-	 * @param status a refactoring status to report status if problems occurred while
-	 *  loading the participants
-	 * @param processor the processor that will own the participants
-	 * @param element the element to be renamed
-	 * @param arguments the rename arguments describing the rename
-	 * @param affectedNatures an array of project natures affected by the refactoring
-	 * @param shared a list of shared participants
-	 * 
-	 * @return an array of rename participants
-	 */
-	public static RenameParticipant[] loadRenameParticipants(RefactoringStatus status, RefactoringProcessor processor, Object element, RenameArguments arguments, String[] affectedNatures, SharableParticipants shared) {
-		RefactoringParticipant[] participants= fgRenameInstance.getParticipants(status, processor, element, arguments, affectedNatures, shared);
-		RenameParticipant[] result= new RenameParticipant[participants.length];
-		System.arraycopy(participants, 0, result, 0, participants.length);
-		return result;
-	}
-	
-	//---- Move participants ----------------------------------------------------------------
-	
-	private static final String MOVE_PARTICIPANT_EXT_POINT= "moveParticipants"; //$NON-NLS-1$
-	private static ParticipantExtensionPoint fgMoveExtensions= 
-		new ParticipantExtensionPoint("Move", MOVE_PARTICIPANT_EXT_POINT, MoveParticipant.class); //$NON-NLS-1$
-
-	/**
-	 * Loads the move participants for the given element.
-	 * 
-	 * @param status a refactoring status to report status if problems occurred while
-	 *  loading the participants
-	 * @param processor the processor that will own the participants
-	 * @param element the element to be moved
-	 * @param arguments the move arguments describing the move
-	 * @param affectedNatures an array of project natures affected by the refactoring
-	 * @param shared a list of shared participants
-	 * 
-	 * @return an array of move participants
-	 */
-	public static MoveParticipant[] loadMoveParticipants(RefactoringStatus status, RefactoringProcessor processor, Object element, MoveArguments arguments, String[] affectedNatures, SharableParticipants shared) {
-		RefactoringParticipant[] participants= fgMoveExtensions.getParticipants(status, processor, element, arguments, affectedNatures, shared);
-		MoveParticipant[] result= new MoveParticipant[participants.length];
-		System.arraycopy(participants, 0, result, 0, participants.length);
-		return result;
-	}
-
-	//---- Delete participants ----------------------------------------------------------------
-	
-	private static final String DELETE_PARTICIPANT_EXT_POINT= "deleteParticipants"; //$NON-NLS-1$
-	private static ParticipantExtensionPoint fgDeleteInstance= 
-		new ParticipantExtensionPoint("Delete", DELETE_PARTICIPANT_EXT_POINT, DeleteParticipant.class); //$NON-NLS-1$
-	
-	/**
-	 * Loads the delete participants for the given element.
-	 * @param status a refactoring status to report status if problems occurred while
-     *  loading the participants
-	 * @param processor the processor that will own the participants
-	 * @param element the element to be deleted
-	 * @param arguments the delete arguments describing the delete
-	 * @param affectedNatures an array of project natures affected by the refactoring
-	 * @param shared a list of shared participants
-	 * 
-	 * @return an array of delete participants
-	 */
-	public static DeleteParticipant[] loadDeleteParticipants(RefactoringStatus status, RefactoringProcessor processor, Object element, DeleteArguments arguments, String[] affectedNatures, SharableParticipants shared) {
-		RefactoringParticipant[] participants= fgDeleteInstance.getParticipants(status, processor, element, arguments, affectedNatures, shared);
-		DeleteParticipant[] result= new DeleteParticipant[participants.length];
-		System.arraycopy(participants, 0, result, 0, participants.length);
-		return result;
-	}
-
-	//---- Create participants ----------------------------------------------------------------
-	
-	private static final String CREATE_PARTICIPANT_EXT_POINT= "createParticipants"; //$NON-NLS-1$
-	private static ParticipantExtensionPoint fgCreateInstance= 
-		new ParticipantExtensionPoint("Create", CREATE_PARTICIPANT_EXT_POINT, CreateParticipant.class); //$NON-NLS-1$
-	
-	/**
-	 * Loads the create participants for the given element.
-	 * 
-	 * @param status a refactoring status to report status if problems occurred while
-	 *  loading the participants
-	 * @param processor the processor that will own the participants
-	 * @param element the element to be created or a corresponding descriptor
-	 * @param arguments the create arguments describing the create
-	 * @param affectedNatures an array of project natures affected by the refactoring
-	 * @param shared a list of shared participants
-	 * 
-	 * @return an array of create participants
-	 */
-	public static CreateParticipant[] loadCreateParticipants(RefactoringStatus status, RefactoringProcessor processor, Object element, CreateArguments arguments, String affectedNatures[], SharableParticipants shared) {
-		RefactoringParticipant[] participants= fgCreateInstance.getParticipants(status, processor, element, arguments, affectedNatures, shared);
-		CreateParticipant[] result= new CreateParticipant[participants.length];
-		System.arraycopy(participants, 0, result, 0, participants.length);
-		return result;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.java
deleted file mode 100644
index c66c8dc..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.core.refactoring.ParticipantDescriptor;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCoreMessages;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCorePlugin;
-
-/**
- * An abstract base implementation for refactorings that are split into
- * one refactoring processor and 0..n participants.
- * <p>
- * This class should be subclassed by clients wishing to provide a special
- * refactoring which uses a processor/participant architecture.
- * </p>
- * @since 3.0 
- */
-public abstract class ProcessorBasedRefactoring extends Refactoring {
-	
-	private RefactoringParticipant[] fParticipants;
-	private SharableParticipants fSharedParticipants= new SharableParticipants();
-	
-	private static final RefactoringParticipant[] EMPTY_PARTICIPANTS= new RefactoringParticipant[0];
-
-	private static class ProcessorChange extends CompositeChange {
-		private Map fParticipantMap;
-		public ProcessorChange(String name) {
-			super(name);
-		}
-		public void setParticipantMap(Map map) {
-			fParticipantMap= map;
-		}
-		protected void internalHandleException(Change change, Throwable e) {
-			RefactoringParticipant participant= (RefactoringParticipant)fParticipantMap.get(change);
-			if (participant != null) {
-				ParticipantDescriptor descriptor= participant.getDescriptor();
-				descriptor.disable();
-				RefactoringCorePlugin.logRemovedParticipant(descriptor, e);
-			}
-		}
-	}
-	
-	/**
-	 * Creates a new processor based refactoring.
-	 */
-	protected ProcessorBasedRefactoring() {
-	}
-	
-	/**
-	 * Return the processor associated with this refactoring. The
-	 * method must not return <code>null</code>.
-	 * 
-	 * @return the processor associated with this refactoring
-	 */
-	public abstract RefactoringProcessor getProcessor();
-	
-	
-	/**
-	 * Checks whether the refactoring is applicable to the elements to be
-	 * refactored or not.
-	 * <p>
-	 * This default implementation forwards the call to the refactoring
-	 * processor.
-	 * </p>
-	 * @return <code>true</code> if the refactoring is applicable to the
-	 *         elements; otherwise <code>false</code> is returned.
-	 * @throws CoreException if the test fails
-	 */
-	public final boolean isApplicable() throws CoreException {
-		return getProcessor().isApplicable();
-	}
-		
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return getProcessor().getProcessorName();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		RefactoringStatus result= new RefactoringStatus();
-		pm.beginTask("", 10); //$NON-NLS-1$
-		pm.setTaskName(RefactoringCoreMessages.getString("ProcessorBasedRefactoring.initial_conditions")); //$NON-NLS-1$
-		
-		result.merge(getProcessor().checkInitialConditions(new SubProgressMonitor(pm, 8)));
-		if (result.hasFatalError()) {
-			pm.done();
-			return result;
-		}
-		pm.done();
-		return result;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus checkFinalConditions(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		RefactoringStatus result= new RefactoringStatus();
-		CheckConditionsContext context= createCheckConditionsContext();
-		
-		pm.beginTask("", 9); //$NON-NLS-1$
-		pm.setTaskName(RefactoringCoreMessages.getString("ProcessorBasedRefactoring.final_conditions")); //$NON-NLS-1$
-		
-		result.merge(getProcessor().checkFinalConditions(new SubProgressMonitor(pm, 5), context));
-		if (result.hasFatalError()) {
-			pm.done();
-			return result;
-		}
-		if (pm.isCanceled())
-			throw new OperationCanceledException();
-		
-		fParticipants= getProcessor().loadParticipants(result, fSharedParticipants);
-		if (fParticipants == null) 
-			fParticipants= EMPTY_PARTICIPANTS;
-		if (result.hasFatalError()) {
-			pm.done();
-			return result;
-		}
-		IProgressMonitor sm= new SubProgressMonitor(pm, 2);
-		sm.beginTask("", fParticipants.length); //$NON-NLS-1$
-		for (int i= 0; i < fParticipants.length && !result.hasFatalError(); i++) {
-			result.merge(fParticipants[i].checkConditions(new SubProgressMonitor(sm, 1), context));
-			if (sm.isCanceled())
-				throw new OperationCanceledException();
-		}
-		sm.done();
-		if (result.hasFatalError()) {
-			pm.done();
-			return result;
-		}
-		result.merge(context.check(new SubProgressMonitor(pm, 1)));
-		pm.done();
-		return result;		
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		pm.beginTask("", fParticipants.length + 2); //$NON-NLS-1$
-		pm.setTaskName(RefactoringCoreMessages.getString("ProcessorBasedRefactoring.create_change")); //$NON-NLS-1$
-		Change processorChange= getProcessor().createChange(new SubProgressMonitor(pm, 1));
-		if (pm.isCanceled())
-			throw new OperationCanceledException();
-		
-		List changes= new ArrayList();
-		Map participantMap= new HashMap();
-		for (int i= 0; i < fParticipants.length; i++) {
-			final RefactoringParticipant participant= fParticipants[i];
-			try {
-				Change change= participant.createChange(new SubProgressMonitor(pm, 1));
-				if (change != null) {
-					changes.add(change);
-					participantMap.put(change, participant);
-				}
-			} catch (CoreException e) {
-				disableParticipant(participant, e);
-				throw e;
-			} catch (RuntimeException e) {
-				disableParticipant(participant, e);
-				throw e;
-			}
-			if (pm.isCanceled())
-				throw new OperationCanceledException();
-		}
-		Change postChange= getProcessor().postCreateChange(
-			(Change[])changes.toArray(new Change[changes.size()]), 
-			new SubProgressMonitor(pm, 1));
-		
-		ProcessorChange result= new ProcessorChange(getName());
-		result.add(processorChange);
-		result.addAll((Change[]) changes.toArray(new Change[changes.size()]));
-		result.setParticipantMap(participantMap);
-		if (postChange != null)
-			result.add(postChange);
-		return result;
-	}
-	
-	/**
-	 * Adapts the refactoring to the given type. The adapter is resolved
-	 * as follows:
-	 * <ol>
-	 *   <li>the refactoring itself is checked whether it is an instance
-	 *       of the requested type.</li>
-	 *   <li>its processor is checked whether it is an instance of the
-	 *       requested type.</li>
-	 *   <li>the request is delegated to the super class.</li>
-	 * </ol>
-	 * 
-	 * @param clazz the adapter class to look up
-	 * 
-	 * @return the requested adapter or <code>null</code>if no adapter
-	 *  exists. 
-	 */
-	public Object getAdapter(Class clazz) {
-		if (clazz.isInstance(this))
-			return this;
-		if (clazz.isInstance(getProcessor()))
-			return getProcessor();
-		return super.getAdapter(clazz);
-	}
-	
-	/* non java-doc
-	 * for debugging only
-	 */
-	public String toString() {
-		return getName();
-	}
-	
-	//---- Helper methods ---------------------------------------------------------------------
-	
-	private CheckConditionsContext createCheckConditionsContext() throws CoreException {
-		CheckConditionsContext result= new CheckConditionsContext();
-		IConditionChecker checker= new ValidateEditChecker(getValidationContext());
-		result.add(checker);
-		return result;
-	}
-
-	private void disableParticipant(final RefactoringParticipant participant, Throwable e) {
-		ParticipantDescriptor descriptor= participant.getDescriptor();
-		descriptor.disable();
-		RefactoringCorePlugin.logRemovedParticipant(descriptor, e);
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringArguments.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringArguments.java
deleted file mode 100644
index 5021374..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringArguments.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A generic super class of all refactoring specific argument
- * classes.
- * <p>
- * The main purpose of this class is to not use <code>Object</code>
- * in signatures. This helps to distinguish between the element to
- * be refactored and the arguments needed to carry out the refactoring.
- * </p>
- * <p>
- * This class should be subclassed by clients wishing to provide special
- * refactoring arguments for special participants.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class RefactoringArguments {
-
-	/**
-	 * Creates new refactoring arguments.
-	 */
-	protected RefactoringArguments() {
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant.java
deleted file mode 100644
index 6c1f6c7..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringParticipant.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.PlatformObject;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.ParticipantDescriptor;
-
-/**
- * A refactoring participant can participate in the condition checking and
- * change creation of a refactoring processor.
- * <p>
- * If the severity of the condition checking result is {@link RefactoringStatus#FATAL}
- * then the whole refactoring will not be carried out. 
- * </p>
- * <p>
- * The change created from a participant <em>MUST</em> not conflict with any changes
- * provided by other participants or the refactoring itself. To ensure this a participant
- * is only allowed to manipulate resources belonging to its domain. For example a rename type 
- * participant updating launch configuration is only allowed to update launch configurations.
- * It is not allowed to manipulate any Java resources or any other resources not belonging to
- * its domain. If a change conflicts with another change during execution then the participant
- * who created the change will be disabled for the rest of the eclipse session.
- * </p>
- * <p>
- * A refactoring participant can not assume that all resources are saved before any 
- * methods are called on it. Therefore a participant must be able to deal with unsaved
- * resources.
- * </p>
- * <p>
- * This class should be subclassed by clients wishing to provide special refactoring 
- * participants extension points.
- * </p>
- * 
- * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor
- * 
- * @since 3.0
- */
-public abstract class RefactoringParticipant extends PlatformObject {
-	
-	private RefactoringProcessor fProcessor;
-	
-	private ParticipantDescriptor fDescriptor;
-	
-	/**
-	 * Returns the processor that is associated with this participant. 
-	 * 
-	 * @return the processor that is associated with this participant
-	 */
-	public RefactoringProcessor getProcessor() {
-		return fProcessor;
-	}
-	
-	/**
-	 * Initializes the participant. This method is called by the framework when a
-	 * participant gets instantiated. 
-	 * <p>
-	 * This method isn't intended to be extended or reimplemented by clients.
-	 * </p>
-	 * @param processor the processor this participant is associated with
-	 * @param element the element to be refactored
-	 * @param arguments the refactoring arguments
-	 * 
-	 * @return <code>true</code> if the participant could be initialized;
-	 *  otherwise <code>false</code> is returned. If <code>false</code> is
-	 *  returned then the participant will not be added to the refactoring. 
-	 * 
-	 * @see #initialize(Object)
-	 */
-	public boolean initialize(RefactoringProcessor processor, Object element, RefactoringArguments arguments) {
-		Assert.isNotNull(processor);
-		Assert.isNotNull(arguments);
-		fProcessor= processor;
-		initialize(arguments);
-		return initialize(element);
-	}
-	
-	/**
-	 * Initializes the participant with the element to be refactored.
-	 * If this method returns <code>false</code> then the framework
-	 * will consider the participant as not being initialized and the 
-	 * participant will be dropped by the framework.
-	 * 
-	 * @param element the element to be refactored
-	 * 
-	 * @return <code>true</code> if the participant could be initialized;
-	 *  otherwise <code>false</code> is returned.
-	 */
-	protected abstract boolean initialize(Object element);
-	
-	/**
-	 * Initializes the participant with the refactoring arguments
-	 * 
-	 * @param arguments the refactoring arguments
-	 */
-	protected abstract void initialize(RefactoringArguments arguments);
-	
-	/**
-	 * Returns a human readable name of this participant.
-	 * 
-	 * @return a human readable name
-	 */
-	public abstract String getName();
-	
-	/**
-	 * Checks the conditions of the refactoring participant. 
-	 * <p>
-	 * The refactoring is considered as not being executable if the returned status
-	 * has the severity of <code>RefactoringStatus#FATAL</code>.
-	 * </p>
-	 * <p>
-	 * This method can be called more than once.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor to report progress
-	 * @param context a condition checking context to collect shared condition checks
-	 * 
-	 * @return a refactoring status. If the status is <code>RefactoringStatus#FATAL</code>
-	 *  the refactoring is considered as not being executable.
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Refactoring#checkInitialConditions(IProgressMonitor)
-	 * @see RefactoringStatus#FATAL
-	 */ 		
-	public abstract RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException;
-	
-	/**
-	 * Creates a {@link Change}object that contains the workspace modifications
-	 * of this participant. The changes provided by a participant <em>must</em>
-	 * not conflict with any change provided by other participants or by the
-	 * refactoring itself.
-	 * <p>
-	 * If the change conflicts with any change provided by other participants or
-	 * by the refactoring itself then change execution will fail and the
-	 * participant will be disabled for the rest of the eclipse session.
-	 * </p>
-	 * <p>
-	 * If an exception occurs while creating the change the refactoring can not
-	 * be carried out and the participant will be disabled for the rest of the
-	 * eclipse session.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor to report progress
-	 * 
-	 * @return the change representing the workspace modifications
-	 * 
-	 * @throws CoreException if an error occurred while creating the change
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 */
-	public abstract Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException;
-
-	//---- helper method ----------------------------------------------------
-	
-	/* package */ void setDescriptor(ParticipantDescriptor descriptor) {
-		Assert.isNotNull(descriptor);
-		fDescriptor= descriptor;
-	}
-	
-	/* package */ ParticipantDescriptor getDescriptor() {
-		return fDescriptor;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringProcessor.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringProcessor.java
deleted file mode 100644
index 94ec9e9..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RefactoringProcessor.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.PlatformObject;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * An abstract base class defining the protocol between a refactoring and
- * its associated processor. The API is very similar to the one of a 
- * {@link org.eclipse.ltk.core.refactoring.Refactoring}. Implementors of
- * this class should therefore study the interface of the refactoring class
- * as well.
- * <p>
- * A refactoring processor is responsible for:
- * <ul>
- *   <li>refactoring the actual element. For example if a rename Java method
- *       refactoring is executed its associated processor provides the 
- *       precondition checking for renaming a method and creates the change
- *       object describing the workspace modifications. This change object
- *       contains elementary changes to rename the Java method and
- *       to update all call sides of this method as well.</li>
- *   <li>loading all participants that want to participate in the refactoring.
- *       For example a Java method rename processor is responsible to load
- *       all participants that want to participate in a Java method rename.</li>
- * </ul>
- * </p>
- * <p>
- * A refactoring processor can not assume that all resources are saved before
- * any methods are called on it. Therefore a processor must be able to deal with
- * unsaved resources.
- * </p>
- * <p>
- * This class should be subclassed by clients wishing to provide special refactoring 
- * processor.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class RefactoringProcessor extends PlatformObject {
-
-	/**
-	 * Returns an array containing the elements to be refactored. The concrete
-	 * type of the elements depend on the concrete refactoring processor. For
-	 * example a processor responsible for renaming Java methods returns the
-	 * method to be renamed via this call.
-	 * 
-	 * @return an array containing the element to be refactored
-	 */
-	public abstract Object[] getElements();
-
-	/**
-	 * Returns the unique identifier of the refactoring processor. The
-	 * identifier must not be <code>null</code>.
-	 * 
-	 * @return a unique identifier.
-	 */
-	public abstract String getIdentifier();
-
-	/**
-	 * Returns a human readable name. The name will be displayed to users. The
-	 * name must not be <code>null</code>.
-	 * 
-	 * @return a human readable name
-	 */
-	public abstract String getProcessorName();
-
-	/**
-	 * Checks whether the processor is applicable to the elements to be
-	 * refactored or not. If <code> false</code> is returned the processor is
-	 * interpreted to be unusable.
-	 * 
-	 * @return <code>true</code> if the processor is applicable to the
-	 *         elements; otherwise <code>false</code> is returned.
-	 * @throws CoreException is the test fails. The processor is treated as
-	 *  unusable if this method throws an exception
-	 */
-	public abstract boolean isApplicable() throws CoreException;
-
-	/**
-	 * Checks some initial conditions based on the element to be refactored.
-	 * <p>
-	 * The refactoring using this processor is considered as not being
-	 * executable if the returned status has the severity of
-	 * <code>RefactoringStatus#FATAL</code>.
-	 * </p>
-	 * <p>
-	 * This method can be called more than once.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor to report progress. Although availability
-	 *        checks are supposed to execute fast, there can be certain
-	 *        situations where progress reporting is necessary. For example
-	 *        rebuilding a corrupted index may report progress.
-	 * 
-	 * @return a refactoring status. If the status is <code>RefactoringStatus#FATAL</code> 
-	 *  the refactoring is considered as not being executable.
-	 * 
-	 * @throws CoreException if an exception occurred during initial condition
-	 *         checking. If this happens the initial condition checking is
-	 *         interpreted as failed.
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Refactoring#checkInitialConditions(IProgressMonitor)
-	 * @see RefactoringStatus#FATAL
-	 */
-	public abstract RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException;
-
-	/**
-	 * Checks the final conditions based on the element to be refactored.
-	 * <p>
-	 * The refactoring using this processor is considered as not being
-	 * executable if the returned status has the severity of
-	 * <code>RefactoringStatus#FATAL</code>.
-	 * </p>
-	 * <p>
-	 * This method can be called more than once.
-	 * </p>
-	 * 
-	 * @param pm a progress monitor to report progress
-	 * @param context a condition checking context to collect shared condition checks
-	 * 
-	 * @return a refactoring status. If the status is <code>RefactoringStatus#FATAL</code> 
-	 *  the refactoring is considered as not being executable.
-	 * 
-	 * @throws CoreException if an exception occurred during final condition
-	 *  checking. If this happens the final condition checking is interpreted as failed.
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Refactoring#checkFinalConditions(IProgressMonitor)
-	 * @see RefactoringStatus#FATAL
-	 */
-	public abstract RefactoringStatus checkFinalConditions(IProgressMonitor pm, CheckConditionsContext context)
-		throws CoreException, OperationCanceledException;
-
-	/**
-	 * Creates a {@link Change} object describing the workspace modifications
-	 * the processor contributes to the overall refactoring.
-	 * 
-	 * @param pm a progress monitor to report progress
-	 * 
-	 * @return the change representing the workspace modifications of the
-	 *  processor
-	 * 
-	 * @throws CoreException if an error occurred while creating the change
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Refactoring#createChange(IProgressMonitor)
-	 */
-	public abstract Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException;
-
-	/**
-	 * Additional hook allowing processor's to add changes to the set of workspace
-	 * modifications after all participant changes have been created.
-	 * 
-	 * @param participantChanges an array containing the changes created by the
-	 *  participants
-	 * @param pm a progress monitor to report progress
-	 * 
-	 * @return change representing additional workspace modifications
-	 * 
-	 * @throws CoreException if an error occurred while creating the post change
-	 * 
-	 * @throws OperationCanceledException if the condition checking got cancelled
-	 * 
-	 * @see #createChange(IProgressMonitor)
-	 */
-	public Change postCreateChange(Change[] participantChanges, IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		return null;
-	}
-	
-	/**
-	 * Returns the array of participants. It is up to the implementor of a
-	 * concrete processor to define which participants are loaded. In general,
-	 * three different kinds of participants can be distinguished:
-	 * <ul>
-	 *   <li>participants listening to the processed refactoring itself. For
-	 *       example if a Java field gets renamed all participants listening
-	 *       to Java field renames should be added via this hook.</li>
-	 *   <li>participants listening to changes of derived elements. For example
-	 *       if a Java field gets renamed corresponding setter and getters methods 
-	 *       are renamed as well. The setter and getter methods are considered as 
-	 *       derived elements and the corresponding participants should be added via 
-	 *       this hook.</li>
-	 *   <li>participants listening to changes of a domain model different than
-	 *       the one that gets manipulated, but changed as a "side effect" of the
-	 *       refactoring. For example, renaming a package moves all its files to a
-	 *       different folder. If the package contains a HTML file then the rename
-	 *       package processor is supposed to load all move HTML file participants 
-	 *       via this hook.</li>
-	 * </ul>
-	 * <p>
-	 * Implementors are responsible to initialize the created participants with
-	 * the right arguments. The method is called after
-	 * {@link #checkFinalConditions(IProgressMonitor, CheckConditionsContext)}has 
-	 * been called on the processor itself.
-	 * </p>
-	 * @param status a refactoring status to report status if problems occur while
-	 *  loading the participants
-	 * @param sharedParticipants a list of sharable participants. Implementors of
-	 *  this method can simply pass this instance to the corresponding participant
-	 *  loading methods defined in {@link ParticipantManager}.  
-	 * 
-	 * @return an array of participants or <code>null</code> or an empty array
-	 *  if no participants are loaded
-	 * 
-	 * @throws CoreException if creating or loading of the participants failed
-	 * 
-	 * @see ISharableParticipant
-	 */
-	public abstract RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants sharedParticipants) throws CoreException;
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameArguments.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameArguments.java
deleted file mode 100644
index 2aad89d..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameArguments.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * Rename arguments describe the data that a processor
- * provides to its rename participants.
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class RenameArguments extends RefactoringArguments {
-	
-	private String fNewName;
-	private boolean fUpdateReferences;
-	
-	/**
-	 * Creates new rename arguments.
-	 * 
-	 * @param newName the new name of the element to be renamed
-	 * @param updateReferences <code>true</code> if reference
-	 *  updating is requested; <code>false</code> otherwise
-	 */
-	public RenameArguments(String newName, boolean updateReferences) {
-		Assert.isNotNull(newName);
-		fNewName= newName;
-		fUpdateReferences= updateReferences;
-	}
-	
-	/**
-	 * Returns the new element name.
-	 * 
-	 * @return the new element name
-	 */
-	public String getNewName() {
-		return fNewName;
-	}
-	
-	/**
-	 * Returns whether reference updating is requested or not.
-	 * 
-	 * @return returns <code>true</code> if reference
-	 *  updating is requested; <code>false</code> otherwise
-	 */
-	public boolean getUpdateReferences() {
-		return fUpdateReferences;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameParticipant.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameParticipant.java
deleted file mode 100644
index a77aae1..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameParticipant.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A participant to participate in refactorings that rename elements. A rename
- * participant can't assume that its associated refactoring processor is a
- * rename processor. A rename operation might be a side effect of another
- * refactoring operation.
- * <p>
- * Rename participants are registered via the extension point <code>
- * org.eclipse.ltk.core.refactoring.renameParticipants</code>.
- * Extensions to this extension point must therefore extend this abstract class.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class RenameParticipant extends RefactoringParticipant {
-
-	private RenameArguments fArguments;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	protected final void initialize(RefactoringArguments arguments) {
-		fArguments= (RenameArguments)arguments;
-	}
-	
-	/**
-	 * Returns the rename arguments.
-	 * 
-	 * @return the rename arguments
-	 */
-	public RenameArguments getArguments() {
-		return fArguments;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameProcessor.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameProcessor.java
deleted file mode 100644
index d7ef3f4..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameProcessor.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-/**
- * A special processor that performs rename operations. A rename processor is
- * responsible for actually renaming the element. Additionally it may update
- * other resources of the same domain which are affected by the rename
- * operation. For example, a Java method rename processor also updates all
- * references in Java code to the method to be renamed.
- * <p>
- * This class should be subclassed by clients wishing to provide a special delete
- * processor.
- * </p>
- * <p>
- * The main purpose of this class is type safety for the generic rename
- * refactoring
- * </p>
- * 
- * @since 3.0
- */
-public abstract class RenameProcessor extends RefactoringProcessor {
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameRefactoring.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameRefactoring.java
deleted file mode 100644
index 68759a2..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/RenameRefactoring.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-
-/**
- * A generic rename refactoring. The actual refactoring is done
- * by the rename processor passed to the constructor.
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class RenameRefactoring extends ProcessorBasedRefactoring {
-
-	private RenameProcessor fProcessor;
-	
-	/**
-	 * Creates a new rename refactoring with the given rename processor.
-	 * 
-	 * @param processor the rename processor
-	 */
-	public RenameRefactoring(RenameProcessor processor) {
-		Assert.isNotNull(processor);
-		fProcessor= processor;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringProcessor getProcessor() {
-		return fProcessor;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/SharableParticipants.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/SharableParticipants.java
deleted file mode 100644
index a9cd8cb..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/SharableParticipants.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ltk.internal.core.refactoring.ParticipantDescriptor;
-
-/**
- * An opaque list to manage sharable participants.
- * <p>
- * The list is managed by the refactoring itself. Clients typically
- * only pass the list to the corresponding method defined in 
- * {@link org.eclipse.ltk.core.refactoring.participants.ParticipantManager}
- * </p>
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @see ISharableParticipant
- * @see org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring
- * @see org.eclipse.ltk.core.refactoring.participants.ParticipantManager
- * 
- * @since 3.0
- */
-public class SharableParticipants {
-	
-	private Map fMap= new HashMap();
-	
-	/* package */ void put(ParticipantDescriptor descriptor, RefactoringParticipant participant) {
-		fMap.put(descriptor, participant);		
-	}
-	/* package */ RefactoringParticipant get(ParticipantDescriptor descriptor) {
-		return (RefactoringParticipant)fMap.get(descriptor);
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ValidateEditChecker.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ValidateEditChecker.java
deleted file mode 100644
index 3ded5d9..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ValidateEditChecker.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.core.refactoring.participants;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.core.refactoring.Assert;
-import org.eclipse.ltk.internal.core.refactoring.RefactoringCoreMessages;
-import org.eclipse.ltk.internal.core.refactoring.Resources;
-
-/**
- * A validate edit checker is a shared checker to collect files
- * to be validated all at once. A validate edit checker checks
- * if the files are in sync with the underlying files system.
- * Additionally <code>IWorkspace#validateEdit</code> is called for
- * all read-only resources.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)
- * 
- * @since 3.0
- */
-public class ValidateEditChecker implements IConditionChecker {
-
-	private List fFiles= new ArrayList();
-	private Object fContext;
-	
-	/**
-	 * The context passed to the validate edit call.
-	 * 
-	 * @param context the <code>org.eclipse.swt.widgets.Shell</code> that is
-	 * to be used to parent any dialogs with the user, or <code>null</code> if
-	 * there is no UI context (declared as an <code>Object</code> to avoid any
-	 * direct references on the SWT component)
-	 * 
-	 * @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)
-	 */
-	public ValidateEditChecker(Object context) {
-		fContext= context;
-	}
-	
-	/**
-	 * Adds the given file to this checker.
-	 * 
-	 * @param file the file to add
-	 */
-	public void addFile(IFile file) {
-		Assert.isNotNull(file);
-		fFiles.add(file);
-	}
-	
-	/**
-	 * Adds the given array of files.
-	 * 
-	 * @param files the array of files to add
-	 */
-	public void addFiles(IFile[] files) {
-		Assert.isNotNull(files);
-		fFiles.addAll(Arrays.asList(files));
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus check(IProgressMonitor monitor) throws CoreException {
-		if (monitor == null)
-			monitor= new NullProgressMonitor();
-		IResource[] resources= (IResource[])fFiles.toArray(new IResource[fFiles.size()]);
-		RefactoringStatus result= new RefactoringStatus();
-		IStatus status= Resources.checkInSync(resources);
-		if (!status.isOK())
-			result.merge(RefactoringStatus.create(status));
-		status= Resources.makeCommittable(resources, fContext);
-		if (!status.isOK()) {
-			result.merge(RefactoringStatus.create(status));
-			if (!result.hasFatalError()) {
-				result.addFatalError(RefactoringCoreMessages.getString("ValidateEditChecker.failed")); //$NON-NLS-1$
-			}
-		}
-		return result;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/package.html b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/package.html
deleted file mode 100644
index 2d13a79..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/package.html
+++ /dev/null

@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-                    
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-                    
-  <meta name="Author" content="IBM">
-                    
-  <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-  <title>Package-level Javadoc</title>
-    
-</head>
-<body>
-Application programmer interface to participant in existing rename, move and delete refactorings
-if the refactoring provider supports participation.
-</body>
-</html>

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Assert.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Assert.java
deleted file mode 100644
index 1c64657..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Assert.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks
- * in code.
- * The predicate methods all test a condition and throw some
- * type of unchecked exception if the condition does not hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are
- * thrown when something is misbehaving. Assertion failures are invariably
- * unspecified behavior; consequently, clients should never rely on
- * these being thrown (and certainly should not being catching them
- * specifically).
- * </p>
- */
-public final class Assert {
-	
-	/* This class is not intended to be instantiated. */
-	private Assert() {
-		// not allowed
-	}
-	/** Asserts that an argument is legal. If the given boolean is
-	 * not <code>true</code>, an <code>IllegalArgumentException</code>
-	 * is thrown.
-	 *
-	 * @param expression the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 * @exception IllegalArgumentException if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression) {
-		return isLegal(expression, ""); //$NON-NLS-1$
-	}
-	/** Asserts that an argument is legal. If the given boolean is
-	 * not <code>true</code>, an <code>IllegalArgumentException</code>
-	 * is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param expression the outcode of the check
-	 * @param message the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 * @exception IllegalArgumentException if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression, String message) {
-		if (!expression)
-			throw new IllegalArgumentException(message);
-		return expression;
-	}
-	/** Asserts that the given object is not <code>null</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * 
-	 * @param object the value to test
-	 * @exception IllegalArgumentException if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object) {
-		isNotNull(object, ""); //$NON-NLS-1$
-	}
-	/** Asserts that the given object is not <code>null</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param object the value to test
-	 * @param message the message to include in the exception
-	 * @exception IllegalArgumentException if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object, String message) {
-		if (object == null)
-			throw new AssertionFailedException("null argument:" + message); //$NON-NLS-1$
-	}
-	/** Asserts that the given boolean is <code>true</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 *
-	 * @param expression the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 */
-	public static boolean isTrue(boolean expression) {
-		return isTrue(expression, ""); //$NON-NLS-1$
-	}
-	/** Asserts that the given boolean is <code>true</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param expression the outcode of the check
-	 * @param message the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 */
-	public static boolean isTrue(boolean expression, String message) {
-		if (!expression)
-			throw new AssertionFailedException("assertion failed: " + message); //$NON-NLS-1$
-		return expression;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/AssertionFailedException.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/AssertionFailedException.java
deleted file mode 100644
index f238ec2..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/AssertionFailedException.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown
- * by some of the methods in <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch 
- * or otherwise depend on assertion failures are susceptible to unexpected
- * breakage when assertions in the code are added or removed.
- * </p>
- */
-/* package */
-class AssertionFailedException extends RuntimeException {
-	
-	/** This class is not intended to be serialized. */
-	private static final long serialVersionUID= 1L;
-	
-	/** 
-	 * Constructs a new exception.
-	 */
-	public AssertionFailedException() {
-		super();
-	}
-	/** 
-	 * Constructs a new exception with the given message.
-	 * 
-	 * @param detail the detailed message
-	 */
-	public AssertionFailedException(String detail) {
-		super(detail);
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/BufferValidationState.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/BufferValidationState.java
deleted file mode 100644
index 5533d07..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/BufferValidationState.java
+++ /dev/null

@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.IFileBuffer;
-import org.eclipse.core.filebuffers.IFileBufferListener;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-
-import org.eclipse.ltk.core.refactoring.ContentStamp;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-
-public abstract class BufferValidationState {
-	
-	protected IFile fFile;
-	protected boolean fExisted;
-	
-	public static BufferValidationState create(IFile file) {
-		ITextFileBuffer buffer= getBuffer(file);
-		if (buffer == null) {
-			return new SavedBufferValidationState(file);
-		} else if (buffer.isDirty()) {
-			return new DirtyBufferValidationState(file);
-		} else {
-			return new SavedBufferValidationState(file);
-		}
-	}
-	
-	public RefactoringStatus isValid() {
-		if (!fExisted) {
-			if (fFile.exists())
-				return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getFormattedString(
-					"TextChanges.error.existing", //$NON-NLS-1$
-					fFile.getFullPath().toString()
-					));
-		} else {
-			if (!fFile.exists())
-				return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getFormattedString(
-					"TextChanges.error.not_existing", //$NON-NLS-1$
-					fFile.getFullPath().toString()
-					));
-		}
-		return new RefactoringStatus();
-	}
-	
-	public void dispose() {
-	}
-	
-	
-	protected BufferValidationState(IFile file) {
-		fFile= file;
-		fExisted= file.exists();
-	}
-	
-	protected IDocument getDocument() {
-		ITextFileBuffer buffer= getBuffer(fFile);
-		if (buffer == null)
-			return null;
-		return buffer.getDocument();
-		
-	}
-	
-	protected static boolean isDirty(IFile file) {
-		ITextFileBuffer buffer= getBuffer(file);
-		if (buffer == null)
-			return false;
-		return buffer.isDirty();
-	}
-	
-	protected static ITextFileBuffer getBuffer(IFile file) {
-		ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-		IPath path= file.getFullPath();
-		ITextFileBuffer buffer= manager.getTextFileBuffer(path);
-		return buffer;
-	}
-}
-
-class DirtyBufferValidationState extends BufferValidationState {
-	
-	private IDocumentListener fDocumentListener;
-	private FileBufferListener fFileBufferListener;
-	private boolean fChanged;
-	private ContentStamp fContentStamp= null;
-	
-	class DocumentChangedListener implements IDocumentListener {
-		public void documentAboutToBeChanged(DocumentEvent event) {
-		}
-		public void documentChanged(DocumentEvent event) {
-			DirtyBufferValidationState.this.documentChanged();
-		}
-	}
-	
-	class FileBufferListener implements IFileBufferListener {
-		public void bufferCreated(IFileBuffer buffer) {
-			// begin https://bugs.eclipse.org/bugs/show_bug.cgi?id=67821
-			if (buffer.getLocation().equals(fFile.getFullPath()) && buffer instanceof ITextFileBuffer) {
-				ITextFileBuffer textBuffer= (ITextFileBuffer)buffer;				
-				if (fDocumentListener == null)
-					fDocumentListener= new DocumentChangedListener();
-				textBuffer.getDocument().addDocumentListener(fDocumentListener);
-			}
-			// end fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=67821
-		}
-		public void bufferDisposed(IFileBuffer buffer) {
-			// begin fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=67821
-			if (fDocumentListener != null && buffer.getLocation().equals(fFile.getFullPath())) {
-				if (buffer instanceof ITextFileBuffer) {
-					ITextFileBuffer textBuffer= (ITextFileBuffer)buffer;
-					textBuffer.getDocument().removeDocumentListener(fDocumentListener);
-					fDocumentListener= null;
-				}
-				fContentStamp= ContentStamps.get(fFile, true);
-			}
-			// end fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=67821
-		}
-		public void bufferContentAboutToBeReplaced(IFileBuffer buffer) {
-		}
-		public void bufferContentReplaced(IFileBuffer buffer) {
-		}
-		public void stateChanging(IFileBuffer buffer) {
-		}
-		public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) {
-		}
-		public void stateValidationChanged(IFileBuffer buffer, boolean isStateValidated) {
-		}
-		public void underlyingFileMoved(IFileBuffer buffer, IPath path) {
-		}
-		public void underlyingFileDeleted(IFileBuffer buffer) {
-		}
-		public void stateChangeFailed(IFileBuffer buffer) {
-		}
-	}
-	
-	public DirtyBufferValidationState(IFile file) {
-		super(file);
-		fContentStamp= ContentStamps.get(file);
-		fFileBufferListener= new FileBufferListener();
-		FileBuffers.getTextFileBufferManager().addFileBufferListener(fFileBufferListener);
-		fDocumentListener= new DocumentChangedListener();
-		getDocument().addDocumentListener(fDocumentListener);
-	}
-
-	public RefactoringStatus isValid() {
-		RefactoringStatus result= super.isValid();
-		if (result.hasFatalError())
-			return result;
-		// If we have initialized the content stamp with the null stamp then we can't compare it with 
-		// the current stamp since a change executed later could have set a concrete stamp for the 
-		// current content
-		if (fChanged || (!fContentStamp.isNullStamp() && !fContentStamp.equals(ContentStamps.get(fFile)))) {
-			result.addFatalError(RefactoringCoreMessages.getFormattedString(
-				"TextChanges.error.content_changed", //$NON-NLS-1$
-				fFile.getFullPath().toString()
-				)); 
-		}
-		return result;
-	}
-	
-	public void dispose() {
-		if (fFileBufferListener != null) {
-			FileBuffers.getTextFileBufferManager().removeFileBufferListener(fFileBufferListener);
-			// fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=67821
-			fFileBufferListener= null;
-		}
-		if (fDocumentListener != null) {
-			getDocument().removeDocumentListener(fDocumentListener);
-			// fix https://bugs.eclipse.org/bugs/show_bug.cgi?id=67821
-			fDocumentListener= null;
-		}
-	}
-	
-	private void documentChanged() {
-		fChanged= true;
-		getDocument().removeDocumentListener(fDocumentListener);
-		FileBuffers.getTextFileBufferManager().removeFileBufferListener(fFileBufferListener);
-		fFileBufferListener= null;
-		fDocumentListener= null;
-	}
-}
-
-class SavedBufferValidationState extends BufferValidationState {
-	private ContentStamp fContentStamp;
-	
-	public SavedBufferValidationState(IFile file) {
-		super(file);
-		fContentStamp= ContentStamps.get(file, true);
-	}
-
-	public RefactoringStatus isValid() {
-		RefactoringStatus result= super.isValid();
-		if (result.hasFatalError())
-			return result;
-		if (!fContentStamp.equals(ContentStamps.get(fFile))) {
-			result.addFatalError(RefactoringCoreMessages.getFormattedString(
-				"TextChanges.error.content_changed", //$NON-NLS-1$
-				fFile.getFullPath().toString()
-				)); 
-		} else if (fFile.isReadOnly()) {
-			result.addFatalError(RefactoringCoreMessages.getFormattedString(
-				"TextChanges.error.read_only", //$NON-NLS-1$
-				fFile.getFullPath().toString()
-				));
-		} else if (!fFile.isSynchronized(IResource.DEPTH_ZERO)) { 
-			result.addFatalError(RefactoringCoreMessages.getFormattedString(
-				"TextChanges.error.outOfSync", //$NON-NLS-1$
-				fFile.getFullPath().toString()
-				));
-		} else if (isDirty(fFile)){
-			result.addFatalError(RefactoringCoreMessages.getFormattedString(
-				"TextChanges.error.unsaved_changes", //$NON-NLS-1$
-				fFile.getFullPath().toString()
-				)); 
-		}
-		return result;
-	}
-}	
-

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Changes.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Changes.java
deleted file mode 100644
index edd434b..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Changes.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.jface.text.BadLocationException;
-
-import org.eclipse.ltk.core.refactoring.IRefactoringCoreStatusCodes;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class Changes {
-	
-	public static RefactoringStatus validateModifiesFiles(IFile[] filesToModify) {
-		RefactoringStatus result= new RefactoringStatus();
-		IStatus status= Resources.checkInSync(filesToModify);
-		if (!status.isOK())
-			result.merge(RefactoringStatus.create(status));
-		status= Resources.makeCommittable(filesToModify, null);
-		if (!status.isOK()) {
-			result.merge(RefactoringStatus.create(status));
-			if (!result.hasFatalError()) {
-				result.addFatalError(RefactoringCoreMessages.getString("Changes.validateEdit")); //$NON-NLS-1$
-			}
-		}
-		return result;
-	}
-	
-	public static CoreException asCoreException(BadLocationException e) {
-		String message= e.getMessage();
-		if (message == null)
-			message= "BadLocationException"; //$NON-NLS-1$
-		return new CoreException(new Status(IStatus.ERROR, RefactoringCorePlugin.getPluginId(), IRefactoringCoreStatusCodes.BAD_LOCATION, message, e));
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ContentStamps.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ContentStamps.java
deleted file mode 100644
index badb065..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ContentStamps.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.ltk.core.refactoring.ContentStamp;
-
-public class ContentStamps {
-	
-	private static class ContentStampImpl extends ContentStamp {
-		
-		public static final int NULL_VALUE= -1;
-		
-		private int fValue;
-		
-		private ContentStampImpl(int value) {
-			fValue= value;
-		}
-		public boolean isNullStamp() {
-			return fValue == NULL_VALUE;
-		}
-		public boolean equals(Object obj) {
-			if (!(obj instanceof ContentStampImpl))
-				return false;
-			return ((ContentStampImpl)obj).fValue == fValue;
-		}
-		public int hashCode() {
-			return fValue;
-		}
-		public String toString() {
-			if (fValue == NULL_VALUE)
-				return "Null Stamp"; //$NON-NLS-1$
-			return "Stamp: " + fValue; //$NON-NLS-1$
-		}
-	}
-	
-	public static final ContentStamp NULL_CONTENT_STAMP= new ContentStampImpl(ContentStampImpl.NULL_VALUE);
-	
-	private static final QualifiedName CONTENT_STAMP= new QualifiedName(
-		RefactoringCorePlugin.getPluginId(), 
-		"contentStamp"); //$NON-NLS-1$
-	
-	public static ContentStamp get(IFile file) {
-		try {
-			ContentStamp result= (ContentStamp)file.getSessionProperty(CONTENT_STAMP);
-			if (result != null)
-				return result;
-			return NULL_CONTENT_STAMP;
-		} catch (CoreException e) {
-			// fall through
-		}
-		return NULL_CONTENT_STAMP;
-	}
-	
-	public static ContentStamp get(IFile file, boolean create) {
-		ContentStamp result= get(file);
-		if (result.isNullStamp() && create) {
-			result= new ContentStampImpl(0);
-			try {
-				file.setSessionProperty(CONTENT_STAMP, result);
-			} catch (CoreException e) {
-				return NULL_CONTENT_STAMP;
-			}
-		}
-		return result;
-	}
-	
-	public static void remove(IFile file) {
-		try {
-			file.setSessionProperty(CONTENT_STAMP, null);
-		} catch (CoreException e) {
-		}
-	}
-	
-	public static void increment(IFile file) {
-		try {
-			ContentStampImpl stamp= (ContentStampImpl)file.getSessionProperty(CONTENT_STAMP);
-			if (stamp == null)
-				return;
-			file.setSessionProperty(CONTENT_STAMP, new ContentStampImpl(stamp.fValue + 1));
-		} catch (CoreException e) {
-		}
-	}
-	
-	public static void set(IFile file, ContentStamp stamp) {
-		try {
-			file.setSessionProperty(CONTENT_STAMP, stamp);
-		} catch (CoreException e) {
-		}
-	}	
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ListenerList.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ListenerList.java
deleted file mode 100644
index 5406ac1..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ListenerList.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-/**
- * Local copy of org.eclipse.jface.ListenerList
- */
-public class ListenerList {
-
-	static {
-		//XXX: 1GCQD0A: ITPVCM:WIN2000 - ListenerList should be part of a core project
-	}
-	
-	/**
-	 * The initial capacity of the list. Always >= 1.
-	 */
-	private int capacity;
-
-	/**
-	 * The current number of listeners.
-	 * Maintains invariant: 0 <= size <= listeners.length.
-	 */
-	private int size;
-
-	/**
-	 * The list of listeners.  Initially <code>null</code> but initialized
-	 * to an array of size capacity the first time a listener is added.
-	 * Maintains invariant: listeners != null IFF size != 0
-	 */
-	private Object[] listeners= null;
-
-	/**
-	 * The empty array singleton instance, returned by getListeners()
-	 * when size == 0.
-	 */
-	private static final Object[] EmptyArray= new Object[0];
-	
-	/**
-	 * Creates a listener list with an initial capacity of 3.
-	 */
-	public ListenerList() {
-		this(3);
-	}
-	
-	/**
-	 * Creates a listener list with the given initial capacity.
-	 *
-	 * @param cap the number of listeners which this list can initially accept 
-	 *    without growing its internal representation; must be at least 1
-	 */
-	public ListenerList(int cap) {
-		Assert.isTrue(cap >= 1);
-		this.capacity= cap;
-	}
-	
-	/**
-	 * Adds the given listener to this list. Has no effect if an identical listener
-	 * is already registered.
-	 *
-	 * @param listener the listener
-	 */
-	public void add(Object listener) {
-		Assert.isNotNull(listener);
-		if (size == 0) {
-			listeners= new Object[capacity];
-		} else {
-			// check for duplicates using identity
-			for (int i= 0; i < size; ++i) {
-				if (listeners[i] == listener) {
-					return;
-				}
-			}
-			// grow array if necessary
-			if (size == listeners.length) {
-				System.arraycopy(listeners, 0, listeners= new Object[size * 2 + 1], 0, size);
-			}
-		}
-		listeners[size++]= listener;
-	}
-	
-	/**
-	 * Returns an array containing all the registered listeners.
-	 * The resulting array is unaffected by subsequent adds or removes.
-	 * If there are no listeners registered, the result is an empty array
-	 * singleton instance (no garbage is created).
-	 * Use this method when notifying listeners, so that any modifications
-	 * to the listener list during the notification will have no effect on the
-	 * notification itself.
-	 *
-	 * @return the list of registered listeners
-	 */
-	public Object[] getListeners() {
-		if (size == 0)
-			return EmptyArray;
-		Object[] result= new Object[size];
-		System.arraycopy(listeners, 0, result, 0, size);
-		return result;
-	}
-	
-	/**
-	 * Returns whether this listener list is empty.
-	 *
-	 * @return <code>true</code> if there are no registered listeners, and
-	 *   <code>false</code> otherwise
-	 */
-	public boolean isEmpty() {
-		return size == 0;
-	}
-	
-	/**
-	 * Removes the given listener from this list. Has no effect if an identical
-	 * listener was not already registered.
-	 *
-	 * @param listener the listener
-	 */
-	public void remove(Object listener) {
-		Assert.isNotNull(listener);
-		for (int i= 0; i < size; ++i) {
-			if (listeners[i] == listener) {
-				if (--size == 0) {
-					listeners= new Object[1];
-				} else {
-					if (i < size) {
-						listeners[i]= listeners[size];
-					}
-					listeners[size]= null;
-				}
-				return;
-			}
-		}
-	}
-	
-	/**
-	 * Returns the number of registered listeners.
-	 *
-	 * @return the number of registered listeners
-	 */
-	public int size() {
-		return size;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/NotCancelableProgressMonitor.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/NotCancelableProgressMonitor.java
deleted file mode 100644
index 9d4c61d..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/NotCancelableProgressMonitor.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ProgressMonitorWrapper;
-
-public class NotCancelableProgressMonitor extends ProgressMonitorWrapper {
-	public NotCancelableProgressMonitor(IProgressMonitor monitor) {
-		super(monitor);
-	}
-	public void setCanceled(boolean b) {
-		// ignore set cancel
-	}
-	public boolean isCanceled() {
-		return false;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ParticipantDescriptor.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ParticipantDescriptor.java
deleted file mode 100644
index 8169ac7..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/ParticipantDescriptor.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.core.expressions.EvaluationResult;
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.expressions.ExpressionConverter;
-import org.eclipse.core.expressions.ExpressionTagNames;
-import org.eclipse.core.expressions.IEvaluationContext;
-
-import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
-
-public class ParticipantDescriptor {
-	
-	private IConfigurationElement fConfigurationElement;
-	private boolean fEnabled;
-
-	private static final String ID= "id"; //$NON-NLS-1$
-	private static final String NAME= "name";  //$NON-NLS-1$
-	private static final String CLASS= "class"; //$NON-NLS-1$
-	
-	public ParticipantDescriptor(IConfigurationElement element) {
-		fConfigurationElement= element;
-		fEnabled= true;
-	}
-	
-	public String getId() {
-		return fConfigurationElement.getAttribute(ID);
-	}
-	
-	public String getName() {
-		return fConfigurationElement.getAttribute(NAME);
-	}
-	
-	public IStatus checkSyntax() {
-		if (fConfigurationElement.getAttribute(ID) == null) {
-			return new Status(IStatus.ERROR, RefactoringCorePlugin.getPluginId(), IStatus.ERROR,
-				RefactoringCoreMessages.getString("ParticipantDescriptor.error.id_missing"), null); //$NON-NLS-1$
-		}
-		if (fConfigurationElement.getAttribute(NAME) == null) {
-			return new Status(IStatus.ERROR, RefactoringCorePlugin.getPluginId(), IStatus.ERROR,
-				RefactoringCoreMessages.getFormattedString( "ParticipantDescriptor.error.name_missing", getId()),  //$NON-NLS-1$
-				null);
-		}
-		if (fConfigurationElement.getAttribute(CLASS) == null) {
-			return new Status(IStatus.ERROR, RefactoringCorePlugin.getPluginId(), IStatus.ERROR,
-				RefactoringCoreMessages.getFormattedString( "ParticipantDescriptor.error.class_missing", getId()),  //$NON-NLS-1$
-				null);
-		}
-		return new Status(IStatus.OK, RefactoringCorePlugin.getPluginId(), IStatus.OK, 
-			RefactoringCoreMessages.getString("ParticipantDescriptor.correct"), null); //$NON-NLS-1$
-	}
-	
-	public boolean matches(IEvaluationContext context) throws CoreException {
-		IConfigurationElement[] elements= fConfigurationElement.getChildren(ExpressionTagNames.ENABLEMENT);
-		if (elements.length == 0)
-			return false;
-		Assert.isTrue(elements.length == 1);
-		Expression exp= ExpressionConverter.getDefault().perform(elements[0]);
-		return convert(exp.evaluate(context));
-	}
-
-	public RefactoringParticipant createParticipant() throws CoreException {
-		return (RefactoringParticipant)fConfigurationElement.createExecutableExtension(CLASS);
-	}
-	
-	public boolean isEnabled() {
-		return fEnabled;
-	}
-	
-	public void disable() {
-		fEnabled= false;
-	}
-	
-	private boolean convert(EvaluationResult eval) {
-		if (eval == EvaluationResult.FALSE)
-			return false;
-		return true;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCoreMessages.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCoreMessages.java
deleted file mode 100644
index 2a81a2a..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCoreMessages.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class RefactoringCoreMessages {
-
-	private static final String BUNDLE_NAME= "org.eclipse.ltk.internal.core.refactoring.RefactoringCoreMessages";//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private RefactoringCoreMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}
-	}
-	
-	public static String getFormattedString(String key, String arg) {
-		try{
-			return MessageFormat.format(RESOURCE_BUNDLE.getString(key), new String[] { arg });
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}	
-	}
-	
-	public static String getFormattedString(String key, Object arg) {
-		try{
-			return MessageFormat.format(RESOURCE_BUNDLE.getString(key), new Object[] { arg });
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}	
-	}
-	
-	public static String getFormattedString(String key, String[] args) {
-		try{
-			return MessageFormat.format(RESOURCE_BUNDLE.getString(key), args);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}	
-	}
-	
-	public static String getFormattedString(String key, Object[] args) {
-		try{
-			return MessageFormat.format(RESOURCE_BUNDLE.getString(key), args);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}	
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCoreMessages.properties b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCoreMessages.properties
deleted file mode 100644
index abd6879..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCoreMessages.properties
+++ /dev/null

@@ -1,50 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-ValidateEditChecker.failed= Team provider refused file modification.
-
-Changes.validateEdit= Team provider refused file modification.
-
-RefactoringCorePlugin.internal_error=Internal Error
-RefactoringCorePlugin.listener_removed=Listener removed due to the following exception
-RefactoringCorePlugin.participant_removed=Participant {0} removed due to the following exception
-
-Resources.outOfSyncResources= Some resources are out of sync
-Resources.outOfSync= Resource ''{0}'' is out of sync with file system.
-Resources.modifiedResources= There are modified resources
-Resources.fileModified= File ''{0}'' has been modified since the beginning of the operation
-
-NullChange.name= No operation change
-
-TextChanges.error.existing=The file ''{0}'' already exists in the workspace
-TextChanges.error.not_existing=''{0}'' does not exist anymore
-TextChanges.error.content_changed=The content of ''{0}'' has changed
-TextChanges.error.unsaved_changes=The file ''{0}'' has unsaved changes
-TextChanges.error.read_only=The file ''{0}'' is read-only
-TextChanges.error.outOfSync= The file ''{0}'' is out of sync with the underlying file system
-TextChanges.error.document_content_changed= The content of the document has changed
-TextChanges.error.missing_stamp= The content of ''{0}'' has changed
-
-CheckConditionContext.error.checker_exists= A checker of type ''{0}'' already exists
-
-CompositeChange.performingChangesTask.name=Performing changes...
-
-ProcessorBasedRefactoring.initial_conditions=Check conditions...
-ProcessorBasedRefactoring.final_conditions=Check conditions...
-ProcessorBasedRefactoring.create_change=Creating workspace modifications...
-
-ParticipantDescriptor.correct=Syntactically correct rename participant element
-ParticipantDescriptor.error.id_missing=Disabling refactoring participant: the id attribute is missing
-ParticipantDescriptor.error.name_missing=Disabling refactoring participant: Refactoring participant ''{0}'' is missing ''name'' attribute. 
-ParticipantDescriptor.error.class_missing=Disabling refactoring participant: Refactoring participant ''{0}'' is missing ''class'' attribute.
-
-ParticipantExtensionPoint.participant_removed= The participant ''{0}'' has caused a problem and has been removed from the system. Consult the log for details.
-ParticipantExtensionPoint.wrong_type= The participant ''{0}'' does not extend the required type ''{1}''.

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCorePlugin.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCorePlugin.java
deleted file mode 100644
index e5f7c4e..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCorePlugin.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.ltk.core.refactoring.IRefactoringCoreStatusCodes;
-import org.osgi.framework.BundleContext;
-
-public class RefactoringCorePlugin extends Plugin {
-	
-	private static RefactoringCorePlugin fgDefault;
-	
-	public RefactoringCorePlugin() {
-		fgDefault= this;
-	}
-
-	public static RefactoringCorePlugin getDefault() {
-		return fgDefault;
-	}
-	
-	public static String getPluginId() {
-		return "org.eclipse.ltk.core.refactoring"; //$NON-NLS-1$
-	}
-	
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-	
-	public static void log(Throwable t) {
-		IStatus status= new Status(
-			IStatus.ERROR, getPluginId(), 
-			IRefactoringCoreStatusCodes.INTERNAL_ERROR, 
-			RefactoringCoreMessages.getString("RefactoringCorePlugin.internal_error"),  //$NON-NLS-1$
-			t);
-		ResourcesPlugin.getPlugin().getLog().log(status);
-	}
-	
-	public static void logRemovedListener(Throwable t) {
-		IStatus status= new Status(
-			IStatus.ERROR, getPluginId(), 
-			IRefactoringCoreStatusCodes.INTERNAL_ERROR, 
-			RefactoringCoreMessages.getString("RefactoringCorePlugin.listener_removed"),  //$NON-NLS-1$
-			t);
-		ResourcesPlugin.getPlugin().getLog().log(status);
-	}
-	
-	public static void logRemovedParticipant(ParticipantDescriptor descriptor, Throwable t) {
-		IStatus status= new Status(
-			IStatus.ERROR, getPluginId(), 
-			IRefactoringCoreStatusCodes.INTERNAL_ERROR, 
-			RefactoringCoreMessages.getFormattedString(
-				"RefactoringCorePlugin.participant_removed",  //$NON-NLS-1$
-				descriptor.getId()),
-			t);
-		ResourcesPlugin.getPlugin().getLog().log(status);
-	}
-	
-	public static void logErrorMessage(String message) {
-		log(new Status(IStatus.ERROR, getPluginId(), IRefactoringCoreStatusCodes.INTERNAL_ERROR, message, null));
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	/**
-	 * {@inheritDoc}
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		SaveListener.getInstance().startup();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	/**
-	 * {@inheritDoc}
-	 */
-	public void stop(BundleContext context) throws Exception {
-		SaveListener.getInstance().shutdown();
-		super.stop(context);
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCorePreferences.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCorePreferences.java
deleted file mode 100644
index d4ae785..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/RefactoringCorePreferences.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class RefactoringCorePreferences {
-
-	// private static final String CONDITION_CHECKING_FAILED_SEVERITY= "condidtionCheckingFailed"; //$NON-NLS-1$
-	
-	public static int getCheckPassedSeverity() {
-		/*
-		String value= RefactoringUIPlugin.getDefault().getPreferenceStore().getString(CONDITION_CHECKING_FAILED_SEVERITY);
-		try {
-			return Integer.valueOf(value).intValue() - 1;
-		} catch (NumberFormatException e) {
-			return RefactoringStatus.WARNING;
-		}
-		*/
-		return RefactoringStatus.INFO;
-	}
-	
-	public static int getStopSeverity() {
-		switch (getCheckPassedSeverity()) {
-			case RefactoringStatus.OK:
-				return RefactoringStatus.INFO;
-			case RefactoringStatus.INFO:
-				return RefactoringStatus.WARNING;
-			case RefactoringStatus.WARNING:
-				return RefactoringStatus.ERROR;
-		}
-		return RefactoringStatus.FATAL;
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Resources.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Resources.java
deleted file mode 100644
index 27cc8d3..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/Resources.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.ltk.core.refactoring.IRefactoringCoreStatusCodes;
-
-public class Resources {
-
-	private Resources() {
-	}
-
-	/**
-	 * Checks if the given resource is in sync with the underlying file system.
-	 * 
-	 * @param resource the resource to be checked
-	 * @return IStatus status describing the check's result. If <code>status.
-	 * isOK()</code> returns <code>true</code> then the resource is in sync
-	 */
-	public static IStatus checkInSync(IResource resource) {
-		return checkInSync(new IResource[] {resource});
-	}
-	
-	/**
-	 * Checks if the given resources are in sync with the underlying file
-	 * system.
-	 * 
-	 * @param resources the resources to be checked
-	 * @return IStatus status describing the check's result. If <code>status.
-	 *  isOK() </code> returns <code>true</code> then the resources are in sync
-	 */
-	public static IStatus checkInSync(IResource[] resources) {
-		IStatus result= null;
-		for (int i= 0; i < resources.length; i++) {
-			IResource resource= resources[i];
-			if (!resource.isSynchronized(IResource.DEPTH_INFINITE)) {
-				result= addOutOfSync(result, resource);
-			}			
-		}
-		if (result != null)
-			return result;
-		return new Status(IStatus.OK, RefactoringCorePlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$		
-	}
-
-	/**
-	 * Makes the given resource committable. Committable means that it is
-	 * writeable and that its content hasn't changed by calling
-	 * <code>validateEdit</code> for the given resource on <tt>IWorkspace</tt>.
-	 * 
-	 * @param resource the resource to be checked
-	 * @param context the context passed to <code>validateEdit</code> 
-	 * @return status describing the method's result. If <code>status.isOK()</code> returns <code>true</code> then the resources are committable.
-	 * 
-	 * @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)
-	 */
-	public static IStatus makeCommittable(IResource resource, Object context) {
-		return makeCommittable(new IResource[] { resource }, context);
-	}
-	
-	/**
-	 * Makes the given resources committable. Committable means that all
-	 * resources are writeable and that the content of the resources hasn't
-	 * changed by calling <code>validateEdit</code> for a given file on
-	 * <tt>IWorkspace</tt>.
-	 * 
-	 * @param resources the resources to be checked
-	 * @param context the context passed to <code>validateEdit</code> 
-	 * @return IStatus status describing the method's result. If <code>status.
-	 * isOK()</code> returns <code>true</code> then the add resources are
-	 * committable
-	 * 
-	 * @see org.eclipse.core.resources.IWorkspace#validateEdit(org.eclipse.core.resources.IFile[], java.lang.Object)
-	 */
-	public static IStatus makeCommittable(IResource[] resources, Object context) {
-		List readOnlyFiles= new ArrayList();
-		for (int i= 0; i < resources.length; i++) {
-			IResource resource= resources[i];
-			if (resource.getType() == IResource.FILE && resource.isReadOnly())	
-				readOnlyFiles.add(resource);
-		}
-		if (readOnlyFiles.size() == 0)
-			return new Status(IStatus.OK, RefactoringCorePlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
-			
-		Map oldTimeStamps= createModificationStampMap(readOnlyFiles);
-		IStatus status= ResourcesPlugin.getWorkspace().validateEdit(
-			(IFile[]) readOnlyFiles.toArray(new IFile[readOnlyFiles.size()]), context);
-		if (!status.isOK())
-			return status;
-			
-		IStatus modified= null;
-		Map newTimeStamps= createModificationStampMap(readOnlyFiles);
-		for (Iterator iter= oldTimeStamps.keySet().iterator(); iter.hasNext();) {
-			IFile file= (IFile) iter.next();
-			if (!oldTimeStamps.get(file).equals(newTimeStamps.get(file)))
-				modified= addModified(modified, file);
-		}
-		if (modified != null)	
-			return modified;
-		return new Status(IStatus.OK, RefactoringCorePlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
-	}
-
-	private static Map createModificationStampMap(List files){
-		Map map= new HashMap();
-		for (Iterator iter= files.iterator(); iter.hasNext(); ) {
-			IFile file= (IFile)iter.next();
-			map.put(file, new Long(file.getModificationStamp()));
-		}
-		return map;
-	}
-	
-	private static IStatus addModified(IStatus status, IFile file) {
-		IStatus entry= new Status(
-			IStatus.ERROR, RefactoringCorePlugin.getPluginId(),
-			IRefactoringCoreStatusCodes.VALIDATE_EDIT_CHANGED_CONTENT, 
-			RefactoringCoreMessages.getFormattedString("Resources.fileModified", file.getFullPath().toString()), //$NON-NLS-1$ 
-			null);
-		if (status == null) {
-			return entry;
-		} else if (status.isMultiStatus()) {
-			((MultiStatus)status).add(entry);
-			return status;
-		} else {
-			MultiStatus result= new MultiStatus(RefactoringCorePlugin.getPluginId(),
-				IRefactoringCoreStatusCodes.VALIDATE_EDIT_CHANGED_CONTENT,
-				RefactoringCoreMessages.getString("Resources.modifiedResources"), null); //$NON-NLS-1$ 
-			result.add(status);
-			result.add(entry);
-			return result;
-		}
-	}	
-
-	private static IStatus addOutOfSync(IStatus status, IResource resource) {
-		IStatus entry= new Status(
-			IStatus.ERROR,
-			ResourcesPlugin.PI_RESOURCES,
-			IResourceStatus.OUT_OF_SYNC_LOCAL,
-			RefactoringCoreMessages.getFormattedString("Resources.outOfSync", resource.getFullPath().toString()), //$NON-NLS-1$ 
-			null);
-		if (status == null) {
-			return entry;
-		} else if (status.isMultiStatus()) {
-			((MultiStatus)status).add(entry);
-			return status;
-		} else {
-			MultiStatus result= new MultiStatus(
-				ResourcesPlugin.PI_RESOURCES,
-				IResourceStatus.OUT_OF_SYNC_LOCAL,
-				RefactoringCoreMessages.getString("Resources.outOfSyncResources"), null); //$NON-NLS-1$ 
-			result.add(status);
-			result.add(entry);
-			return result;
-		}
-	}
-
-	public static String[] getLocationOSStrings(IResource[] resources) {
-		List result= new ArrayList(resources.length);
-		for (int i= 0; i < resources.length; i++) {
-			IPath location= resources[i].getLocation();
-			if (location != null)
-				result.add(location.toOSString());
-		}
-		return (String[]) result.toArray(new String[result.size()]);
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/SaveListener.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/SaveListener.java
deleted file mode 100644
index 591f9ef..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/SaveListener.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.IUndoManagerListener;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-
-public class SaveListener implements IResourceChangeListener, IUndoManagerListener {
-	
-	private class DeltaVisitor implements IResourceDeltaVisitor {
-		public boolean visit(IResourceDelta delta) {
-			IResource resource= delta.getResource();
-			if (resource.getType() == IResource.FILE && delta.getKind() == IResourceDelta.CHANGED &&
-					(delta.getFlags() & IResourceDelta.CONTENT) != 0) {
-				IFile file= (IFile)resource;
-				ContentStamps.increment(file);
-			}
-			return true;
-		}
-	}
-	
-	private DeltaVisitor fVisitor= new DeltaVisitor();
-	private int fInChangeExecution;
-	
-	private static final SaveListener INSTANCE= new SaveListener();
-	
-	public static SaveListener getInstance() {
-		return INSTANCE;
-	}
-	
-	public void resourceChanged(IResourceChangeEvent event) {
-		try {
-			IResourceDelta delta= event.getDelta();
-			if (delta != null && fInChangeExecution == 0)
-				delta.accept(fVisitor);
-		} catch (CoreException e) {
-			RefactoringCorePlugin.log(e);
-		}
-	}
-	
-	public void undoStackChanged(IUndoManager manager) {
-	}
-	public void redoStackChanged(IUndoManager manager) {
-	}
-	public void aboutToPerformChange(IUndoManager manager, Change change) {
-		fInChangeExecution++;
-	}
-	public void changePerformed(IUndoManager manager, Change change) {
-		fInChangeExecution--;
-	}
-	
-	public void startup() {
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-		RefactoringCore.getUndoManager().addListener(this);
-	}
-	
-	public void shutdown() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		RefactoringCore.getUndoManager().removeListener(this);
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/TextChanges.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/TextChanges.java
deleted file mode 100644
index 608323d..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/TextChanges.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * Helper class for text file changes.
- */
-public class TextChanges {
-	
-	private TextChanges() {
-		// no instance
-	}
-	
-	public static IDocument getDocument(IFile file) throws CoreException {
-		ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-		IPath path= file.getFullPath();
-		ITextFileBuffer buffer= manager.getTextFileBuffer(path);
-		if (buffer == null)
-			return null;
-		return buffer.getDocument();
-		
-	}
-
-	public static RefactoringStatus isValid(IFile file, boolean existed, long lastModificationStamp, boolean fSave) throws CoreException {
-		// the file did not exist anymore when initializing the
-		// validation state. In this case we must ensure that it
-		// still doesn't exist.
-		if (!existed) {
-			if (file.exists())
-				return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getFormattedString(
-					"TextChanges.error.existing", //$NON-NLS-1$
-					file.getFullPath().toString()
-					));
-		} else {
-			if (!file.exists())
-				return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getFormattedString(
-					"TextChanges.error.not_existing", //$NON-NLS-1$
-					file.getFullPath().toString()
-					));
-			if (lastModificationStamp != file.getModificationStamp())
-				return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getFormattedString(
-					"TextChanges.error.content_changed", //$NON-NLS-1$
-					file.getFullPath().toString()
-					)); 
-			if (file.isReadOnly())
-				return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getFormattedString(
-					"TextChanges.error.read_only", //$NON-NLS-1$
-					file.getFullPath().toString()
-					));
-			if (!file.isSynchronized(IResource.DEPTH_ZERO)) 
-				return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getFormattedString(
-					"TextChanges.error.outOfSync", //$NON-NLS-1$
-					file.getFullPath().toString()
-					));
-			
-			if (fSave) {
-				ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-				// Don't connect. We want to check if the file is under modification right now
-				ITextFileBuffer buffer= manager.getTextFileBuffer(file.getFullPath());
-				if (buffer != null && buffer.isDirty()) {
-					return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getFormattedString(
-						"TextChanges.error.unsaved_changes", //$NON-NLS-1$
-						file.getFullPath().toString()
-						)); 
-				}
-			}
-		}
-		return new RefactoringStatus();
-	}
-	
-	public static RefactoringStatus isValid(IDocument document, int length) throws CoreException {
-		RefactoringStatus result= new RefactoringStatus();
-		if (length != document.getLength()) {
-			result.addFatalError(RefactoringCoreMessages.getString("TextChanges.error.document_content_changed")); //$NON-NLS-1$
-		}
-		return result;
-	}
-	
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoDocumentChange.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoDocumentChange.java
deleted file mode 100644
index e813e84..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoDocumentChange.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.text.edits.UndoEdit;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class UndoDocumentChange extends Change {
-	
-	private String fName;
-	private UndoEdit fUndo;
-	private IDocument fDocument;
-	private int fLength;
-	
-	public UndoDocumentChange(String name, IDocument document, UndoEdit undo) {
-		fName= name;
-		fUndo= undo;
-		fDocument= document;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object getModifiedElement() {
-		return null;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		fLength= fDocument.getLength();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		pm.beginTask("", 1); //$NON-NLS-1$
-		RefactoringStatus result= TextChanges.isValid(fDocument, fLength);
-		pm.worked(1);
-		return result;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		try {
-			UndoEdit redo= fUndo.apply(fDocument, TextEdit.CREATE_UNDO);
-			Change result= new UndoDocumentChange(getName(), fDocument, redo);
-			return result;
-		} catch (BadLocationException e) {
-			throw Changes.asCoreException(e);
-		}
-	}
-}

diff --git a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoManager.java b/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoManager.java
deleted file mode 100644
index 347f91c..0000000
--- a/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoManager.java
+++ /dev/null

@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.core.refactoring;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.IUndoManagerListener;
-import org.eclipse.ltk.core.refactoring.IValidationCheckResultQuery;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * Default implementation of IUndoManager.
- */
-public class UndoManager implements IUndoManager {
-
-	private Stack fUndoChanges;
-	private Stack fRedoChanges;
-	private Stack fUndoNames;
-	private Stack fRedoNames;
-
-	private ListenerList fListeners;
-	// Maximum numbers of undos on the refactoring undo stack.
-	private static final int MAX_UNDO_REDOS= 6;
-	
-	private static class NullQuery implements IValidationCheckResultQuery {
-		public boolean proceed(RefactoringStatus status) {
-			return true;
-		}
-		public void stopped(RefactoringStatus status) {
-			// do nothing
-		}
-	}
-
-	/**
-	 * Creates a new undo manager with an empty undo and redo stack.
-	 */
-	public UndoManager() {
-		flush();
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public void addListener(IUndoManagerListener listener) {
-		if (fListeners == null)
-			fListeners= new ListenerList();
-		fListeners.add(listener);
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public void removeListener(IUndoManagerListener listener) {
-		if (fListeners == null)
-			return;
-		fListeners.remove(listener);
-		if (fListeners.size() == 0)
-			fListeners= null;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void aboutToPerformChange(Change change) {
-		if (fListeners == null)
-			return;
-		Object[] listeners= fListeners.getListeners();
-		for (int i= 0; i < listeners.length; i++) {
-			((IUndoManagerListener)listeners[i]).aboutToPerformChange(this, change);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void changePerformed(Change change) {
-		if (fListeners == null)
-			return;
-		Object[] listeners= fListeners.getListeners();
-		for (int i= 0; i < listeners.length; i++) {
-			((IUndoManagerListener)listeners[i]).changePerformed(this, change);
-		}
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public void aboutToPerformRefactoring() {
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public void refactoringPerformed(boolean success) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see IUndoManager#shutdown()
-	 */
-	public void shutdown() {
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public void flush() {
-		flushUndo();
-		flushRedo();
-	}
-
-	private void flushUndo() {
-		if (fUndoChanges != null) {
-			sendDispose(fUndoChanges);
-		}
-		fUndoChanges= new Stack();
-		fUndoNames= new Stack();
-		fireUndoStackChanged();
-	}
-
-	private void flushRedo() {
-		if (fRedoChanges != null) {
-			sendDispose(fRedoChanges);
-		}
-		fRedoChanges= new Stack();
-		fRedoNames= new Stack();
-		fireRedoStackChanged();
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public void addUndo(String refactoringName, Change change) {
-		Assert.isNotNull(refactoringName, "refactoring"); //$NON-NLS-1$
-		Assert.isNotNull(change, "change"); //$NON-NLS-1$
-		fUndoNames.push(refactoringName);
-		fUndoChanges.push(change);
-		if (fUndoChanges.size() > MAX_UNDO_REDOS) {
-			Change removedChange= (Change)fUndoChanges.remove(0);
-			fUndoNames.remove(0);
-			removedChange.dispose();
-		}
-		flushRedo();
-		fireUndoStackChanged();
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public void performUndo(IValidationCheckResultQuery query, IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		RefactoringStatus result= new RefactoringStatus();
-
-		if (fUndoChanges.empty())
-			return;
-
-		Change change= (Change)fUndoChanges.pop();
-		if (query == null)
-			query= new NullQuery();	
-		Change redo;
-		try {
-			redo= executeChange(result, change, query, pm);
-		} catch (InterruptedException e) {
-			fUndoChanges.push(change);
-			return;
-		}
-		if (!result.hasFatalError()) {
-			if (redo != null && !fUndoNames.isEmpty()) {
-				fRedoNames.push(fUndoNames.pop());
-				fRedoChanges.push(redo);
-				fireUndoStackChanged();
-				fireRedoStackChanged();
-			} else {
-				flush();
-			}
-		} else {
-			flush();
-		}
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public void performRedo(IValidationCheckResultQuery query, IProgressMonitor pm) throws CoreException {
-		if (pm == null)
-			pm= new NullProgressMonitor();
-		RefactoringStatus result= new RefactoringStatus();
-
-		if (fRedoChanges.empty())
-			return;
-
-		Change change= (Change)fRedoChanges.pop();
-		if (query == null)
-			query= new NullQuery();	
-		Change undo;
-		try {
-			undo= executeChange(result, change, query, pm);
-		} catch (InterruptedException e) {
-			fRedoChanges.push(change);
-			return;
-		}
-		if (!result.hasFatalError()) {
-			if (undo != null && !fRedoNames.isEmpty()) {
-				fUndoNames.push(fRedoNames.pop());
-				fUndoChanges.push(undo);
-				fireRedoStackChanged();
-				fireUndoStackChanged();
-			}
-		} else {
-			flush();
-		}
-	}
-
-	private Change executeChange(final RefactoringStatus status, final Change change, final IValidationCheckResultQuery query, IProgressMonitor pm) throws CoreException, InterruptedException {
-		final Change[] undo= new Change[1];
-		final boolean[] interrupted= new boolean[1];
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				boolean undoInitialized= false;
-				try {
-					monitor.beginTask("", 11); //$NON-NLS-1$
-					status.merge(change.isValid(new SubProgressMonitor(monitor, 2)));
-					if (status.hasFatalError()) {
-						query.stopped(status);
-						change.dispose();
-						return;
-					}
-					if (!status.isOK() && !query.proceed(status)) {
-						interrupted[0]= true;
-						return;
-					}
-					ResourcesPlugin.getWorkspace().checkpoint(false);
-					aboutToPerformChange(change);
-					
-					undo[0]= change.perform(new SubProgressMonitor(monitor, 8));
-					
-					ResourcesPlugin.getWorkspace().checkpoint(false);
-					changePerformed(change);
-					change.dispose();
-					if (undo[0] != null) {
-						undo[0].initializeValidationData(new SubProgressMonitor(monitor, 1));
-						undoInitialized= true;
-					}
-				} catch (CoreException e) {
-					flush();
-					if (undo[0] != null && undoInitialized) {
-						Change ch= undo[0];
-						undo[0]= null;
-						ch.dispose();
-					} else {
-						undo[0]= null;
-					}
-					throw e;
-				} catch (RuntimeException e) {
-					flush();
-					if (undo[0] != null && undoInitialized) {
-						Change ch= undo[0];
-						undo[0]= null;
-						ch.dispose();
-					} else {
-						undo[0]= null;
-					}
-					throw e;
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, pm);
-		if (interrupted[0])
-			throw new InterruptedException();
-		return undo[0];
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public boolean anythingToRedo() {
-		return !fRedoChanges.empty();
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public boolean anythingToUndo() {
-		return !fUndoChanges.empty();
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public String peekUndoName() {
-		if (fUndoNames.size() > 0)
-			return (String)fUndoNames.peek();
-		return null;
-	}
-
-	/*
-	 * (Non-Javadoc) Method declared in IUndoManager.
-	 */
-	public String peekRedoName() {
-		if (fRedoNames.size() > 0)
-			return (String)fRedoNames.peek();
-		return null;
-	}
-
-	private void fireUndoStackChanged() {
-		if (fListeners == null)
-			return;
-		Object[] listeners= fListeners.getListeners();
-		for (int i= 0; i < listeners.length; i++) {
-			((IUndoManagerListener)listeners[i]).undoStackChanged(this);
-		}
-	}
-
-	private void fireRedoStackChanged() {
-		if (fListeners == null)
-			return;
-		Object[] listeners= fListeners.getListeners();
-		for (int i= 0; i < listeners.length; i++) {
-			((IUndoManagerListener)listeners[i]).redoStackChanged(this);
-		}
-	}
-	
-	private void sendDispose(Collection collection) {
-		for (Iterator iter= collection.iterator(); iter.hasNext();) {
-			final Change change= (Change)iter.next();
-			ISafeRunnable r= new ISafeRunnable() {
-				public void run() {
-					change.dispose();
-				}
-				public void handleException(Throwable exception) {
-					RefactoringCorePlugin.log(exception);
-				}
-			};
-			Platform.run(r);
-		}
-	}
-	
-	//---- testing methods ---------------------------------------------
-	
-	public boolean testHasNumberOfUndos(int number) {
-		return fUndoChanges.size() == number;
-	}
-	
-	public boolean testHasNumberOfRedos(int number) {
-		return fRedoChanges.size() == number;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring.tests/.classpath b/org.eclipse.ltk.ui.refactoring.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.ltk.ui.refactoring.tests/.cvsignore b/org.eclipse.ltk.ui.refactoring.tests/.cvsignore
deleted file mode 100644
index fe99505..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-

diff --git a/org.eclipse.ltk.ui.refactoring.tests/.project b/org.eclipse.ltk.ui.refactoring.tests/.project
deleted file mode 100644
index f8663ef..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ltk.ui.refactoring.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.ltk.ui.refactoring.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ltk.ui.refactoring.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cd89d02..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Wed Sep 01 11:55:55 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.ltk.ui.refactoring.tests/about.html b/org.eclipse.ltk.ui.refactoring.tests/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.ltk.ui.refactoring.tests/build.properties b/org.eclipse.ltk.ui.refactoring.tests/build.properties
deleted file mode 100644
index 1ba17af..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/build.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
-               about.html,\
-               plugin.properties,\
-               *.jar
-src.includes = about.html
-source.refuitests.jar = src/

diff --git a/org.eclipse.ltk.ui.refactoring.tests/plugin.properties b/org.eclipse.ltk.ui.refactoring.tests/plugin.properties
deleted file mode 100644
index f99b91f..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/plugin.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName= Refactoring UI Test Plug-in
-providerName= Eclipse.org

diff --git a/org.eclipse.ltk.ui.refactoring.tests/plugin.xml b/org.eclipse.ltk.ui.refactoring.tests/plugin.xml
deleted file mode 100644
index c5458c5..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/plugin.xml
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ltk.ui.refactoring.tests"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.ltk.ui.refactoring.tests.RefactoringUITestPlugin">
-
-   <runtime>
-      <library name="refuitests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   
-   <requires>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.ltk.core.refactoring"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring"/>
-   </requires>
-   
-</plugin>

diff --git a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/AllTests.java b/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/AllTests.java
deleted file mode 100644
index bfb0868..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/AllTests.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-	
-	public static Test suite() {
-		TestSuite suite= new TestSuite("All LTK Refactoring UI Tests"); //$NON-NLS-1$
-		suite.addTestSuite(EmptySuite.class);
-		return suite;
-	}
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/EmptySuite.java b/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/EmptySuite.java
deleted file mode 100644
index 3d4f42a..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/EmptySuite.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring.tests;
-
-import junit.framework.TestCase;
-
-public class EmptySuite extends TestCase {
-
-	public void test0() {
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java b/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java
deleted file mode 100644
index fbc597b..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/RefactoringUITestPlugin.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class RefactoringUITestPlugin extends AbstractUIPlugin {
-	
-	private static RefactoringUITestPlugin fgDefault;
-	
-	public RefactoringUITestPlugin() {
-		fgDefault= this;
-	}
-
-	public static RefactoringUITestPlugin getDefault() {
-		return fgDefault;
-	}
-	
-	public static String getPluginId() {
-		return "org.eclipse.ltk.ui.refactoring.tests"; //$NON-NLS-1$
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring.tests/test.xml b/org.eclipse.ltk.ui.refactoring.tests/test.xml
deleted file mode 100644
index 61ac5de..0000000
--- a/org.eclipse.ltk.ui.refactoring.tests/test.xml
+++ /dev/null

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.ltk.ui.refactoring.tests"/>
-  <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="refactoring-ui-folder" 
-              value="${eclipse-home}/refactoring_ui_folder"/>
-    <delete dir="${refactoring-ui-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${refactoring-ui-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.ltk.ui.refactoring.tests.AllTests"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-  <!-- This target runs the performance test suites. -->
-  <target name="performance">
-  </target>
-
-</project>

diff --git a/org.eclipse.ltk.ui.refactoring/.classpath b/org.eclipse.ltk.ui.refactoring/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.ltk.ui.refactoring/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.ltk.ui.refactoring/.cvsignore b/org.eclipse.ltk.ui.refactoring/.cvsignore
deleted file mode 100644
index fe99505..0000000
--- a/org.eclipse.ltk.ui.refactoring/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-

diff --git a/org.eclipse.ltk.ui.refactoring/.project b/org.eclipse.ltk.ui.refactoring/.project
deleted file mode 100644
index 8d07c0b..0000000
--- a/org.eclipse.ltk.ui.refactoring/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ltk.ui.refactoring</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.ltk.ui.refactoring/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ltk.ui.refactoring/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 63662ff..0000000
--- a/org.eclipse.ltk.ui.refactoring/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,64 +0,0 @@
-#Wed Sep 01 11:53:54 CEST 2004

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled


diff --git a/org.eclipse.ltk.ui.refactoring/about.html b/org.eclipse.ltk.ui.refactoring/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.ltk.ui.refactoring/about.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.ltk.ui.refactoring/build.properties b/org.eclipse.ltk.ui.refactoring/build.properties
deleted file mode 100644
index bebd8a7..0000000
--- a/org.eclipse.ltk.ui.refactoring/build.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties,\
-               *.jar
-src.includes = about.html,\
-               schema/
-source.refui.jar = src/

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/change.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/change.gif
deleted file mode 100644
index d79c444..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/change.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/composite_change.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/composite_change.gif
deleted file mode 100644
index 71c4196..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/composite_change.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/cu_change.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/cu_change.gif
deleted file mode 100644
index bd0e156..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/cu_change.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/error_obj.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/error_obj.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/error_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/fatalerror_obj.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/fatalerror_obj.gif
deleted file mode 100644
index 486faff..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/fatalerror_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/file_change.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/file_change.gif
deleted file mode 100644
index 55a7bac..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/file_change.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/info_obj.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/info_obj.gif
deleted file mode 100644
index 2da001e..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/info_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/text_edit.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/text_edit.gif
deleted file mode 100644
index 9312d7e..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/text_edit.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/warning_obj.gif b/org.eclipse.ltk.ui.refactoring/icons/full/obj16/warning_obj.gif
deleted file mode 100644
index 2b2e50f..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/obj16/warning_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/icons/full/wizban/refactor_wiz.gif b/org.eclipse.ltk.ui.refactoring/icons/full/wizban/refactor_wiz.gif
deleted file mode 100644
index 7731067..0000000
--- a/org.eclipse.ltk.ui.refactoring/icons/full/wizban/refactor_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.ltk.ui.refactoring/plugin.properties b/org.eclipse.ltk.ui.refactoring/plugin.properties
deleted file mode 100644
index cfbd96a..0000000
--- a/org.eclipse.ltk.ui.refactoring/plugin.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName= Refactoring UI
-providerName= Eclipse.org
-
-statusViewerExtensionPoint= Refactoring Status Viewer
-changeViewerExtensionPoint= Refactoring Change Viewer

diff --git a/org.eclipse.ltk.ui.refactoring/plugin.xml b/org.eclipse.ltk.ui.refactoring/plugin.xml
deleted file mode 100644
index 8238396..0000000
--- a/org.eclipse.ltk.ui.refactoring/plugin.xml
+++ /dev/null

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ltk.ui.refactoring"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin">
-
-   <runtime>
-      <library name="refui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.ltk.core.refactoring"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-   </requires>
-
-   <extension-point id="statusContextViewers" name="%statusViewerExtensionPoint" schema="schema/statusContextViewers.exsd"/>
-   <extension-point id="changePreviewViewers" name="%changeViewerExtensionPoint" schema="schema/changePreviewViewers.exsd"/>
-
-   <extension point="org.eclipse.ltk.ui.refactoring.statusContextViewers">
-      <statusContextViewer
-            class="org.eclipse.ltk.internal.ui.refactoring.FileStatusContextViewer"
-            id="org.eclipse.ltk.internal.ui.refactoring.fileStatusContextViewer">
-         <enablement>
-            <instanceof value="org.eclipse.ltk.core.refactoring.FileStatusContext"/>
-         </enablement>
-      </statusContextViewer>
-   </extension>
-   
-   <extension point="org.eclipse.ltk.ui.refactoring.changePreviewViewers">
-      <changePreviewViewer
-            class="org.eclipse.ltk.internal.ui.refactoring.TextChangePreviewViewer"
-            id="org.eclipse.ltk.internal.ui.refactoring.textChangePreviewViewer">
-         <enablement>
-            <instanceof value="org.eclipse.ltk.core.refactoring.TextChange"/>
-         </enablement>
-      </changePreviewViewer>
-   </extension>
-
-</plugin>

diff --git a/org.eclipse.ltk.ui.refactoring/schema/changePreviewViewers.exsd b/org.eclipse.ltk.ui.refactoring/schema/changePreviewViewers.exsd
deleted file mode 100644
index 6c834a6..0000000
--- a/org.eclipse.ltk.ui.refactoring/schema/changePreviewViewers.exsd
+++ /dev/null

@@ -1,136 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ltk.ui.refactoring">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ltk.ui.refactoring" id="changePreviewViewers" name="Refactoring Change Preview Viewers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define a special viewer capable to present change objects. The reader of 
-         the extension point provides the following predefined variables which can be accessed during 
-         expression evaluation using the &amp;lt;with variable=&quot;...&quot;/&amp;gt; tag: 
-&lt;p&gt;
-&lt;dl&gt;
-  &lt;dt&gt;change&lt;/dt&gt;
-  &lt;dd&gt;the change object to present a preview for&lt;/dd&gt;
-&lt;/dl&gt;
-&lt;/p&gt;
-The default variable used during expression evaluation is bound to the change variable.
-      </documentation>
-   </annotation>
-
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="changePreviewViewer" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="changePreviewViewer">
-      <complexType>
-         <all>
-            <element ref="enablement"/>
-         </all>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  unique identifier for the change preview viewer.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that provides the implementation.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ltk.ui.refactoring.IChangePreviewViewer"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The example below contributes a preview viewer for text change objects.
-
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.ltk.ui.refactoring.changePreviewViewers&quot;&gt;
-      &lt;changePreviewViewer
-            class=&quot;org.eclipse.ltk.internal.ui.refactoring.TextChangePreviewViewer&quot;
-            id=&quot;org.eclipse.ltk.internal.ui.refactoring.textChangePreviewViewer&quot;&gt;
-         &lt;enablement&gt;
-            &lt;instanceof value=&quot;org.eclipse.ltk.core.refactoring.TextChange&quot;/&gt;
-         &lt;/enablement&gt;
-      &lt;/changePreviewViewer&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must extend &lt;code&gt;org.eclipse.ltk.ui.refactoring.IChangePreviewViewer&lt;/code&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2001, 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.ltk.ui.refactoring/schema/statusContextViewers.exsd b/org.eclipse.ltk.ui.refactoring/schema/statusContextViewers.exsd
deleted file mode 100644
index cb78825..0000000
--- a/org.eclipse.ltk.ui.refactoring/schema/statusContextViewers.exsd
+++ /dev/null

@@ -1,135 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ltk.ui.refactoring">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ltk.ui.refactoring" id="statusContextViewers" name="Refactoring Status Context Viewers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define a special viewer capable to present the context of a refactoring status entry to the user. The reader of the extension point provides the following predefined variables which can be accessed during expression evaluation using the &amp;lt;with variable=&quot;...&quot;/&amp;gt; tag:
-&lt;p&gt;
-&lt;dl&gt;
-  &lt;dt&gt;context&lt;/dt&gt;
-  &lt;dd&gt;the context object managed by the refactoring status entry that is to be presented
-      in the user interface.&lt;/dd&gt;
-&lt;/dl&gt;
-&lt;/p&gt;
-Variables can be accessed using the &amp;lt;with variable=&quot;...&quot;/&amp;gt; expression. The default variable used during expression evaluation is bound to the context variable.
-      </documentation>
-   </annotation>
-
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="statusContextViewer" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="statusContextViewer">
-      <complexType>
-         <all>
-            <element ref="enablement"/>
-         </all>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  unique identifier for the status context viewer.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that provides the implementation.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ltk.ui.refactoring.IStatusContextViewer"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The example below contributes a status context viewer for FileStatusContext objects.
-
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.ltk.ui.refactoring.statusContextViewers&quot;&gt;
-      &lt;statusContextViewer
-            class=&quot;org.eclipse.ltk.internal.ui.refactoring.FileStatusContextViewer&quot;
-            id=&quot;org.eclipse.ltk.internal.ui.refactoring.fileStatusContextViewer&quot;&gt;
-         &lt;enablement&gt;
-            &lt;instanceof value=&quot;org.eclipse.ltk.core.refactoring.FileStatusContext&quot;/&gt;
-         &lt;/enablement&gt;
-      &lt;/statusContextViewer&gt;
-   &lt;/extension&gt;
- &lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must extend &lt;code&gt;org.eclipse.ltk.ui.refactoring.IStatusContextViewer&lt;/code&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2001, 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/cpl-v10.html&quot;&gt;http://www.eclipse.org/legal/cpl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/org.eclipse.ltk.ui.refactoring/scripts/exportplugin.xml b/org.eclipse.ltk.ui.refactoring/scripts/exportplugin.xml
deleted file mode 100644
index 72cf9b2..0000000
--- a/org.eclipse.ltk.ui.refactoring/scripts/exportplugin.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<project name="org.eclipse.jdt.ui" default="export" basedir="..">
-<!-- build script to create a plugin from org.eclipse.core.expressions -->
-
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.ltk.ui.refactoring" />
-		<property name="version"  value="_3.1.0" />
-		<property name="dest"  value="${destdir}/${plugin}${version}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<jar 
-			jarfile="${dest}/refui.jar"
-			basedir="bin"
-		/>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-        <copy todir="${dest}/icons">
-            <fileset dir="icons" /> 
-        </copy>
-		<zip zipfile="${dest}/refuisrc.zip">
-		    <fileset dir="src" />
-  		</zip>		
-	</target>
-</project>

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractDescriptor.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractDescriptor.java
deleted file mode 100644
index 0ef02d7..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AbstractDescriptor.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.core.expressions.EvaluationContext;
-import org.eclipse.core.expressions.EvaluationResult;
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.expressions.ExpressionConverter;
-import org.eclipse.core.expressions.ExpressionTagNames;
-
-public abstract class AbstractDescriptor {
-
-	protected IConfigurationElement fConfigurationElement;
-	protected Expression fExpression;
-	
-	protected static final String ID= "id"; //$NON-NLS-1$
-	protected static final String OBJECT_STATE= "objectState";  //$NON-NLS-1$
-	protected static final String CLASS= "class"; //$NON-NLS-1$
-	
-	protected AbstractDescriptor(IConfigurationElement element) {
-		fConfigurationElement= element;
-	}
-	
-	public String getId() {
-		return fConfigurationElement.getAttribute(ID);
-	}
-	
-	public boolean matches(Object element, String variableName) throws CoreException {
-		Assert.isNotNull(element);
-		Assert.isNotNull(variableName);
-		Expression exp= getExpression();
-		EvaluationContext evaluationContext= new EvaluationContext(null, element);
-		evaluationContext.addVariable(variableName, element);
-		if (exp.evaluate(evaluationContext) == EvaluationResult.FALSE)
-			return false;
-		return true;
-	}
-	
-	public Expression getExpression() throws CoreException {
-		if (fExpression == null)
-			fExpression= createExpression(fConfigurationElement);
-		return fExpression;
-	}
-	
-	public void clear() {
-		fExpression= null;
-	}
-		
-	protected Expression createExpression(IConfigurationElement element) throws CoreException {
-		IConfigurationElement[] children= element.getChildren(ExpressionTagNames.ENABLEMENT);
-		if (children.length == 0)
-			return Expression.FALSE;
-		// TODO we should add some sort of syntax check and throw an core exception in this case
-		Assert.isTrue(children.length == 1);
-		return ExpressionConverter.getDefault().perform(children[0]);
-	} 
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/Assert.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/Assert.java
deleted file mode 100644
index 8e75f5d..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/Assert.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks
- * in code.
- * The predicate methods all test a condition and throw some
- * type of unchecked exception if the condition does not hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are
- * thrown when something is misbehaving. Assertion failures are invariably
- * unspecified behavior; consequently, clients should never rely on
- * these being thrown (and certainly should not being catching them
- * specifically).
- * </p>
- */
-public final class Assert {
-	
-	/* This class is not intended to be instantiated. */
-	private Assert() {
-		// not allowed
-	}
-	/** Asserts that an argument is legal. If the given boolean is
-	 * not <code>true</code>, an <code>IllegalArgumentException</code>
-	 * is thrown.
-	 *
-	 * @param expression the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 * @exception IllegalArgumentException if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression) {
-		return isLegal(expression, ""); //$NON-NLS-1$
-	}
-	/** Asserts that an argument is legal. If the given boolean is
-	 * not <code>true</code>, an <code>IllegalArgumentException</code>
-	 * is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param expression the outcode of the check
-	 * @param message the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 * @exception IllegalArgumentException if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression, String message) {
-		if (!expression)
-			throw new IllegalArgumentException(message);
-		return expression;
-	}
-	/** Asserts that the given object is not <code>null</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * 
-	 * @param object the value to test
-	 * @exception IllegalArgumentException if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object) {
-		isNotNull(object, ""); //$NON-NLS-1$
-	}
-	/** Asserts that the given object is not <code>null</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param object the value to test
-	 * @param message the message to include in the exception
-	 * @exception IllegalArgumentException if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object, String message) {
-		if (object == null)
-			throw new AssertionFailedException("null argument:" + message); //$NON-NLS-1$
-	}
-	/** Asserts that the given boolean is <code>true</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 *
-	 * @param expression the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 */
-	public static boolean isTrue(boolean expression) {
-		return isTrue(expression, ""); //$NON-NLS-1$
-	}
-	/** Asserts that the given boolean is <code>true</code>. If this
-	 * is not the case, some kind of unchecked exception is thrown.
-	 * The given message is included in that exception, to aid debugging.
-	 *
-	 * @param expression the outcode of the check
-	 * @param message the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return
-	 *    if the check fails)
-	 */
-	public static boolean isTrue(boolean expression, String message) {
-		if (!expression)
-			throw new AssertionFailedException("assertion failed: " + message); //$NON-NLS-1$
-		return expression;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AssertionFailedException.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AssertionFailedException.java
deleted file mode 100644
index 922e61e..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/AssertionFailedException.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown
- * by some of the methods in <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch 
- * or otherwise depend on assertion failures are susceptible to unexpected
- * breakage when assertions in the code are added or removed.
- * </p>
- */
-/* package */
-class AssertionFailedException extends RuntimeException {
-	/** This class is not intended to be serialized. */
-	private static final long serialVersionUID= 1L;
-	/** 
-	 * Constructs a new exception.
-	 */
-	public AssertionFailedException() {
-		super();
-	}
-	/** 
-	 * Constructs a new exception with the given message.
-	 * 
-	 * @param detail the detail message
-	 */
-	public AssertionFailedException(String detail) {
-		super(detail);
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElement.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElement.java
deleted file mode 100644
index d1ad727..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElement.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.ui.refactoring.IChangePreviewViewer;
-
-/**
- * Instances of <code>ChangeElement<code> are used to present <code>
- * IChange</code> object as nodes in a tree.
- */
-abstract class ChangeElement {
-	
-	/** Flag indicating that the change element isn't active */
-	public final static int INACTIVE=		0;
-	/** Flag indicating that the change element is partly active (some children are inactive) */
-	public final static int PARTLY_ACTIVE=	1;	
-	/** Flage indicating that the change element is active */
-	public final static int ACTIVE=			2;
-	
-	protected final static int[][] ACTIVATION_TABLE= new int[][] {
-								/*INACTIVE*/	/*PARTLY_ACTIVE */	/*ACTIVE */
-		/* INACTIVE */		{	INACTIVE,		PARTLY_ACTIVE,		PARTLY_ACTIVE },
-		/* PARTLY_ACTIVE*/	{	PARTLY_ACTIVE, 	PARTLY_ACTIVE,		PARTLY_ACTIVE },
-		/* ACTIVE */		{	PARTLY_ACTIVE, 	PARTLY_ACTIVE,		ACTIVE}
-	};
-	
-	protected static final ChangeElement[] EMPTY_CHILDREN= new ChangeElement[0];
-	
-	private ChangeElement fParent;
-
-	/**
-	 * Creates a new <code>ChangeElement</code> with the
-	 * given parent
-	 * 
-	 * @param parent the change element's parent or <code>null
-	 * 	</code> if the change element doesn't have a parent
-	 */
-	public ChangeElement(ChangeElement parent) {
-		fParent= parent;
-	}
-
-	/**
-	 * Returns the change element's parent.
-	 * 
-	 * @return the change element's parent
-	 */
-	public ChangeElement getParent() {
-		return fParent;
-	}
-	
-	/**
-	 * Returns the viewer descriptor used to present a preview of this change element
-	 * 
-	 * @return the viewer suitable to present a preview of this change or
-	 *  <code>null</code> if no previewer is configured.
-	 * 
-	 * @throws CoreException if an error occurred while creating the descriptor
-	 */
-	public abstract ChangePreviewViewerDescriptor getChangePreviewViewerDescriptor() throws CoreException;
-	
-	public abstract void feedInput(IChangePreviewViewer viewer) throws CoreException;
-	
-	/**
-	 * Returns the change directly associated with this change element or <code
-	 * null</code> if the element isn't associated with a change.
-	 * 
-	 * @return the change or <code>null</code>
-	 */
-	public abstract Change getChange();
-	
-	/**
-	 * Sets the activation status for this <code>ChangeElement</code>. When a 
-	 * change element is not active,  then executing it is expected to do nothing.
-	 *
-	 * @param active the activation status for this change element
-	 */
-	public abstract void setActive(boolean active);
-	
-	/**
-	 * Returns the activation status of this <code>ChangeElement</code>.
-	 * Returns one of the following values: <code>IChange.ACTIVE</code>
-	 * if the node and all its children are active, <code>IChange.INACTIVE</code>
-	 * if all children and the node itself is inactive, and <code>IChange.PARTLy_ACTIVE
-	 * </code>otherwise.
-	 *
-	 * @return the change element's activation status.
-	 */
-	public abstract int getActive();
-	
-	/**
-	 * Returns the change element's children.
-	 * 
-	 * @return the change element's children.
-	 */
-	public abstract ChangeElement[] getChildren();	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementContentProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementContentProvider.java
deleted file mode 100644
index 4c14b52..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementContentProvider.java
+++ /dev/null

@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.text.edits.TextEdit;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ISourceReference;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextEditChangeGroup;
-
-/**
- * A default content provider to present a hierarchy of <code>IChange</code>
- * objects in a tree viewer.
- * 
- * TODO should remove dependency to JDT/Core 
- *      (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=61312)
- */
-class ChangeElementContentProvider  implements ITreeContentProvider {
-	
-	private static final ChangeElement[] EMPTY_CHILDREN= new ChangeElement[0];
-	
-	private static class OffsetComparator implements Comparator {
-		public int compare(Object o1, Object o2) {
-			TextEditChangeGroup c1= (TextEditChangeGroup)o1;
-			TextEditChangeGroup c2= (TextEditChangeGroup)o2;
-			int p1= getOffset(c1);
-			int p2= getOffset(c2);
-			if (p1 < p2)
-				return -1;
-			if (p1 > p2)
-				return 1;
-			// same offset
-			return 0;	
-		}
-		private int getOffset(TextEditChangeGroup edit) {
-			return edit.getRegion().getOffset();
-		}
-	}
-	
-	/* non Java-doc
-	 * @see ITreeContentProvider#inputChanged
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// do nothing
-	}
-	
-	/* non Java-doc
-	 * @see ITreeContentProvider#getChildren
-	 */
-	public Object[] getChildren(Object o) {
-		ChangeElement element= (ChangeElement)o;
-		ChangeElement[] children= element.getChildren();
-		if (children == null) {
-			children= createChildren(element);
-		}
-		return children;
-	}
-	
-	/* non Java-doc
-	 * @see ITreeContentProvider#getParent
-	 */
-	public Object getParent(Object element){
-		return ((ChangeElement)element).getParent();
-	}
-	
-	/* non Java-doc
-	 * @see ITreeContentProvider#hasChildren
-	 */
-	public boolean hasChildren(Object element){
-		Object[] children= getChildren(element);
-		return children != null && children.length > 0;
-	}
-	
-	/* non Java-doc
-	 * @see ITreeContentProvider#dispose
-	 */
-	public void dispose(){
-	}
-	
-	/* non Java-doc
-	 * @see ITreeContentProvider#getElements
-	 */
-	public Object[] getElements(Object element){
-		return getChildren(element);
-	}
-	
-	private ChangeElement[] createChildren(ChangeElement object) {
-		ChangeElement[] result= EMPTY_CHILDREN;
-		if (!(object instanceof DefaultChangeElement))
-			return result;
-		
-		DefaultChangeElement changeElement= (DefaultChangeElement)object;
-		Change change= changeElement.getChange();
-		if (change instanceof CompositeChange) {
-			List children= new ArrayList();
-			getFlattendedChildren(children, changeElement, (CompositeChange)change);
-			result= (ChangeElement[])children.toArray(new ChangeElement[children.size()]);
-		} else if (change instanceof TextChange) {
-			TextChange textChange= (TextChange)change;
-			ICompilationUnit cunit= (ICompilationUnit)textChange.getAdapter(ICompilationUnit.class);
-			if (cunit != null) {
-				List children= new ArrayList(5);
-				Map map= new HashMap(20);
-				TextEditChangeGroup[] changes=getSortedTextEditChanges(textChange);
-				for (int i= 0; i < changes.length; i++) {
-					TextEditChangeGroup tec= changes[i];
-					try {
-						IJavaElement element= getModifiedJavaElement(tec, cunit);
-						if (element.equals(cunit)) {
-							children.add(new TextEditChangeElement(changeElement, tec));
-						} else {
-							PseudoJavaChangeElement pjce= getChangeElement(map, element, children, changeElement);
-							pjce.addChild(new TextEditChangeElement(pjce, tec));
-						}
-					} catch (JavaModelException e) {
-						children.add(new TextEditChangeElement(changeElement, tec));
-					}
-				}
-				result= (ChangeElement[]) children.toArray(new ChangeElement[children.size()]);
-			} else {
-				TextEditChangeGroup[] changes= getSortedTextEditChanges((TextChange)change);
-				result= new ChangeElement[changes.length];
-				for (int i= 0; i < changes.length; i++) {
-					result[i]= new TextEditChangeElement(changeElement, changes[i]);
-				}
-			}
-		}
-		changeElement.setChildren(result);
-		return result;
-	}
-	
-	private TextEditChangeGroup[] getSortedTextEditChanges(TextChange change) {
-		TextEditChangeGroup[] edits= change.getTextEditChangeGroups();
-		List result= new ArrayList(edits.length);
-		for (int i= 0; i < edits.length; i++) {
-			if (!edits[i].getTextEditGroup().isEmpty())
-				result.add(edits[i]);
-		}
-		Comparator comparator= new OffsetComparator();
-		Collections.sort(result, comparator);
-		return (TextEditChangeGroup[])result.toArray(new TextEditChangeGroup[result.size()]);
-	}
-	
-	private PseudoJavaChangeElement getChangeElement(Map map, IJavaElement element, List children, ChangeElement cunitChange) {
-		PseudoJavaChangeElement result= (PseudoJavaChangeElement)map.get(element);
-		if (result != null)
-			return result;
-		IJavaElement parent= element.getParent();
-		if (parent instanceof ICompilationUnit) {
-			result= new PseudoJavaChangeElement(cunitChange, element);
-			children.add(result);
-			map.put(element, result);
-		} else {
-			PseudoJavaChangeElement parentChange= getChangeElement(map, parent, children, cunitChange);
-			result= new PseudoJavaChangeElement(parentChange, element);
-			parentChange.addChild(result);
-			map.put(element, result);
-		}
-		return result;
-	}
-	
-	private IJavaElement getModifiedJavaElement(TextEditChangeGroup edit, ICompilationUnit cunit) throws JavaModelException {
-		IRegion range= edit.getRegion();
-		if (range.getOffset() == 0 && range.getLength() == 0)
-			return cunit;
-		IJavaElement result= cunit.getElementAt(range.getOffset());
-		if (result == null)
-			return cunit;
-		
-		try {
-			while(true) {
-				ISourceReference ref= (ISourceReference)result;
-				IRegion sRange= new Region(ref.getSourceRange().getOffset(), ref.getSourceRange().getLength());
-				if (result.getElementType() == IJavaElement.COMPILATION_UNIT || result.getParent() == null || coveredBy(edit, sRange))
-					break;
-				result= result.getParent();
-			}
-		} catch(JavaModelException e) {
-			// Do nothing, use old value.
-		} catch(ClassCastException e) {
-			// Do nothing, use old value.
-		}
-		return result;
-	}
-	
-	private void getFlattendedChildren(List result, DefaultChangeElement parent, CompositeChange focus) {
-		Change[] changes= focus.getChildren();
-		for (int i= 0; i < changes.length; i++) {
-			Change change= changes[i];
-			if (change instanceof CompositeChange && ((CompositeChange)change).isSynthetic()) {
-				getFlattendedChildren(result, parent, (CompositeChange)change);
-			} else {
-				result.add(new DefaultChangeElement(parent, change));
-			}
-		}
-	}
-	
-	public boolean coveredBy(TextEditChangeGroup group, IRegion sourceRegion) {
-		int sLength= sourceRegion.getLength();
-		if (sLength == 0)
-			return false;
-		int sOffset= sourceRegion.getOffset();
-		int sEnd= sOffset + sLength - 1;
-		TextEdit[] edits= group.getTextEdits();
-		for (int i= 0; i < edits.length; i++) {
-			TextEdit edit= edits[i];
-			if (edit.isDeleted())
-				return false;
-			int rOffset= edit.getOffset();
-			int rLength= edit.getLength();
-			int rEnd= rOffset + rLength - 1;
-		    if (rLength == 0) {
-				if (!(sOffset < rOffset && rOffset <= sEnd))
-					return false;
-			} else {
-				if (!(sOffset <= rOffset && rEnd <= sEnd))
-					return false;
-			}
-		}
-		return true;
-	}
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java
deleted file mode 100644
index 0acee50..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementLabelProvider.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-
-class ChangeElementLabelProvider extends LabelProvider {
-
-	private Map fDescriptorImageMap= new HashMap();
-	private boolean fShowQualification= true;
-
-	public ChangeElementLabelProvider() {
-	}
-		
-	public void setShowQualification(boolean showQualification) {
-		fShowQualification= showQualification;
-		LabelProviderChangedEvent event= new LabelProviderChangedEvent(this, null);
-		fireLabelProviderChanged(event);
-	}
-	
-	public Image getImage(Object object) {
-		if (object instanceof DefaultChangeElement) {
-			Object element= ((DefaultChangeElement)object).getChange();
-			return doGetImage(element);
-		} else if (object instanceof TextEditChangeElement) {
-			Object element= ((TextEditChangeElement)object).getTextEditChange();
-			return doGetImage(element);
-		} else if (object instanceof PseudoJavaChangeElement) {
-			PseudoJavaChangeElement element= (PseudoJavaChangeElement)object;
-			IAdaptable jElement= element.getJavaElement();
-			IWorkbenchAdapter adapter= (IWorkbenchAdapter)jElement.getAdapter(IWorkbenchAdapter.class);
-			if (adapter != null) {
-				return manageImageDescriptor(adapter.getImageDescriptor(jElement));
-			}
-		}
-		return super.getImage(object);
-	}
-	
-	public String getText(Object object) {
-		if (object instanceof DefaultChangeElement) {
-			Change change= ((DefaultChangeElement)object).getChange();
-			if (!fShowQualification)
-				return change.getName();
-			
-			if (change instanceof TextFileChange) {
-				IFile file= ((TextFileChange)change).getFile();
-				return RefactoringUIMessages.getFormattedString(
-					"PreviewWizardPage.changeElementLabelProvider.textFormat",  //$NON-NLS-1$
-					new String[] {file.getName(), getPath(file)});
-			} else {
-				return change.getName();
-			}
-		} else if (object instanceof TextEditChangeElement) {
-			TextEditChangeElement element= (TextEditChangeElement)object;
-			String result= element.getTextEditChange().getName();
-			/*
-			if ((fJavaElementFlags & JavaElementLabelProvider.SHOW_POST_QUALIFIED) != 0) {
-				ChangeElement parent= getParent(element);
-				if (parent != null) 
-					result= RefactoringUIMessages.getFormattedString(
-						"PreviewWizardPage.changeElementLabelProvider.textFormatEdit",  //$NON-NLS-1$
-						new String[] {getText(parent), result});
-			}
-			*/
-			return result;
-		} else if (object instanceof PseudoJavaChangeElement) {
-			PseudoJavaChangeElement element= (PseudoJavaChangeElement)object;
-			IAdaptable jElement= element.getJavaElement();
-			IWorkbenchAdapter adapter= (IWorkbenchAdapter)jElement.getAdapter(IWorkbenchAdapter.class);
-			if (adapter != null) {
-				return adapter.getLabel(jElement);
-			}
-		}
-		return super.getText(object);
-	}
-	
-	public void dispose() {
-		for (Iterator iter= fDescriptorImageMap.values().iterator(); iter.hasNext(); ) {
-			Image image= (Image)iter.next();
-			image.dispose();
-		}
-		super.dispose();
-	}
-	
-	private Image doGetImage(Object element) {
-		ImageDescriptor descriptor= null;
-		if (descriptor == null) {
-			if (element instanceof TextEditChangeElement) {
-				descriptor= RefactoringPluginImages.DESC_OBJS_TEXT_EDIT;
-			} else if (element instanceof CompositeChange) {
-				descriptor= RefactoringPluginImages.DESC_OBJS_COMPOSITE_CHANGE;	
-			} /* else if (element instanceof CompilationUnitChange) {
-				descriptor= RefactoringPluginImages.DESC_OBJS_CU_CHANGE;
-			} */ else if (element instanceof TextFileChange) {
-				descriptor= RefactoringPluginImages.DESC_OBJS_FILE_CHANGE;
-			} else {
-				descriptor= RefactoringPluginImages.DESC_OBJS_DEFAULT_CHANGE;
-			}
-		}
-		return manageImageDescriptor(descriptor);
-	}
-	
-	private Image manageImageDescriptor(ImageDescriptor descriptor) {
-		Image image= (Image)fDescriptorImageMap.get(descriptor);
-		if (image == null) {
-			image= descriptor.createImage();
-			fDescriptorImageMap.put(descriptor, image);
-		}
-		return image;
-	}
-
-	private String getPath(IFile file) {
-		StringBuffer result= new StringBuffer(file.getProject().getName());
-		String projectRelativePath= file.getParent().getProjectRelativePath().toString();
-		if (projectRelativePath.length() > 0) {
-			result.append('/');
-			result.append(projectRelativePath);
-		}
-		return result.toString();
-	}	
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java
deleted file mode 100644
index f21cc21..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeElementTreeViewer.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-class ChangeElementTreeViewer extends CheckboxTreeViewer {
-	
-	public ChangeElementTreeViewer(Composite parentComposite) {
-		super(parentComposite, SWT.NONE);
-		addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event){
-				ChangeElement element= (ChangeElement)event.getElement();
-				boolean checked= event.getChecked();
-				
-				element.setActive(checked);
-				setSubtreeChecked(element, checked);
-				setSubtreeGrayed(element, false);
-				ChangeElement parent= element.getParent();
-				while(parent != null) {
-					int active= parent.getActive();
-					boolean grayed= (active == ChangeElement.PARTLY_ACTIVE);
-					setChecked(parent, checked ? true : grayed);
-					setGrayed(parent, grayed);
-					parent= parent.getParent();
-				}
-			}
-		});
-	}
-	
-	protected void inputChanged(Object input, Object oldInput) {
-		super.inputChanged(input, oldInput);
-		// XXX workaround for http://bugs.eclipse.org/bugs/show_bug.cgi?id=9390
-		initializeChildren((ChangeElement)input);
-	}
-	
-	protected void doUpdateItem(Item item, Object element) {
-		super.doUpdateItem(item, element);
-		TreeItem treeItem= (TreeItem)item;
-		ChangeElement ce= (ChangeElement)element;
-		int state= ce.getActive();
-		boolean checked= state == ChangeElement.INACTIVE ? false : true;
-		treeItem.setChecked(checked);
-		boolean grayed= state == ChangeElement.PARTLY_ACTIVE ? true : false;
-		treeItem.setGrayed(grayed);
-	}
-	
-	protected void revealNext() {
-		revealElement(true);
-	}
-	
-	protected void revealPrevious() {
-		revealElement(false);
-	}
-	
-	private void initializeChildren(ChangeElement element) {
-		if (element == null)
-			return;
-		ChangeElement[] children= element.getChildren();
-		if (children == null)
-			return;
-		for (int i= 0; i < children.length; i++) {
-			ChangeElement child= children[i];
-			int state= child.getActive();
-			boolean checked= state == ChangeElement.INACTIVE ? false : true;
-			if (checked)
-				setChecked(child, checked);
-			boolean grayed= state == ChangeElement.PARTLY_ACTIVE ? true : false;
-			if (grayed)
-				setGrayed(child, grayed);
-		}
-	}
-	
-	private void setSubtreeGrayed(Object element, boolean grayed) {
-		Widget widget= findItem(element);
-		if (widget instanceof TreeItem) {
-			TreeItem item= (TreeItem)widget;
-			if (item.getGrayed() != grayed) {
-				item.setGrayed(grayed);
-				grayChildren(getChildren(item), grayed);
-			}
-		}
-	}
-	
-	private void grayChildren(Item[] items, boolean grayed) {
-		for (int i= 0; i < items.length; i++) {
-			Item element= items[i];
-			if (element instanceof TreeItem) {
-				TreeItem item= (TreeItem)element;
-				if (item.getGrayed() != grayed) {
-					item.setGrayed(grayed);
-					grayChildren(getChildren(item), grayed);
-				}
-			}
-		}
-	}
-	
-	private void revealElement(boolean next) {
-		ChangeElement current= (ChangeElement)getInput();
-		IStructuredSelection selection= (IStructuredSelection)getSelection();
-		if (!selection.isEmpty())
-			current= (ChangeElement)selection.iterator().next();
-			
-		ChangeElement candidate= getLeaf(current, next);
-		if (candidate == null) {
-			candidate= getElement(current, next);
-			if (candidate != null) {
-				ChangeElement leaf= getLeaf(candidate, next);
-				if (leaf != null)
-					candidate= leaf;
-			}
-		}
-		if (candidate != null)
-			setSelection(new StructuredSelection(candidate), true);
-		else
-			getControl().getDisplay().beep();
-	}
-	
-	private ChangeElement getLeaf(ChangeElement element, boolean first) {
-		ChangeElement result= null;
-		ChangeElement[] children= element.getChildren();
-		while(children != null && children.length > 0) {
-			result= children[first ? 0 : children.length - 1];
-			children= result.getChildren();
-		}
-		return result;
-	}
-	
-	private ChangeElement getElement(ChangeElement element, boolean next) {
-		while(true) {
-			ChangeElement parent= element.getParent();
-			if (parent == null)
-				return null;
-			ChangeElement candidate= getSibling(parent.getChildren(), element, next);
-			if (candidate != null)
-				return candidate;
-			element= parent;
-		}
-	}
-	
-	private ChangeElement getSibling(ChangeElement[] children, ChangeElement element, boolean next) {
-		for (int i= 0; i < children.length; i++) {
-			if (children[i] == element) {
-				if (next)
-	 				if (i < children.length - 1)
-	 					return children[i + 1];
-	 				else
-	 					return null;
-	 			else 
-					if (i > 0)
-	 					return children[i - 1];
-	 				else
-	 					return null;
-			}
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeExceptionHandler.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeExceptionHandler.java
deleted file mode 100644
index ad3241d..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangeExceptionHandler.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-
-public class ChangeExceptionHandler {
-	
-	private Shell fParent;
-	private String fName;
-	
-	private static class RefactorErrorDialog extends ErrorDialog {
-		public RefactorErrorDialog(Shell parentShell, String dialogTitle, String dialogMessage, IStatus status, int displayMask) {
-			super(parentShell, dialogTitle, dialogMessage, status, displayMask);
-		}
-		protected void createButtonsForButtonBar(Composite parent) {
-			super.createButtonsForButtonBar(parent);
-			Button ok= getButton(IDialogConstants.OK_ID);
-			ok.setText( RefactoringUIMessages.getString("ChangeExceptionHandler.undo")); //$NON-NLS-1$
-			Button abort= createButton(parent, IDialogConstants.CANCEL_ID, RefactoringUIMessages.getString("ChangeExceptionHandler.abort"), true); //$NON-NLS-1$
-			abort.moveBelow(ok);
-			abort.setFocus();
-		}
-		protected Control createMessageArea (Composite parent) {
-			Control result= super.createMessageArea(parent);
-			new Label(parent, SWT.NONE); // filler
-			Label label= new Label(parent, SWT.NONE);
-			label.setText(RefactoringUIMessages.getString("ChangeExceptionHandler.button_explanation")); //$NON-NLS-1$
-			label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			applyDialogFont(result);
-			return result;
-		}
-	}
-	
-	public ChangeExceptionHandler(Shell parent, Refactoring refactoring) {
-		fParent= parent;
-		fName= refactoring.getName();
-	}
-	
-	public void handle(Change change, RuntimeException exception) {
-		RefactoringUIPlugin.log(exception);
-		IStatus status= null;
-		if (exception.getMessage() == null) {
-			status= new Status(IStatus.ERROR, RefactoringUIPlugin.getPluginId(), IStatus.ERROR, 
-				RefactoringUIMessages.getString("ChangeExceptionHandler.no_details"), exception); //$NON-NLS-1$
-		} else {
-			status= new Status(IStatus.ERROR, RefactoringUIPlugin.getPluginId(), IStatus.ERROR, 
-				exception.getMessage(), exception);
-		}
-		handle(change, status);
-	}
-	
-	public void handle(Change change, CoreException exception) {
-		RefactoringUIPlugin.log(exception);
-		handle(change, exception.getStatus());
-	}
-	
-	private void handle(Change change, IStatus status) {
-		if (change instanceof CompositeChange) {
-			Change undo= ((CompositeChange)change).getUndoUntilException();
-			if (undo != null) {
-				RefactoringUIPlugin.log(status);
-				final ErrorDialog dialog= new RefactorErrorDialog(fParent,
-					RefactoringUIMessages.getString("ChangeExceptionHandler.refactoring"), //$NON-NLS-1$
-					RefactoringUIMessages.getFormattedString("ChangeExceptionHandler.unexpected_exception", new String[] {fName}), //$NON-NLS-1$
-					status, IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR); 
-				int result= dialog.open();
-				if (result == IDialogConstants.OK_ID) {
-					performUndo(undo);
-				}
-				return;
-			}
-		}
-		ErrorDialog dialog= new ErrorDialog(fParent,
-			RefactoringUIMessages.getString("ChangeExceptionHandler.refactoring"), //$NON-NLS-1$
-			RefactoringUIMessages.getFormattedString("ChangeExceptionHandler.unexpected_exception", new String[] {fName}), //$NON-NLS-1$
-			status, IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR); 
-		dialog.open();
-	}
-	
-	private void performUndo(final Change undo) {
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				monitor.beginTask("", 11); //$NON-NLS-1$
-				undo.initializeValidationData(new NotCancelableProgressMonitor(new SubProgressMonitor(monitor, 1)));
-				if (undo.isValid(new SubProgressMonitor(monitor,1)).hasFatalError()) {
-					monitor.done();
-					return;
-				}
-				undo.perform(new SubProgressMonitor(monitor, 9));
-			}
-		};
-		WorkbenchRunnableAdapter adapter= new WorkbenchRunnableAdapter(runnable,
-			ResourcesPlugin.getWorkspace().getRoot());
-		ProgressMonitorDialog dialog= new ProgressMonitorDialog(fParent);
-		try {
-			dialog.run(false, false, adapter);
-		} catch (InvocationTargetException e) {
-			ExceptionHandler.handle(e, fParent, 
-				RefactoringUIMessages.getString("ChangeExceptionHandler.rollback.title"),  //$NON-NLS-1$
-				RefactoringUIMessages.getString("ChangeExceptionHandler.rollback.message") + fName); //$NON-NLS-1$
-		} catch (InterruptedException e) {
-			// can't happen
-		}
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangePreviewViewerDescriptor.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangePreviewViewerDescriptor.java
deleted file mode 100644
index 259cad1..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ChangePreviewViewerDescriptor.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.ltk.ui.refactoring.IChangePreviewViewer;
-
-public class ChangePreviewViewerDescriptor extends AbstractDescriptor {
-	
-	private static final String EXT_ID= "changePreviewViewers"; //$NON-NLS-1$
-	
-	private static DescriptorManager fgDescriptions= new DescriptorManager(EXT_ID, "change") { //$NON-NLS-1$
-		protected AbstractDescriptor createDescriptor(IConfigurationElement element) {
-			return new ChangePreviewViewerDescriptor(element);
-		}
-	};
-	
-	public static ChangePreviewViewerDescriptor get(Object element) throws CoreException {
-		return (ChangePreviewViewerDescriptor)fgDescriptions.getDescriptor(element);
-	}
-
-	public ChangePreviewViewerDescriptor(IConfigurationElement element) {
-		super(element);
-	}
-	
-	public IChangePreviewViewer createViewer() throws CoreException {
-		return (IChangePreviewViewer)fConfigurationElement.createExecutableExtension(CLASS);
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DefaultChangeElement.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DefaultChangeElement.java
deleted file mode 100644
index a0a251d..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DefaultChangeElement.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.util.Assert;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.ui.refactoring.ChangePreviewViewerInput;
-import org.eclipse.ltk.ui.refactoring.IChangePreviewViewer;
-
-class DefaultChangeElement extends ChangeElement {
-	
-	private Change fChange;
-	private ChangeElement[] fChildren;
-
-	/**
-	 * Creates a new <code>ChangeElement</code> for the given
-	 * change.
-	 * 
-	 * @param parent the change element's parent or <code>null
-	 * 	</code> if the change element doesn't have a parent
-	 * @param change the actual change. Argument must not be
-	 * 	<code>null</code>
-	 */
-	public DefaultChangeElement(ChangeElement parent, Change change) {
-		super(parent);
-		fChange= change;
-		Assert.isNotNull(fChange);
-	}
-
-	/**
-	 * Returns the underlying <code>IChange</code> object.
-	 * 
-	 * @return the underlying change
-	 */
-	public Change getChange() {
-		return fChange;
-	}
-	
-	public ChangePreviewViewerDescriptor getChangePreviewViewerDescriptor() throws CoreException {
-		return ChangePreviewViewerDescriptor.get(fChange);
-	}
-	
-	public void feedInput(IChangePreviewViewer viewer) throws CoreException {
-		viewer.setInput(new ChangePreviewViewerInput(fChange));
-	}
-	
-	/* non Java-doc
-	 * @see ChangeElement#setActive
-	 */
-	public void setActive(boolean active) {
-		fChange.setEnabled(active);
-	}
-	
-	/* non Java-doc
-	 * @see ChangeElement.getActive
-	 */
-	public int getActive() {
-		if (fChange instanceof CompositeChange || fChange instanceof TextChange)
-			return getCompositeChangeActive();
-		else
-			return getDefaultChangeActive();
-	}
-	
-	/* non Java-doc
-	 * @see ChangeElement.getChildren
-	 */	
-	public ChangeElement[] getChildren() {
-		return fChildren;
-	}
-	
-	/**
-	 * Sets the children.
-	 * 
-	 * @param children the children of this node. Must not be <code>null</code>
-	 */
-	public void setChildren(ChangeElement[] children) {
-		Assert.isNotNull(children);
-		fChildren= children;
-	}
-
-	private int getDefaultChangeActive() {
-		int result= fChange.isEnabled() ? ACTIVE : INACTIVE;
-		if (fChildren != null) {
-			for (int i= 0; i < fChildren.length; i++) {
-				result= ACTIVATION_TABLE[fChildren[i].getActive()][result];
-				if (result == PARTLY_ACTIVE)
-					break;
-			}
-		}
-		return result;
-	}
-	
-	private int getCompositeChangeActive() {		
-		if (fChildren != null && fChildren.length > 0) {
-			int result= fChildren[0].getActive();
-			for (int i= 1; i < fChildren.length; i++) {
-				result= ACTIVATION_TABLE[fChildren[i].getActive()][result];
-				if (result == PARTLY_ACTIVE)
-					break;
-			}
-			return result;
-		} else {
-			return ACTIVE;
-		}
-	}
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java
deleted file mode 100644
index 9a98aa7..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/DescriptorManager.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-
-public abstract class DescriptorManager {
-	
-	private String fExtensionPoint;
-	private String fVariableName;
-	private AbstractDescriptor[] fExtensions;
-
-	public DescriptorManager(String extensionPoint, String variableName) {
-		Assert.isNotNull(extensionPoint);
-		Assert.isNotNull(variableName);
-		fExtensionPoint= extensionPoint;
-		fVariableName= variableName;
-	}
-	
-	public AbstractDescriptor getDescriptor(Object element) throws CoreException {
-		if (fExtensions == null)
-			init();
-			
-		List candidates= new ArrayList(1);
-		for (int i= 0; i < fExtensions.length; i++) {
-			AbstractDescriptor descriptor= fExtensions[i];
-			if (descriptor.matches(element, fVariableName)) {
-				candidates.add(descriptor);
-			}
-			descriptor.clear();
-		}
-		if (candidates.size() == 0)
-			return null;
-		// No support for conflicts yet. 
-		return (AbstractDescriptor)candidates.get(0);
-	}
-	
-	protected abstract AbstractDescriptor createDescriptor(IConfigurationElement element);
-	
-	// ---- extension point reading -----------------------------------
-	
-	private void init() {
-		IExtensionRegistry registry= Platform.getExtensionRegistry();
-		IConfigurationElement[] ces= registry.getConfigurationElementsFor(
-			RefactoringUIPlugin.getPluginId(), 
-			fExtensionPoint);
-		fExtensions= new AbstractDescriptor[ces.length];
-		for (int i= 0; i < ces.length; i++) {
-			fExtensions[i]= createDescriptor(ces[i]);
-		}
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ErrorWizardPage.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ErrorWizardPage.java
deleted file mode 100644
index 56e166a..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ErrorWizardPage.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.IWizardPage;
-
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardPage;
-
-/**
- * Presents the list of failed preconditions to the user
- */
-public class ErrorWizardPage extends RefactoringWizardPage {
-		
-	public static final String PAGE_NAME= "ErrorPage"; //$NON-NLS-1$
-	
-	private RefactoringStatus fStatus;
-	private RefactoringStatusViewer fViewer;
-	
-	public ErrorWizardPage() {
-		super(PAGE_NAME);
-	}
-	
-	/**
-	 * Sets the page's refactoring status to the given value.
-	 * @param status the refactoring status.
-	 */
-	public void setStatus(RefactoringStatus status) {
-		fStatus= status;
-		if (fStatus != null) {
-			setPageComplete(isRefactoringPossible());
-			int severity= fStatus.getSeverity();
-			if (severity >= RefactoringStatus.FATAL) {
-				setDescription(RefactoringUIMessages.getString("ErrorWizardPage.cannot_proceed")); //$NON-NLS-1$
-			} else if (severity >= RefactoringStatus.INFO) {
-				setDescription(RefactoringUIMessages.getString("ErrorWizardPage.confirm")); //$NON-NLS-1$
-			} else {
-				setDescription(""); //$NON-NLS-1$
-			}
-		} else {
-			setPageComplete(true);
-			setDescription(""); //$NON-NLS-1$
-		}	
-	}
-	
-	public RefactoringStatus getStatus() {
-		return fStatus;
-	}
-	
-	//---- UI creation ----------------------------------------------------------------------
-	
-	/* (non-Javadoc)
-	 * Method declared in IWizardPage.
-	 */
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-		setControl(fViewer= new RefactoringStatusViewer(parent, SWT.NONE));
-		Dialog.applyDialogFont(fViewer);
-		WorkbenchHelp.setHelp(getControl(), IRefactoringHelpContextIds.REFACTORING_ERROR_WIZARD_PAGE);			
-	}
-	
-	//---- Reimplementation of WizardPage methods ------------------------------------------
-
-	/* (non-Javadoc)
-	 * Method declared on IDialog.
-	 */
-	public void setVisible(boolean visible) {
-		if (visible) {
-			fViewer.setStatus(fStatus);
-		} else {
-			// the page was not complete if we show a fatal error. In this
-			// case we can finish anyway. To enable the OK and Preview button
-			// on the user input page we have to mark the page as complete again.
-			if (!isPageComplete() && fStatus.hasFatalError())
-				setPageComplete(true);
-		}
-		super.setVisible(visible);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in IWizardPage.
-	 */
-	public boolean canFlipToNextPage() {
-		// We have to call super.getNextPage since computing the next
-		// page is expensive. So we avoid it as long as possible.
-		return fStatus != null && isRefactoringPossible() &&
-			   isPageComplete() && super.getNextPage() != null;
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in IWizardPage.
-	 */
-	public IWizardPage getNextPage() {
-		RefactoringWizard wizard= getRefactoringWizard();
-		Change change= wizard.getChange();
-		if (change == null) {
-			change= wizard.internalCreateChange(InternalAPI.INSTANCE, new CreateChangeOperation(getRefactoring()), false);
-			wizard.internalSetChange(InternalAPI.INSTANCE, change);
-		}
-		if (change == null)
-			return this;
-			
-		return super.getNextPage();
-	}
-	
-	/* (non-JavaDoc)
-	 * Method defined in RefactoringWizardPage
-	 */
-	protected boolean performFinish() {
-		RefactoringWizard wizard= getRefactoringWizard();
-		Change change= wizard.getChange();
-		PerformChangeOperation operation= null;
-		if (change != null) {
-			operation= new UIPerformChangeOperation(getShell().getDisplay(), change, getContainer());
-		} else {
-			CreateChangeOperation ccop= new CreateChangeOperation(getRefactoring());
-			operation= new UIPerformChangeOperation(getShell().getDisplay(), ccop, getContainer());
-		}
-		FinishResult result= wizard.internalPerformFinish(InternalAPI.INSTANCE, operation);
-		if (result.isException())
-			return true;
-		if (result.isInterrupted())
-			return false;
-		RefactoringStatus fValidationStatus= operation.getValidationStatus();
-		if (fValidationStatus != null && fValidationStatus.hasFatalError()) {
-			MessageDialog.openError(wizard.getShell(), wizard.getWindowTitle(), 
-				RefactoringUIMessages.getFormattedString(
-					"RefactoringUI.cannot_execute", //$NON-NLS-1$
-					fValidationStatus.getMessageMatchingSeverity(RefactoringStatus.FATAL)));
-			return true;
-		}
-		return true;
-	} 
-	
-	//---- Helpers ----------------------------------------------------------------------------------------
-	
-	private boolean isRefactoringPossible() {
-		return fStatus.getSeverity() < RefactoringStatus.FATAL;
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ExceptionHandler.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ExceptionHandler.java
deleted file mode 100644
index eb369fc..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/ExceptionHandler.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-import org.eclipse.ltk.ui.refactoring.IRefactoringUIStatusCodes;
-
-/**
- * The default exception handler shows an error dialog when one of its handle methods
- * is called. If the passed exception is a <code>CoreException</code> an error dialog
- * pops up showing the exception's status information. For a <code>InvocationTargetException</code>
- * a normal message dialog pops up showing the exception's message. Additionally the exception
- * is written to the platform log.
- */
-public class ExceptionHandler {
-
-	private static ExceptionHandler fgInstance= new ExceptionHandler();
-	
-	/**
-	 * Logs the given exception using the platform's logging mechanism. The exception is
-	 * logged as an error with the error code <code>JavaStatusConstants.INTERNAL_ERROR</code>.
-	 * 
-	 * @param t the throwable to log
-	 * @param message the detail message
-	 */
-	public static void log(Throwable t, String message) {
-		RefactoringUIPlugin.log(new Status(IStatus.ERROR, RefactoringUIPlugin.getPluginId(), 
-			IRefactoringUIStatusCodes.INTERNAL_ERROR, message, t));
-	}
-	
-	/**
-	 * Handles the given <code>CoreException</code>. 
-	 * 
-	 * @param e the <code>CoreException</code> to be handled
-	 * @param parent the dialog window's parent shell
-	 * @param title the dialog window's window title
-	 * @param message message to be displayed by the dialog window
-	 */
-	public static void handle(CoreException e, Shell parent, String title, String message) {
-		fgInstance.perform(e, parent, title, message);
-	}
-	
-	/**
-	 * Handles the given <code>InvocationTargetException</code>. 
-	 * 
-	 * @param e the <code>InvocationTargetException</code> to be handled
-	 * @param parent the dialog window's parent shell
-	 * @param title the dialog window's window title
-	 * @param message message to be displayed by the dialog window
-	 */
-	public static void handle(InvocationTargetException e, Shell parent, String title, String message) {
-		fgInstance.perform(e, parent, title, message);
-	}
-
-	//---- Hooks for subclasses to control exception handling ------------------------------------
-	
-	protected void perform(CoreException e, Shell shell, String title, String message) {
-		RefactoringUIPlugin.log(e);
-		IStatus status= e.getStatus();
-		if (status != null) {
-			ErrorDialog.openError(shell, title, message, status);
-		} else {
-			displayMessageDialog(e, e.getMessage(), shell, title, message);
-		}
-	}
-
-	protected void perform(InvocationTargetException e, Shell shell, String title, String message) {
-		Throwable target= e.getTargetException();
-		if (target instanceof CoreException) {
-			perform((CoreException)target, shell, title, message);
-		} else {
-			RefactoringUIPlugin.log(e);
-			if (e.getMessage() != null && e.getMessage().length() > 0) {
-				displayMessageDialog(e, e.getMessage(), shell, title, message);
-			} else {
-				displayMessageDialog(e, target.getMessage(), shell, title, message);
-			}
-		}
-	}
-
-	//---- Helper methods -----------------------------------------------------------------------
-	
-	private void displayMessageDialog(Throwable t, String exceptionMessage, Shell shell, String title, String message) {
-		StringWriter msg= new StringWriter();
-		if (message != null) {
-			msg.write(message);
-			msg.write("\n\n"); //$NON-NLS-1$
-		}
-		if (exceptionMessage == null || exceptionMessage.length() == 0)
-			msg.write(RefactoringUIMessages.getString("ExceptionHandler.seeErrorLogMessage")); //$NON-NLS-1$
-		else
-			msg.write(exceptionMessage);
-		MessageDialog.openError(shell, title, msg.toString());			
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FileStatusContextViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FileStatusContextViewer.java
deleted file mode 100644
index a4274c5..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FileStatusContextViewer.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.core.resources.IFile;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-
-import org.eclipse.ltk.core.refactoring.FileStatusContext;
-import org.eclipse.ltk.core.refactoring.RefactoringStatusContext;
-import org.eclipse.ltk.ui.refactoring.TextStatusContextViewer;
-
-
-public class FileStatusContextViewer extends TextStatusContextViewer {
-
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		getSourceViewer().configure(new SourceViewerConfiguration());
-	}
-	
-	public void setInput(RefactoringStatusContext context) {
-		FileStatusContext fc= (FileStatusContext)context;
-		IFile file= fc.getFile();
-		updateTitle(file);
-		IDocument document= getDocument(file);
-		IRegion region= fc.getTextRegion();
-		if (document.getLength() >= region.getOffset() + region.getLength())
-			setInput(document, region);
-		else {
-			setInput(document, new Region(0, 0));
-		}
-	}
-	
-	protected SourceViewer createSourceViewer(Composite parent) {
-	    return new SourceViewer(parent, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
-	}
-	
-	private IDocument getDocument(IFile file) {
-		ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();
-		IPath path= file.getFullPath();
-		try {
-			try {
-				manager.connect(path, new NullProgressMonitor());
-				ITextFileBuffer buffer = manager.getTextFileBuffer(path);
-				if (buffer != null) {
-					return buffer.getDocument();
-				}
-			} finally {
-				manager.disconnect(path, new NullProgressMonitor());
-			}
-		} catch (CoreException e) {
-			RefactoringUIPlugin.log(e);
-		}
-		return new Document(RefactoringUIMessages.getString("FileStatusContextViewer.error_reading_file")); //$NON-NLS-1$
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FinishResult.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FinishResult.java
deleted file mode 100644
index 228ef19..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/FinishResult.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-/**
- * Enumeration representing the finish result
- * 
- * @since 3.0
- */
-public class FinishResult {
-	private int fValue;
-	
-	private FinishResult(int value) {
-		fValue= value;
-	}
-	
-	public static FinishResult createException() {
-		return new FinishResult(0);
-	}
-	
-	public boolean isException() {
-		return fValue == 0;
-	}
-	
-	public static FinishResult createInterrupted() {
-		return new FinishResult(1);
-	}
-	
-	public boolean isInterrupted() {
-		return fValue == 1;
-	}
-	
-	public static FinishResult createOK() {
-		return new FinishResult(2);
-	}
-	
-	public boolean isOK() {
-		return fValue == 2;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IChangeElementChildrenCreator.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IChangeElementChildrenCreator.java
deleted file mode 100644
index 2b68672..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IChangeElementChildrenCreator.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.ltk.core.refactoring.Change;
-
-public interface IChangeElementChildrenCreator {
-
-	public ChangeElement[] create(ChangeElement parent, Change change);
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IPreviewWizardPage.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IPreviewWizardPage.java
deleted file mode 100644
index 4b8f63c..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IPreviewWizardPage.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.jface.wizard.IWizardPage;
-
-import org.eclipse.ltk.core.refactoring.Change;
-
-public interface IPreviewWizardPage extends IWizardPage {
-
-	/** The page's name */
-	public static final String PAGE_NAME= "PreviewPage"; //$NON-NLS-1$
-	
-	/**
-	 * Sets that change for which the page is supposed to display a preview.
-	 * 
-	 * @param change the new change.
-	 */
-	public void setChange(Change change);	
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IRefactoringHelpContextIds.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IRefactoringHelpContextIds.java
deleted file mode 100644
index 26ec848..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/IRefactoringHelpContextIds.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-
-public interface IRefactoringHelpContextIds {
-
-	// copied from JDT_UI so we still forward to this documentation since we are
-	// placed in the same feature.
-	public static final String PREFIX= "org.eclipse.jdt.ui" + '.'; //$NON-NLS-1$
-	
-	public static final String NEXT_PROBLEM_ACTION=			PREFIX + "next_problem_action";			//$NON-NLS-1$	
-	public static final String PREVIOUS_PROBLEM_ACTION=		PREFIX + "previous_problem_action";		//$NON-NLS-1$
-	
-	public static final String NEXT_CHANGE_ACTION=			PREFIX + "next_change_action"; 	 //$NON-NLS-1$	
-	public static final String PREVIOUS_CHANGE_ACTION=		PREFIX + "previous_change_action"; 	 //$NON-NLS-1$
-	
-	public static final String REFACTORING_PREVIEW_WIZARD_PAGE= PREFIX + "refactoring_preview_wizard_page_context"; //$NON-NLS-1$
-	public static final String REFACTORING_ERROR_WIZARD_PAGE=	PREFIX + "refactoring_error_wizard_page_context";  //$NON-NLS-1$	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/InternalAPI.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/InternalAPI.java
deleted file mode 100644
index 124a7bc..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/InternalAPI.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-public class InternalAPI {
-	
-	public static final InternalAPI INSTANCE= new InternalAPI();
-	
-	private InternalAPI() {
-		// no instances outside this class.
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/NotCancelableProgressMonitor.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/NotCancelableProgressMonitor.java
deleted file mode 100644
index 35d096d..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/NotCancelableProgressMonitor.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ProgressMonitorWrapper;
-
-public class NotCancelableProgressMonitor extends ProgressMonitorWrapper {
-	public NotCancelableProgressMonitor(IProgressMonitor monitor) {
-		super(monitor);
-	}
-	public void setCanceled(boolean b) {
-		// ignore set cancel
-	}
-	public boolean isCanceled() {
-		return false;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
deleted file mode 100644
index c17ba34..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
+++ /dev/null

@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.compare.CompareUI;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.PageBook;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.ui.refactoring.util.ViewerPane;
-import org.eclipse.ltk.ui.refactoring.ChangePreviewViewerInput;
-import org.eclipse.ltk.ui.refactoring.IChangePreviewViewer;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardPage;
-
-/**
- * Presents the changes made by the refactoring.
- * Consists of a tree of changes and a compare viewer that shows the differences. 
- */
-public class PreviewWizardPage extends RefactoringWizardPage implements IPreviewWizardPage {
-	
-	private static class NullPreviewer implements IChangePreviewViewer {
-		private Label fLabel;
-		public void createControl(Composite parent) {
-			fLabel= new Label(parent, SWT.CENTER | SWT.FLAT);
-			fLabel.setText(RefactoringUIMessages.getString("PreviewWizardPage.no_preview")); //$NON-NLS-1$
-		}
-		public void refresh() {
-		}
-		public Control getControl() {
-			return fLabel;
-		}
-		public void setInput(ChangePreviewViewerInput input) {
-		}
-	}
-	
-	private class NextChange extends Action {
-		public NextChange() {
-			setImageDescriptor(CompareUI.DESC_ETOOL_NEXT);
-			setDisabledImageDescriptor(CompareUI.DESC_DTOOL_NEXT);
-			setHoverImageDescriptor(CompareUI.DESC_CTOOL_NEXT);
-			setToolTipText(RefactoringUIMessages.getString("PreviewWizardPage.next_Change")); //$NON-NLS-1$
-			WorkbenchHelp.setHelp(this, IRefactoringHelpContextIds.NEXT_CHANGE_ACTION);			
-		}
-		public void run() {
-			fTreeViewer.revealNext();	
-		}
-	}
-	
-	private class PreviousChange extends Action {
-		public PreviousChange() {
-			setImageDescriptor(CompareUI.DESC_ETOOL_PREV);
-			setDisabledImageDescriptor(CompareUI.DESC_DTOOL_PREV);
-			setHoverImageDescriptor(CompareUI.DESC_CTOOL_PREV);
-			setToolTipText(RefactoringUIMessages.getString("PreviewWizardPage.previous_Change")); //$NON-NLS-1$
-			WorkbenchHelp.setHelp(this, IRefactoringHelpContextIds.PREVIOUS_CHANGE_ACTION);			
-		}	
-		public void run() {
-			fTreeViewer.revealPrevious();
-		}
-	}
-	
-	private Change fChange;
-	private CompositeChange fTreeViewerInputChange;
-	private ChangeElement fCurrentSelection;
-	private PageBook fPageContainer;
-	private Control fStandardPage;
-	private Control fNullPage;
-	private ChangeElementTreeViewer fTreeViewer;
-	private PageBook fPreviewContainer;
-	private ChangePreviewViewerDescriptor fCurrentDescriptor;
-	private IChangePreviewViewer fCurrentPreviewViewer;
-	private IChangePreviewViewer fNullPreviewer;
-	
-	/**
-	 * Creates a new proposed changes wizard page.
-	 */
-	public PreviewWizardPage() {
-		super(PAGE_NAME);
-		setDescription(RefactoringUIMessages.getString("PreviewWizardPage.description")); //$NON-NLS-1$
-	}
-
-	/**
-	 * Sets the given change. Setting the change initializes the tree viewer with
-	 * the given change.
-	 * @param change the new change.
-	 */
-	public void setChange(Change change) {
-		if (fChange == change)
-			return;
-		
-		fChange= change;
-		if (fChange instanceof CompositeChange) {
-			fTreeViewerInputChange= (CompositeChange)fChange;
-		} else {
-			fTreeViewerInputChange= new CompositeChange("Dummy Change"); //$NON-NLS-1$
-			fTreeViewerInputChange.add(fChange);
-		}
-		setTreeViewerInput();
-	}
-
-	/**
-	 * Creates the tree viewer to present the hierarchy of changes. Subclasses may override
-	 * to create their own custom tree viewer.
-	 * 
-	 * @param parent the tree viewer's parent
-	 * 
-	 * @return the tree viewer to present the hierarchy of changes
-	 */
-	protected ChangeElementTreeViewer createTreeViewer(Composite parent) {
-		return new ChangeElementTreeViewer(parent);
-	}
-	
-	/**
-	 * Creates the content provider used to fill the tree of changes. Subclasses may override
-	 * to create their own custom tree content provider.
-	 *
-	 * @return the tree content provider used to fill the tree of changes
-	 */
-	protected ITreeContentProvider createTreeContentProvider() {
-		return new ChangeElementContentProvider();
-	}
-	
-	/**
-	 * Creates the label provider used to render the tree of changes. Subclasses may override
-	 * to create their own custom label provider.
-	 *
-	 * @return the label provider used to render the tree of changes
-	 */
-	protected ILabelProvider createTreeLabelProvider() {
-		// return new ChangeElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT | JavaElementLabelProvider.SHOW_SMALL_ICONS);
-		return new ChangeElementLabelProvider();
-	}
-	
-	/* (non-JavaDoc)
-	 * Method defined in RefactoringWizardPage
-	 */
-	protected boolean performFinish() {
-		UIPerformChangeOperation operation= new UIPerformChangeOperation(getShell().getDisplay(), fChange, getContainer());
-		FinishResult result= getRefactoringWizard().internalPerformFinish(InternalAPI.INSTANCE, operation);
-		if (result.isException())
-			return true;
-		if (result.isInterrupted())
-			return false;
-		RefactoringStatus fValidationStatus= operation.getValidationStatus();
-		if (fValidationStatus != null && fValidationStatus.hasFatalError()) {
-			RefactoringWizard wizard= getRefactoringWizard();
-			MessageDialog.openError(wizard.getShell(), wizard.getWindowTitle(), 
-				RefactoringUIMessages.getFormattedString(
-					"RefactoringUI.cannot_execute", //$NON-NLS-1$
-					fValidationStatus.getMessageMatchingSeverity(RefactoringStatus.FATAL)));
-			return true;
-		}
-		return true;
-	} 
-	
-	/* (non-JavaDoc)
-	 * Method defined in IWizardPage
-	 */
-	public boolean canFlipToNextPage() {
-		return false;
-	}
-	
-	/* (Non-JavaDoc)
-	 * Method defined in IWizardPage
-	 */
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-		fPageContainer= new PageBook(parent, SWT.NONE);
-		fStandardPage= createStandardPreviewPage(fPageContainer);
-		fNullPage= createNullPage(fPageContainer);
-		setControl(fPageContainer);
-		WorkbenchHelp.setHelp(getControl(), IRefactoringHelpContextIds.REFACTORING_PREVIEW_WIZARD_PAGE);
-	}
-
-	private Composite createStandardPreviewPage(Composite parent) {
-		// XXX The composite is needed to limit the width of the SashForm. See http://bugs.eclipse.org/bugs/show_bug.cgi?id=6854
-		Composite result= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= 0; layout.marginWidth= 0;
-		result.setLayout(layout);
-		
-		SashForm sashForm= new SashForm(result, SWT.VERTICAL);
-		
-		ViewerPane pane= new ViewerPane(sashForm, SWT.BORDER | SWT.FLAT);
-		pane.setText(RefactoringUIMessages.getString("PreviewWizardPage.changes")); //$NON-NLS-1$
-		ToolBarManager tbm= pane.getToolBarManager();
-		tbm.add(new NextChange());
-		tbm.add(new PreviousChange());
-		tbm.update(true);
-		
-		fTreeViewer= createTreeViewer(pane);
-		fTreeViewer.setContentProvider(createTreeContentProvider());
-		fTreeViewer.setLabelProvider(createTreeLabelProvider());
-		fTreeViewer.addSelectionChangedListener(createSelectionChangedListener());
-		fTreeViewer.addCheckStateListener(createCheckStateListener());
-		pane.setContent(fTreeViewer.getControl());
-		setTreeViewerInput();
-		
-		fPreviewContainer= new PageBook(sashForm, SWT.NONE);
-		fNullPreviewer= new NullPreviewer();
-		fNullPreviewer.createControl(fPreviewContainer);
-		fPreviewContainer.showPage(fNullPreviewer.getControl());
-		fCurrentPreviewViewer= fNullPreviewer;
-		fCurrentDescriptor= null;
-		
-		sashForm.setWeights(new int[]{33, 67});
-		GridData gd= new GridData(GridData.FILL_BOTH);
-		gd.widthHint= convertWidthInCharsToPixels(80);
-		sashForm.setLayoutData(gd);
-		Dialog.applyDialogFont(result);
-		return result;
-	}
-	
-	private Control createNullPage(Composite parent) {
-		Composite result= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		result.setLayout(layout);
-		Label label= new Label(result, SWT.CENTER);
-		label.setText(RefactoringUIMessages.getString("PreviewWizardPage.no_source_code_change")); //$NON-NLS-1$
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Dialog.applyDialogFont(result);
-		return result;
-	}
-	
-	/* (Non-JavaDoc)
-	 * Method defined in IWizardPage
-	 */
-	public void setVisible(boolean visible) {
-		fCurrentSelection= null;
-		if (hasChanges()) {
-			fPageContainer.showPage(fStandardPage);
-			ChangeElement treeViewerInput= (ChangeElement)fTreeViewer.getInput();
-			if (visible && treeViewerInput != null) {
-				IStructuredSelection selection= (IStructuredSelection)fTreeViewer.getSelection();
-				if (selection.isEmpty()) {
-					ITreeContentProvider provider= (ITreeContentProvider)fTreeViewer.getContentProvider();
-					ChangeElement element= getFirstNonCompositeChange(provider, treeViewerInput);
-					if (element != null) {
-						if (getRefactoringWizard().internalGetExpandFirstNode(InternalAPI.INSTANCE)) {
-							Object[] subElements= provider.getElements(element);
-							if (subElements != null && subElements.length > 0) {
-								fTreeViewer.expandToLevel(element, 999);
-							}
-						}
-						fTreeViewer.setSelection(new StructuredSelection(element));
-					}
-				}
-			}
-			super.setVisible(visible);
-			fTreeViewer.getControl().setFocus();
-		} else {
-			fPageContainer.showPage(fNullPage);
-			super.setVisible(visible);
-		}
-		getRefactoringWizard().internalSetPreviewShown(InternalAPI.INSTANCE, visible);
-	}
-	
-	private ChangeElement getFirstNonCompositeChange(ITreeContentProvider provider, ChangeElement input) {
-		ChangeElement focus= input;
-		Change change= input.getChange();
-		while (change != null && change instanceof CompositeChange) {
-			ChangeElement[] children= (ChangeElement[])provider.getElements(focus);
-			if (children != null && children.length > 0) {
-				focus= children[0];
-				change= focus.getChange();
-			}
-		}
-		return focus;
-	}
-	
-	private void setTreeViewerInput() {
-		if (fTreeViewer == null)
-			return;
-		ChangeElement input= null;
-		if (fTreeViewerInputChange != null) {
-			input= new DefaultChangeElement(null, fTreeViewerInputChange);
-		}
-		fTreeViewer.setInput(input);
-	}
-	
-	private ICheckStateListener createCheckStateListener() {
-		return new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event){
-				ChangeElement element= (ChangeElement)event.getElement();
-				if (isChild(fCurrentSelection, element) || isChild(element, fCurrentSelection)) {
-					showPreview(fCurrentSelection);
-				}
-			}
-			private boolean isChild(ChangeElement element, ChangeElement child) {
-				while (child != null) {
-					if (child == element)
-						return true;
-					child= child.getParent();
-				}
-				return false;
-			}
-		};
-	}
-		
-	private ISelectionChangedListener createSelectionChangedListener() {
-		return new ISelectionChangedListener(){
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel= (IStructuredSelection) event.getSelection();
-				if (sel.size() == 1) {
-					ChangeElement newSelection= (ChangeElement)sel.getFirstElement();
-					if (newSelection != fCurrentSelection) {
-						fCurrentSelection= newSelection;
-						showPreview(newSelection);
-					}
-				} else {
-					showPreview(null);
-				}
-			}
-		};
-	}	
-
-	private void showPreview(ChangeElement element) {
-		try {
-			if (element == null) {
-				showNullPreviewer();
-			} else {
-				ChangePreviewViewerDescriptor descriptor= element.getChangePreviewViewerDescriptor();
-				if (fCurrentDescriptor != descriptor) {
-					IChangePreviewViewer newViewer;
-					if (descriptor != null) {
-						newViewer= descriptor.createViewer();
-						newViewer.createControl(fPreviewContainer);
-					} else {
-						newViewer= fNullPreviewer;
-					}
-					fCurrentDescriptor= descriptor;
-					element.feedInput(newViewer);
-					if (fCurrentPreviewViewer != null && fCurrentPreviewViewer != fNullPreviewer)
-						fCurrentPreviewViewer.getControl().dispose();
-					fCurrentPreviewViewer= newViewer;				
-					fPreviewContainer.showPage(fCurrentPreviewViewer.getControl());
-				} else {
-					element.feedInput(fCurrentPreviewViewer);
-				}
-			}
-		} catch (CoreException e) {
-			showNullPreviewer();
-			ExceptionHandler.handle(e, getShell(),
-						RefactoringUIMessages.getString("PreviewWizardPage.refactoring"), //$NON-NLS-1$
-						RefactoringUIMessages.getString("PreviewWizardPage.Internal_error")); //$NON-NLS-1$
-		}
-	}
-	
-	private void showNullPreviewer() {
-		fCurrentDescriptor= null;
-		fCurrentPreviewViewer= fNullPreviewer;
-		fPreviewContainer.showPage(fCurrentPreviewViewer.getControl());
-	}
-
-	/**
-	 * Returns <code>true</code> if the preview page will show any changes when
-	 * it becomes visibile. Otherwise <code>false</code> is returned.
-	 * 
-	 * @return whether the preview has changes or not
-	 */
-	public boolean hasChanges() {
-		if (fChange == null)
-			return false;
-		if (fChange instanceof CompositeChange)
-			return ((CompositeChange)fChange).getChildren().length > 0;
-		return true;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PseudoJavaChangeElement.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PseudoJavaChangeElement.java
deleted file mode 100644
index 290e9ff..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PseudoJavaChangeElement.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.ISourceReference;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.util.Assert;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextEditChangeGroup;
-import org.eclipse.ltk.ui.refactoring.IChangePreviewViewer;
-
-/**
- * TODO should remove dependency to JDT/Core 
- *      (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=61312)
- */ 
-/* package */ class PseudoJavaChangeElement extends ChangeElement {
-
-	private IJavaElement fJavaElement;
-	private List fChildren;
-
-	public PseudoJavaChangeElement(ChangeElement parent, IJavaElement element) {
-		super(parent);
-		fJavaElement= element;
-		Assert.isNotNull(fJavaElement);
-	}
-	
-	/**
-	 * Returns the Java element.
-	 * 
-	 * @return the Java element managed by this node
-	 */
-	public IJavaElement getJavaElement() {
-		return fJavaElement;
-	}
-
-	public Change getChange() {
-		return null;
-	}
-	
-	public ChangePreviewViewerDescriptor getChangePreviewViewerDescriptor() throws CoreException {
-		DefaultChangeElement element= getDefaultChangeElement();
-		if (element == null)
-			return null;
-		return element.getChangePreviewViewerDescriptor();
-	}
-	
-	public void feedInput(IChangePreviewViewer viewer) throws CoreException {
-		DefaultChangeElement element= getDefaultChangeElement();
-		if (element != null) {
-			Change change= element.getChange();
-			if (change instanceof TextChange) {
-				List edits= collectTextEditChanges();
-				viewer.setInput(TextChangePreviewViewer.createInput(change,
-					(TextEditChangeGroup[])edits.toArray(new TextEditChangeGroup[edits.size()]),
-					getTextRange()));
-			}
-		} else {
-			viewer.setInput(null);
-		}
-	}
-	
-	public void setActive(boolean active) {
-		for (Iterator iter= fChildren.iterator(); iter.hasNext();) {
-			ChangeElement element= (ChangeElement)iter.next();
-			element.setActive(active);
-		}
-	}
-	
-	public int getActive() {
-		Assert.isTrue(fChildren.size() > 0);
-		int result= ((ChangeElement)fChildren.get(0)).getActive();
-		for (int i= 1; i < fChildren.size(); i++) {
-			ChangeElement element= (ChangeElement)fChildren.get(i);
-			result= ACTIVATION_TABLE[element.getActive()][result];
-			if (result == PARTLY_ACTIVE)
-				break;
-		}
-		return result;
-	}
-	
-	/* non Java-doc
-	 * @see ChangeElement.getChildren
-	 */
-	public ChangeElement[] getChildren() {
-		if (fChildren == null)
-			return EMPTY_CHILDREN;
-		return (ChangeElement[]) fChildren.toArray(new ChangeElement[fChildren.size()]);
-	}
-	
-	/**
-	 * Adds the given <code>TextEditChangeElement<code> as a child to this 
-	 * <code>PseudoJavaChangeElement</code>
-	 * 
-	 * @param child the child to be added
-	 */
-	public void addChild(TextEditChangeElement child) {
-		doAddChild(child);
-	}
-	
-	/**
-	 * Adds the given <code>PseudoJavaChangeElement<code> as a child to this 
-	 * <code>PseudoJavaChangeElement</code>
-	 * 
-	 * @param child the child to be added
-	 */
-	public void addChild(PseudoJavaChangeElement child) {
-		doAddChild(child);
-	}
-	
-	private void doAddChild(ChangeElement child) {
-		if (fChildren == null)
-			fChildren= new ArrayList(2);
-		fChildren.add(child);
-	}
-	
-	private DefaultChangeElement getDefaultChangeElement() {
-		ChangeElement element= getParent();
-		while(!(element instanceof DefaultChangeElement) && element != null) {
-			element= element.getParent();
-		}
-		return (DefaultChangeElement)element;
-	}
-	
-	private List collectTextEditChanges() {
-		List result= new ArrayList(10);
-		ChangeElement[] children= getChildren();
-		for (int i= 0; i < children.length; i++) {
-			ChangeElement child= children[i];
-			if (child instanceof TextEditChangeElement) {
-				result.add(((TextEditChangeElement)child).getTextEditChange());
-			} else if (child instanceof PseudoJavaChangeElement) {
-				result.addAll(((PseudoJavaChangeElement)child).collectTextEditChanges());
-			}
-		}
-		return result;
-	}
-	
-	public IRegion getTextRange() throws CoreException {
-		ISourceRange range= ((ISourceReference)fJavaElement).getSourceRange();
-		return new Region(range.getOffset(), range.getLength());
-	}	
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java
deleted file mode 100644
index a432395..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-
-public class RefactoringPluginImages {
-
-	private static final String NAME_PREFIX= "org.eclipse.ltk.ui.refactoring"; //$NON-NLS-1$
-	private static final int    NAME_PREFIX_LENGTH= NAME_PREFIX.length();
-
-	private static URL fgIconBaseURL= null;
-	
-	static {
-		fgIconBaseURL= RefactoringUIPlugin.getDefault().getBundle().getEntry("/icons/full/"); //$NON-NLS-1$
-	}
-	
-	
- 	private static ImageRegistry fgImageRegistry= null;
- 	private static HashMap fgAvoidSWTErrorMap= null;
-
-	private static final String T_WIZBAN= "wizban"; 	//$NON-NLS-1$
-	private static final String T_OBJ= "obj16"; 		//$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_WIZBAN_REFACTOR= create(T_WIZBAN, "refactor_wiz.gif"); 			//$NON-NLS-1$
-
-	
-	public static final String IMG_OBJS_REFACTORING_FATAL= NAME_PREFIX + "fatalerror_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJS_REFACTORING_ERROR= NAME_PREFIX + "error_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJS_REFACTORING_WARNING= NAME_PREFIX + "warning_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJS_REFACTORING_INFO= NAME_PREFIX + "info_obj.gif"; 	//$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_OBJS_REFACTORING_FATAL= createManaged(T_OBJ, IMG_OBJS_REFACTORING_FATAL);
-	public static final ImageDescriptor DESC_OBJS_REFACTORING_ERROR= createManaged(T_OBJ, IMG_OBJS_REFACTORING_ERROR);
-	public static final ImageDescriptor DESC_OBJS_REFACTORING_WARNING= createManaged(T_OBJ, IMG_OBJS_REFACTORING_WARNING);
-	public static final ImageDescriptor DESC_OBJS_REFACTORING_INFO= createManaged(T_OBJ, IMG_OBJS_REFACTORING_INFO);
-	
-	
-	public static final ImageDescriptor DESC_OBJS_DEFAULT_CHANGE= create(T_OBJ, "change.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_OBJS_COMPOSITE_CHANGE= create(T_OBJ, "composite_change.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_OBJS_CU_CHANGE= create(T_OBJ, "cu_change.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_OBJS_FILE_CHANGE= create(T_OBJ, "file_change.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_OBJS_TEXT_EDIT= create(T_OBJ, "text_edit.gif"); //$NON-NLS-1$
-
-	
-	
-	/**
-	 * Returns the image managed under the given key in this registry.
-	 * 
-	 * @param key the image's key
-	 * @return the image managed under the given key
-	 */ 
-	public static Image get(String key) {
-		return getImageRegistry().get(key);
-	}
-	
-	/**
-	 * Sets the three image descriptors for enabled, disabled, and hovered to an action. The actions
-	 * are retrieved from the *tool16 folders.
-	 * 
-	 * @param action the action to set the icons to
-	 * @param iconName the iconName
-	 */
-	public static void setToolImageDescriptors(IAction action, String iconName) {
-		setImageDescriptors(action, "tool16", iconName); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Sets the three image descriptors for enabled, disabled, and hovered to an action. The actions
-	 * are retrieved from the *lcl16 folders.
-	 * 
-	 * @param action the action to set the icons to
-	 * @param iconName the iconName
-	 */
-	public static void setLocalImageDescriptors(IAction action, String iconName) {
-		setImageDescriptors(action, "lcl16", iconName); //$NON-NLS-1$
-	}
-	
-	/*
-	 * Helper method to access the image registry from the JavaPlugin class.
-	 */
-	/* package */ static ImageRegistry getImageRegistry() {
-		if (fgImageRegistry == null) {
-			fgImageRegistry= new ImageRegistry();
-			for (Iterator iter= fgAvoidSWTErrorMap.keySet().iterator(); iter.hasNext();) {
-				String key= (String) iter.next();
-				fgImageRegistry.put(key, (ImageDescriptor) fgAvoidSWTErrorMap.get(key));
-			}
-			fgAvoidSWTErrorMap= null;
-		}
-		return fgImageRegistry;
-	}
-
-	//---- Helper methods to access icons on the file system --------------------------------------
-
-	private static void setImageDescriptors(IAction action, String type, String relPath) {
-		
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("d" + type, relPath)); //$NON-NLS-1$
-			if (id != null)
-				action.setDisabledImageDescriptor(id);
-		} catch (MalformedURLException e) {
-		}
-	
-		ImageDescriptor descriptor= create("e" + type, relPath); //$NON-NLS-1$
-		action.setHoverImageDescriptor(descriptor);
-		action.setImageDescriptor(descriptor); 
-	}
-	
-	private static ImageDescriptor createManaged(String prefix, String name) {
-		try {
-			ImageDescriptor result= ImageDescriptor.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));
-			if (fgAvoidSWTErrorMap == null) {
-				fgAvoidSWTErrorMap= new HashMap();
-			}
-			fgAvoidSWTErrorMap.put(name, result);
-			if (fgImageRegistry != null) {
-				RefactoringUIPlugin.logErrorMessage("Image registry already defined"); //$NON-NLS-1$
-			}
-			return result;
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	
-	private static ImageDescriptor create(String prefix, String name) {
-		try {
-			return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	
-	private static URL makeIconFileURL(String prefix, String name) throws MalformedURLException {
-		if (fgIconBaseURL == null)
-			throw new MalformedURLException();
-			
-		StringBuffer buffer= new StringBuffer(prefix);
-		buffer.append('/');
-		buffer.append(name);
-		return new URL(fgIconBaseURL, buffer.toString());
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPreferencePage.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPreferencePage.java
deleted file mode 100644
index c54355e..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPreferencePage.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ltk.internal.ui.refactoring;
-
-
-public class RefactoringPreferencePage /* extends FieldEditorPreferencePage implements IWorkbenchPreferencePage */ {
-
-	/*
-	private static final String FATAL_SEVERITY= PreferenceConstants.REFACTOR_FATAL_SEVERITY;
-	private static final String ERROR_SEVERITY= PreferenceConstants.REFACTOR_ERROR_SEVERITY;
-	private static final String WARNING_SEVERITY= PreferenceConstants.REFACTOR_WARNING_SEVERITY;
-	private static final String INFO_SEVERITY= PreferenceConstants.REFACTOR_INFO_SEVERITY;
-		
-	public RefactoringPreferencePage() {
-		super(GRID);
-		setDescription(RefactoringMessages.getString("RefactoringPreferencePage.description")); //$NON-NLS-1$
-		setPreferenceStore(JavaPlugin.getDefault().getPreferenceStore());
-	}
-			
-	public void createControl(Composite parent) {
-		// added for 1GEUGE6: ITPJUI:WIN2000 - Help is the same on all preference pages
-		super.createControl(parent);
-		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.REFACTORING_PREFERENCE_PAGE);
-	}		
-
-	public void createFieldEditors() {
-    	addField(createSeverityLevelField(getFieldEditorParent()));
-    	addField(createSaveAllField(getFieldEditorParent()));
-    }
-	
-	private FieldEditor createSeverityLevelField(Composite parent) {
-		RadioGroupFieldEditor editor= new RadioGroupFieldEditor(
-			RefactoringPreferences.PREF_ERROR_PAGE_SEVERITY_THRESHOLD,
-			RefactoringMessages.getString("RefactoringPreferencePage.show_error_page"), //$NON-NLS-1$
-			1,
-			new String[] [] {
-				{ RefactoringMessages.getString("RefactoringPreferencePage.fatal_error"), FATAL_SEVERITY }, //$NON-NLS-1$
-				{ RefactoringMessages.getString("RefactoringPreferencePage.error"), ERROR_SEVERITY }, //$NON-NLS-1$
-				{ RefactoringMessages.getString("RefactoringPreferencePage.warning"), WARNING_SEVERITY }, //$NON-NLS-1$
-				{ RefactoringMessages.getString("RefactoringPreferencePage.info"), INFO_SEVERITY } //$NON-NLS-1$
-			},
-			parent, true
-			);
-		return editor;	
-	}
-	
-	private FieldEditor createSaveAllField(Composite parent) {
-		BooleanFieldEditor editor= new BooleanFieldEditor(
-		RefactoringPreferences.PREF_SAVE_ALL_EDITORS,
-			RefactoringMessages.getString("RefactoringPreferencePage.auto_save"), //$NON-NLS-1$
-			BooleanFieldEditor.DEFAULT,
-			parent);
-		return editor;
-	}
-	
-	public void init(IWorkbench workbench) {
-	}
-	
-	public boolean performOk() {
-		JavaPlugin.getDefault().savePluginPreferences();
-		return super.performOk();
-	}
-	*/
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusContentProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusContentProvider.java
deleted file mode 100644
index 959d4d1..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusContentProvider.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class RefactoringStatusContentProvider implements IStructuredContentProvider {
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		public void dispose() {
-		}
-
-		public Object[] getElements(Object obj) {
-			return ((RefactoringStatus)obj).getEntries();
-		}
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusDialog.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusDialog.java
deleted file mode 100644
index 477820b..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusDialog.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-public class RefactoringStatusDialog extends Dialog {
-	
-	private RefactoringStatus fStatus;
-	private String fWindowTitle;
-	private boolean fBackButton;
-	
-	public RefactoringStatusDialog(RefactoringStatus status, Shell parent, String windowTitle, boolean backButton) {
-		super(parent);
-		fStatus= status;
-		fWindowTitle= windowTitle;
-		fBackButton= backButton;
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-	}
-	
-	public RefactoringStatusDialog(Shell parent, ErrorWizardPage page, boolean backButton) {
-		this(page.getStatus(), parent, parent.getText(), backButton);
-	}
-	
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(fWindowTitle);
-	}
-	protected Control createDialogArea(Composite parent) {
-		Composite result= new Composite(parent, SWT.NONE);
-		initializeDialogUnits(result);
-		GridLayout layout= new GridLayout();
-		result.setLayout(layout);
-		GridData gd= new GridData(GridData.FILL_BOTH);
-		gd.widthHint= 600;
-		gd.heightHint= 400;
-		result.setLayoutData(gd);
-		Color background= parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND);
-		ViewForm messagePane= new ViewForm(result, SWT.BORDER | SWT.FLAT);
-		messagePane.marginWidth= layout.marginWidth;
-		messagePane.marginHeight= layout.marginHeight;
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		// XXX http://bugs.eclipse.org/bugs/show_bug.cgi?id=27572
-		Rectangle rect= messagePane.computeTrim(0, 0, 0, convertHeightInCharsToPixels(2) + messagePane.marginHeight * 2);
-		gd.heightHint= rect.height;
-		messagePane.setLayoutData(gd);
-		messagePane.setBackground(background);
-		Label label= new Label(messagePane, SWT.LEFT | SWT.WRAP);
-		if (fStatus.hasFatalError())
-			label.setText(RefactoringUIMessages.getString("RefactoringStatusDialog.Cannot_proceed")); //$NON-NLS-1$
-		else 
-			label.setText(RefactoringUIMessages.getString("RefactoringStatusDialog.Please_look")); //$NON-NLS-1$
-		label.setBackground(background);
-		messagePane.setContent(label);
-		RefactoringStatusViewer viewer= new RefactoringStatusViewer(result, SWT.NONE);
-		viewer.setLayoutData(new GridData(GridData.FILL_BOTH));
-		viewer.setStatus(fStatus);
-		applyDialogFont(result);
-		return result;
-	}
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.BACK_ID) {
-			setReturnCode(IDialogConstants.BACK_ID);
-			close();
-		} else {
-			super.buttonPressed(buttonId);
-		}
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		if (!fStatus.hasFatalError()) {
-			if (fBackButton)
-				createButton(parent, IDialogConstants.BACK_ID, IDialogConstants.BACK_LABEL, false); //$NON-NLS-1$
-			createButton(parent, IDialogConstants.OK_ID, RefactoringUIMessages.getString("RefactoringStatusDialog.Continue"), true); //$NON-NLS-1$
-			createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-		} else {
-			if (fBackButton)
-				createButton(parent, IDialogConstants.BACK_ID, IDialogConstants.BACK_LABEL, true); //$NON-NLS-1$
-			createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, fBackButton ? false : true);
-		}
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusEntryLabelProvider.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusEntryLabelProvider.java
deleted file mode 100644
index d3a045e..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusEntryLabelProvider.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry;
-import org.eclipse.ltk.internal.ui.refactoring.util.Strings;
-
-public class RefactoringStatusEntryLabelProvider extends LabelProvider{
-		public String getText(Object element){
-			return Strings.removeNewLine(((RefactoringStatusEntry)element).getMessage());
-		}
-		public Image getImage(Object element){
-			RefactoringStatusEntry entry= (RefactoringStatusEntry)element;
-			if (entry.isFatalError())
-				return RefactoringPluginImages.get(RefactoringPluginImages.IMG_OBJS_REFACTORING_FATAL);
-			else if (entry.isError())
-				return RefactoringPluginImages.get(RefactoringPluginImages.IMG_OBJS_REFACTORING_ERROR);
-			else if (entry.isWarning())	
-				return RefactoringPluginImages.get(RefactoringPluginImages.IMG_OBJS_REFACTORING_WARNING);
-			else 
-				return RefactoringPluginImages.get(RefactoringPluginImages.IMG_OBJS_REFACTORING_INFO);
-		}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusViewer.java
deleted file mode 100644
index a80b9c7..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringStatusViewer.java
+++ /dev/null

@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.compare.CompareUI;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.PageBook;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.RefactoringStatusContext;
-import org.eclipse.ltk.core.refactoring.RefactoringStatusEntry;
-import org.eclipse.ltk.internal.ui.refactoring.util.PixelConverter;
-import org.eclipse.ltk.internal.ui.refactoring.util.ViewerPane;
-import org.eclipse.ltk.ui.refactoring.IStatusContextViewer;
-
-public class RefactoringStatusViewer extends SashForm {
-
-	private static class NullContextViewer implements IStatusContextViewer {
-		private Label fLabel;
-		public NullContextViewer() {
-		}
-		public void createControl(Composite parent) {
-			fLabel= new Label(parent, SWT.CENTER | SWT.FLAT);
-			fLabel.setText(RefactoringUIMessages.getString("ErrorWizardPage.no_context_information_available")); //$NON-NLS-1$
-		}
-		public void setInput(RefactoringStatusContext input) {
-			// do nothing
-		}
-		public Control getControl() {
-			return fLabel;
-		}
-	}
-	
-	private class NextProblem extends Action {
-		public NextProblem() {
-			setImageDescriptor(CompareUI.DESC_ETOOL_NEXT);
-			setDisabledImageDescriptor(CompareUI.DESC_DTOOL_NEXT);
-			setHoverImageDescriptor(CompareUI.DESC_CTOOL_NEXT);
-			setToolTipText(RefactoringUIMessages.getString("ErrorWizardPage.next_Change")); //$NON-NLS-1$
-			WorkbenchHelp.setHelp(this, IRefactoringHelpContextIds.NEXT_PROBLEM_ACTION);
-		}
-		public void run() {
-			revealElement(true);
-		}
-		public void update() {
-			boolean enabled= false;
-			if (fStatus != null && fStatus.hasEntries()) {
-				RefactoringStatusEntry[] entries= fStatus.getEntries();
-				int index= fTableViewer.getTable().getSelectionIndex();
-				enabled= index == -1 || index < entries.length - 1;
-			}
-			setEnabled(enabled);
-		}
-	}
-	
-	private class PreviousProblem extends Action {
-		public PreviousProblem() {
-			setImageDescriptor(CompareUI.DESC_ETOOL_PREV);
-			setDisabledImageDescriptor(CompareUI.DESC_DTOOL_PREV);
-			setHoverImageDescriptor(CompareUI.DESC_CTOOL_PREV);
-			setToolTipText(RefactoringUIMessages.getString("ErrorWizardPage.previous_Change")); //$NON-NLS-1$
-			WorkbenchHelp.setHelp(this, IRefactoringHelpContextIds.PREVIOUS_PROBLEM_ACTION);
-		}	
-		public void run() {
-			revealElement(false);
-		}
-		public void update() {
-			boolean enabled= false;
-			if (fStatus != null && fStatus.hasEntries()) {
-				int index= fTableViewer.getTable().getSelectionIndex();
-				enabled= index == -1 || index > 0;
-			}
-			setEnabled(enabled);
-		}
-	}
-	
-	private static class RefactoringStatusSorter extends ViewerSorter {
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int r1= ((RefactoringStatusEntry)e1).getSeverity();
-			int r2= ((RefactoringStatusEntry)e2).getSeverity();
-			if (r1 < r2)
-				return 1;
-			if (r2 < r1)
-				return -1;
-			return 0;
-		}
-
-	}
-	
-	private RefactoringStatus fStatus;
-	private TableViewer fTableViewer;
-	private PageBook fContextViewerContainer;
-	private StatusContextViewerDescriptor fCurrentDescriptor;
-	private IStatusContextViewer fCurrentContextViewer;
-	private NullContextViewer fNullContextViewer;
-	
-	private NextProblem fNextProblem;
-	private PreviousProblem fPreviousProblem;
-	
-	public RefactoringStatusViewer(Composite parent, int style) {
-		super(parent, style | SWT.VERTICAL);
-		createContents();
-	}
-
-	/**
-	 * Sets the refactoring status.
-	 * 
-	 * @param status the refactoring status.
-	 */
-	public void setStatus(RefactoringStatus status){
-		fStatus= status;
-		if (fTableViewer.getInput() != fStatus) {
-			fTableViewer.setInput(fStatus);
-			fTableViewer.getTable().getColumn(0).pack();
-			ISelection selection= fTableViewer.getSelection();
-			if (selection.isEmpty()) {
-				RefactoringStatusEntry entry= getFirstEntry();
-				if (entry != null) {
-					fTableViewer.setSelection(new StructuredSelection(entry));
-					showContextViewer(entry);
-					fTableViewer.getControl().setFocus();
-				}
-			}
-			fNextProblem.update();
-			fPreviousProblem.update();
-		}
-	}
-	
-	/**
-	 * Returns the currently used <tt>RefactoringStatus</tt>.
-	 * @return the <tt>RefactoringStatus</tt>
-	 */
-	public RefactoringStatus getStatus() {
-		return fStatus;
-	}
-	
-	//---- UI creation ----------------------------------------------------------------------
-	
-	public Point computeSize (int wHint, int hHint, boolean changed) {
-		PixelConverter converter= new PixelConverter(this);
-		return new Point(converter.convertWidthInCharsToPixels(90), converter.convertHeightInCharsToPixels(25));
-	}
-	
-	private void createContents() {
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 1; layout.marginWidth= 0; layout.marginHeight= 0;
-		setLayout(layout);
-		
-		ViewerPane contextPane= new ViewerPane(this, SWT.BORDER | SWT.FLAT);
-		contextPane.setText(RefactoringUIMessages.getString("RefactoringStatusViewer.Found_problems")); //$NON-NLS-1$
-		ToolBarManager tbm= contextPane.getToolBarManager();
-		tbm.add(fNextProblem= new NextProblem());
-		tbm.add(fPreviousProblem= new PreviousProblem());
-		tbm.update(true);
-		createTableViewer(contextPane);
-		contextPane.setContent(fTableViewer.getControl());
-		
-		fContextViewerContainer= new PageBook(this, SWT.NONE);
-		fNullContextViewer= new NullContextViewer();
-		fNullContextViewer.createControl(fContextViewerContainer);
-		fContextViewerContainer.showPage(fNullContextViewer.getControl());
-		fCurrentContextViewer= fNullContextViewer;
-		fCurrentContextViewer= fNullContextViewer;
-		fCurrentDescriptor= null;	
-		
-		setWeights(new int[]{35, 65});		
-	}
-	
-	private  void createTableViewer(Composite parent) {
-		fTableViewer= new TableViewer(new Table(parent, SWT.SINGLE | SWT.H_SCROLL));
-		fTableViewer.setLabelProvider(new RefactoringStatusEntryLabelProvider());
-		fTableViewer.setContentProvider(new RefactoringStatusContentProvider());
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				entrySelected(event.getSelection());
-				fNextProblem.update();
-				fPreviousProblem.update();
-			}
-		});
-		fTableViewer.setSorter(new RefactoringStatusSorter());	
-		Table tableControl= fTableViewer.getTable();
-		// must set the dialog font here since we pack the table and this
-		// might otherwise happen with the wrong font resulting in clipped
-		// messages.
-		tableControl.setFont(JFaceResources.getDialogFont());
-		GridData gd= new GridData(GridData.FILL_BOTH);
-		tableControl.setLayoutData(gd);
-		// Add a column so that we can pack it in setVisible.
-		TableColumn tc= new TableColumn(tableControl, SWT.NONE);
-		tc.setResizable(false);
-	}
-
-	//---- Feed status entry into context viewer ---------------------------------------------------------
-
-	private void entrySelected(ISelection s) {
-		if (!(s instanceof IStructuredSelection))
-			return;
-		Object first= ((IStructuredSelection) s).getFirstElement();
-		if (! (first instanceof RefactoringStatusEntry))
-			return;
-		
-		RefactoringStatusEntry entry= (RefactoringStatusEntry)first;
-		showContextViewer(entry);
-	}
-
-	private void showContextViewer(RefactoringStatusEntry entry) {
-		RefactoringStatusContext context= entry.getContext();
-		if (context == null) {
-			showNullContextViewer();
-		} else {
-			try {
-				StatusContextViewerDescriptor descriptor= StatusContextViewerDescriptor.get(context);
-				if (fCurrentDescriptor != descriptor) {
-					IStatusContextViewer newViewer;
-					if (descriptor != null) {
-						newViewer= descriptor.createViewer();
-						newViewer.createControl(fContextViewerContainer);
-					} else {
-						newViewer= fNullContextViewer;
-					}
-					fCurrentDescriptor= descriptor;
-					newViewer.setInput(context);
-					if (fCurrentContextViewer != null && fCurrentContextViewer != fNullContextViewer)
-						fCurrentContextViewer.getControl().dispose();
-					fCurrentContextViewer= newViewer;				
-					fContextViewerContainer.showPage(fCurrentContextViewer.getControl());
-				} else {
-					fCurrentContextViewer.setInput(context);
-				}
-			} catch (CoreException e) {
-				showNullContextViewer();
-				ExceptionHandler.handle(e, getShell(),
-					RefactoringUIMessages.getString("RefactoringStatusViewer.error.title"), //$NON-NLS-1$
-					RefactoringUIMessages.getString("RefactoringStatusViewer.error.message")); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	private void showNullContextViewer() {
-		fCurrentContextViewer= fNullContextViewer;
-		fCurrentDescriptor= null;
-		fContextViewerContainer.showPage(fCurrentContextViewer.getControl());
-	}
-	
-	//---- Helpers ----------------------------------------------------------------------------------------
-	
-	private RefactoringStatusEntry getFirstEntry() {
-		if (fStatus == null || !fStatus.hasEntries())
-			return null;
-		return fStatus.getEntryAt(0);
-	}
-		
-	private void revealElement(boolean next) {
-		RefactoringStatusEntry[] entries= fStatus.getEntries();
-		if (entries.length == 0) {
-			return;
-		}
-		int index= fTableViewer.getTable().getSelectionIndex();
-		int last= entries.length - 1;
-		boolean doIt= true;
-		if (index == -1) {
-			index= 0;
-		} else if (next && index < last) {
-			index++;
-		} else if (!next && index > 0) {
-			index--;
-		} else {
-			doIt= false;
-		}
-		if (doIt)	
-			fTableViewer.setSelection(new StructuredSelection(entries[index]));
-	}
-
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIMessages.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIMessages.java
deleted file mode 100644
index d5b8424..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIMessages.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class RefactoringUIMessages {
-
-	private static final String BUNDLE_NAME= "org.eclipse.ltk.internal.ui.refactoring.RefactoringUIMessages";//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private RefactoringUIMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}
-	}
-	
-	public static String getFormattedString(String key, String arg) {
-		try{
-			return MessageFormat.format(RESOURCE_BUNDLE.getString(key), new String[] { arg });
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}	
-	}
-	
-	public static String getFormattedString(String key, Object arg) {
-		try{
-			return MessageFormat.format(RESOURCE_BUNDLE.getString(key), new Object[] { arg });
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}	
-	}
-	
-	public static String getFormattedString(String key, String[] args) {
-		try{
-			return MessageFormat.format(RESOURCE_BUNDLE.getString(key), args);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}	
-	}
-	
-	public static String getFormattedString(String key, Object[] args) {
-		try{
-			return MessageFormat.format(RESOURCE_BUNDLE.getString(key), args);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}	
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIMessages.properties b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIMessages.properties
deleted file mode 100644
index 9868bdd..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIMessages.properties
+++ /dev/null

@@ -1,85 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-RefactoringUIPlugin.internal_error=Internal Error
-RefactoringUIPlugin.listener_removed=Listener removed due to the following exception
-
-ExceptionHandler.seeErrorLogMessage= See error log for more details.
-
-UndoManagerAction.cannot_be_executed={0} cannot be executed.
-UndoManagerAction.internal_error.title=Error
-UndoManagerAction.internal_error.message=Internal Error in Undo Manager. See log for details.
-UndoManagerAction.validation_failed=The following problems were detected:
-
-UndoRefactoringAction.label=&Undo
-UndoRefactoringAction.extendedLabel=Undo - {0}
-UndoRefactoringAction.name=Undo
-UndoRefactoringAction.error.title=Refactoring - Undo
-UndoRefactoringAction.error.message=The undo operation cannot be performed due to the following problem:\n\n{0}
-
-RedoRefactoringAction.label=&Redo
-RedoRefactoringAction.extendedLabel=Redo - {0}
-RedoRefactoringAction.name=Redo
-RedoRefactoringAction.error.title=Refactoring - Redo
-RedoRefactoringAction.error.message=The redo operation cannot be performed due to the following problem:\n\n{0}
-
-RefactoringWizard.title= Refactoring
-RefactoringWizard.refactoring= Refactoring
-RefactoringWizard.see_log= {0}. See log for details.
-RefactoringWizard.Internal_error= Internal error while creating a change object. Consult log for detailed error description.
-RefactoringWizard.internal_error_1= Internal error during precondition checking. Consult log for detailed error description.
-RefactoringWizard.unexpected_exception= Unexpected exception while creating a change object. See log for a detailed error description.
-RefactoringWizard.unexpected_exception_1= Unexpected exception while performing the refactoring. See log for a detailed error description.
-
-ErrorWizardPage.no_context_information_available= No context information available
-ErrorWizardPage.cannot_proceed= Cannot proceed due to the following problems.
-ErrorWizardPage.confirm= Review the information provided in the list below. Click 'Next' to view the next item or 'Finish'.
-ErrorWizardPage.next_Change=Next Problem
-ErrorWizardPage.previous_Change=Previous Problem
-
-PreviewWizardPage.no_preview= No preview available
-PreviewWizardPage.next_Change= Select Next Change
-PreviewWizardPage.previous_Change= Select Previous Change
-PreviewWizardPage.changes= Changes to be performed
-PreviewWizardPage.refactoring= Refactoring
-PreviewWizardPage.Internal_error=Internal error while creating preview. See log for details.
-PreviewWizardPage.description= The following changes are necessary to perform the refactoring.
-PreviewWizardPage.changeElementLabelProvider.textFormat= {0} - {1}
-PreviewWizardPage.no_source_code_change=The refactoring does not change any source code.
-
-ComparePreviewer.element_name= Compare element name
-ComparePreviewer.original_source= Original Source
-ComparePreviewer.refactored_source= Refactored Source
-
-ChangeExceptionHandler.abort=Abort
-ChangeExceptionHandler.refactoring=Refactoring
-ChangeExceptionHandler.undo=Undo
-ChangeExceptionHandler.unexpected_exception=An exception has been caught while processing the refactoring ''{0}''.
-ChangeExceptionHandler.button_explanation= \n Click \"Undo\" to undo all successfully executed changes.\n Click \"Abort\" to abort the refactoring.
-ChangeExceptionHandler.no_details= Exception does not provide a detail message
-ChangeExceptionHandler.rollback.message=An unexpected exception occurred while rolling back the refactoring 
-ChangeExceptionHandler.rollback.title=Change Rollback
-
-RefactoringStatusDialog.Cannot_proceed=Cannot proceed due to the following problems.
-RefactoringStatusDialog.Please_look=Review the information provided in the list below. Click \'Continue\' to proceed.
-RefactoringStatusDialog.Continue=Con&tinue
-
-RefactoringWizardDialog2.buttons.preview.label=Previe&w >
-
-RefactoringStatusViewer.Found_problems=Found problems
-RefactoringStatusViewer.Problem_context=Problem context
-RefactoringStatusViewer.error.title= Refactoring
-RefactoringStatusViewer.error.message=Internal error while creating a status context view. See log for details.
-
-FileStatusContextViewer.error_reading_file=An error occurred reading the content of the file. Consult the log file for details.
-
-RefactoringUI.open.unexpected_exception=An unexpected exception occurred during condition checking. Consult the log for details.
-RefactoringUI.cannot_execute=The operation cannot be performed due to the following problem:\n\n{0}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIPlugin.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIPlugin.java
deleted file mode 100644
index 345dbad..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringUIPlugin.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jface.resource.ImageRegistry;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-import org.eclipse.ltk.ui.refactoring.IRefactoringUIStatusCodes;
-
-public class RefactoringUIPlugin extends AbstractUIPlugin {
-	
-	private static RefactoringUIPlugin fgDefault;
-	
-	public RefactoringUIPlugin() {
-		fgDefault= this;
-	}
-
-	public static RefactoringUIPlugin getDefault() {
-		return fgDefault;
-	}
-	
-	public static String getPluginId() {
-		return "org.eclipse.ltk.ui.refactoring"; //$NON-NLS-1$
-	}
-	
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-	
-	public static void log(Throwable t) {
-		IStatus status= new Status(
-			IStatus.ERROR, getPluginId(), 
-			IRefactoringUIStatusCodes.INTERNAL_ERROR, 
-			RefactoringUIMessages.getString("RefactoringUIPlugin.internal_error"),  //$NON-NLS-1$
-			t);
-		ResourcesPlugin.getPlugin().getLog().log(status);
-	}
-	
-	public static void logErrorMessage(String message) {
-		log(new Status(IStatus.ERROR, getPluginId(), IRefactoringUIStatusCodes.INTERNAL_ERROR, message, null));
-	}	
-	
-	public static void logRemovedListener(Throwable t) {
-		IStatus status= new Status(
-			IStatus.ERROR, getPluginId(), 
-			IRefactoringUIStatusCodes.INTERNAL_ERROR, 
-			RefactoringUIMessages.getString("RefactoringUIPlugin.listener_removed"),  //$NON-NLS-1$
-			t);
-		ResourcesPlugin.getPlugin().getLog().log(status);
-	}
-	
-	public static IEditorPart[] getInstanciatedEditors() {
-		List result= new ArrayList(0);
-		IWorkbench workbench= getDefault().getWorkbench();
-		IWorkbenchWindow[] windows= workbench.getWorkbenchWindows();
-		for (int windowIndex= 0; windowIndex < windows.length; windowIndex++) {
-			IWorkbenchPage[] pages= windows[windowIndex].getPages();
-			for (int pageIndex= 0; pageIndex < pages.length; pageIndex++) {
-				IEditorReference[] references= pages[pageIndex].getEditorReferences();
-				for (int refIndex= 0; refIndex < references.length; refIndex++) {
-					IEditorPart editor= references[refIndex].getEditor(false);
-					if (editor != null)
-						result.add(editor);
-				}
-			}
-		}
-		return (IEditorPart[])result.toArray(new IEditorPart[result.size()]);
-	}	
-	
-	protected ImageRegistry createImageRegistry() {
-		return RefactoringPluginImages.getImageRegistry();
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog.java
deleted file mode 100644
index 8313dd7..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-
-/**
- * A dialog to host refactoring wizards.
- */
-public class RefactoringWizardDialog extends WizardDialog {
-
-	private static final String DIALOG_SETTINGS= "RefactoringWizard"; //$NON-NLS-1$
-	private static final String WIDTH= "width"; //$NON-NLS-1$
-	private static final String HEIGHT= "height"; //$NON-NLS-1$
-
-	private IDialogSettings fSettings;
-	
-	/*
-	 * note: this field must not be initialized - setter is called in the call to super
-	 * and java initializes fields 'after' the call to super is made. So initializing 
-	 * would override setting.
-	 */
-	private boolean fMakeNextButtonDefault; 
-
-	/**
-	 * Creates a new refactoring wizard dialog with the given wizard.
-	 * 
-	 * @param parent the parent shell
-	 * @param wizard the refactoring wizard
-	 */
-	public RefactoringWizardDialog(Shell parent, RefactoringWizard wizard) {
-		super(parent, wizard);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		IDialogSettings settings= RefactoringUIPlugin.getDefault().getDialogSettings();
-		wizard.setDialogSettings(settings);
-		fSettings= settings.getSection(DIALOG_SETTINGS);
-		if (fSettings == null) {
-			fSettings= new DialogSettings(DIALOG_SETTINGS);
-			settings.addSection(fSettings);
-			fSettings.put(WIDTH, 600);
-			fSettings.put(HEIGHT, 400);
-		}
-		int width= 600;
-		int height= 400;
-		try {
-			width= fSettings.getInt(WIDTH);
-			height= fSettings.getInt(HEIGHT);
-		} catch (NumberFormatException e) {
-		}
-		setMinimumPageSize(width, height);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		getRefactoringWizard().getRefactoring().setValidationContext(newShell);
-	}
-	
-	/*
-	 * @see WizardDialog#finishPressed()
-	 */
-	protected void finishPressed() {
-		IWizardPage page= getCurrentPage();
-		Control control= page.getControl().getParent();
-		Point size = control.getSize();
-		fSettings.put(WIDTH, size.x);
-		fSettings.put(HEIGHT, size.y);
-		super.finishPressed();
-	}	
-
-	/*
-	 * @see IWizardContainer#updateButtons()
-	 */
-	public void updateButtons() {
-		super.updateButtons();
-		if (! fMakeNextButtonDefault)
-			return;
-		if (getShell() == null)
-			return;
-		Button next= getButton(IDialogConstants.NEXT_ID);
-		if (next.isEnabled())
-			getShell().setDefaultButton(next);
-	}
-
-	/* usually called in the IWizard#setContainer(IWizardContainer) method
-	 */
-	public void makeNextButtonDefault() {
-		fMakeNextButtonDefault= true;
-	}
-	
-	public Button getCancelButton() {
-		return getButton(IDialogConstants.CANCEL_ID);
-	}
-	
-	private RefactoringWizard getRefactoringWizard() {
-		return (RefactoringWizard)getWizard();
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog2.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog2.java
deleted file mode 100644
index 184bb0d..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringWizardDialog2.java
+++ /dev/null

@@ -1,604 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.ControlEnableState;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-
-public class RefactoringWizardDialog2 extends Dialog implements IWizardContainer {
-
-	private RefactoringWizard fWizard;
-	private IWizardPage fCurrentPage;
-	private IWizardPage fVisiblePage;
-	
-	private boolean fMakeNextButtonDefault;
-	
-	private PageBook fPageContainer;
-	private PageBook fStatusContainer;
-	private MessageBox fMessageBox;
-	private ProgressMonitorPart fProgressMonitorPart;
-	private int fActiveRunningOperations;
-	private Cursor fWaitCursor;
-	private Cursor fArrowCursor;
-
-	private static final int PREVIEW_ID= IDialogConstants.CLIENT_ID + 1;
-
-	private int fPreviewWidth;
-	private int fPreviewHeight;
-	private IDialogSettings fSettings;
-	private static final String DIALOG_SETTINGS= "RefactoringWizard.preview"; //$NON-NLS-1$
-	private static final String WIDTH= "width"; //$NON-NLS-1$
-	private static final String HEIGHT= "height"; //$NON-NLS-1$
-	
-	private static final Image INFO= RefactoringPluginImages.get(RefactoringPluginImages.IMG_OBJS_REFACTORING_INFO);
-	private static final Image WARNING= RefactoringPluginImages.get(RefactoringPluginImages.IMG_OBJS_REFACTORING_WARNING);
-	private static final Image ERROR= RefactoringPluginImages.get(RefactoringPluginImages.IMG_OBJS_REFACTORING_ERROR);
-	
-	private static class MessageBox extends Composite {
-		private Label fImage;
-		private Label fText;
-		public MessageBox(Composite parent, int style) {
-			super(parent, style);
-			GridLayout layout= new GridLayout();
-			layout.numColumns= 2;
-			setLayout(layout);
-			fImage= new Label(this, SWT.NONE);
-			fImage.setImage(INFO);
-			Point size= fImage.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-			GridData gd= new GridData();
-			gd.verticalAlignment= SWT.TOP;			
-			gd.widthHint= size.x;
-			gd.heightHint= size.y;
-			fImage.setLayoutData(gd);
-			fImage.setImage(null);
-			fText= new Label(this, SWT.WRAP);
-			fText.setText(" \n "); //$NON-NLS-1$
-			size= fText.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-			gd= new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint= size.y;
-			gd.verticalAlignment= SWT.TOP;			
-			fText.setLayoutData(gd);
-		}
-		public void setMessage(IWizardPage page) {
-			String msg= page.getErrorMessage();
-			int type= IMessageProvider.ERROR;
-			if (msg == null || msg.length() == 0) {
-				msg= page.getMessage();
-				type= IMessageProvider.NONE;
-			if (msg != null && page instanceof IMessageProvider) 
-				type = ((IMessageProvider)page).getMessageType();
-			}
-			Image image= null;
-			switch (type) {
-				case IMessageProvider.INFORMATION:
-					image= INFO;
-					break;
-				case IMessageProvider.WARNING:
-					image= WARNING;
-					break;
-				case IMessageProvider.ERROR:
-					image= ERROR;
-					break;
-			}
-			if (msg == null)
-				msg= ""; //$NON-NLS-1$
-			fText.setText(msg);
-			if (image == null && msg.length() > 0)
-				image= INFO;
-			fImage.setImage(image);
-		}
-	}
-	
-	private static class PageBook extends Composite {
-		private StackLayout fLayout;
-		public PageBook(Composite parent, int style) {
-			super(parent, style);
-			fLayout= new StackLayout();
-			setLayout(fLayout);
-			fLayout.marginWidth= 5; fLayout.marginHeight= 5;
-		}
-		public void showPage(Control page) {
-			fLayout.topControl= page;
-			layout();
-		}
-		public Control getTopPage() {
-			return fLayout.topControl;
-		}
-	}
-	
-	public RefactoringWizardDialog2(Shell shell, RefactoringWizard wizard) {
-		super(shell);
-		Assert.isNotNull(wizard);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		wizard.setDialogSettings(RefactoringUIPlugin.getDefault().getDialogSettings());
-		fWizard= wizard; 
-		fWizard.setContainer(this);
-		fWizard.addPages();
-		initSize();
-	}
-	
-	private void initSize() {
-		IDialogSettings settings= RefactoringUIPlugin.getDefault().getDialogSettings();
-		fSettings= settings.getSection(DIALOG_SETTINGS);
-		if (fSettings == null) {
-			fSettings= new DialogSettings(DIALOG_SETTINGS);
-			settings.addSection(fSettings);
-			fSettings.put(WIDTH, 600);
-			fSettings.put(HEIGHT, 400);
-		}
-		fPreviewWidth= 600;
-		fPreviewHeight= 400;
-		try {
-			fPreviewWidth= fSettings.getInt(WIDTH);
-			fPreviewHeight= fSettings.getInt(HEIGHT);
-		} catch (NumberFormatException e) {
-		}
-	}
-	
-	private void saveSize() {
-		if (fCurrentPage instanceof PreviewWizardPage) {
-			Control control= fCurrentPage.getControl().getParent();
-			Point size = control.getSize();
-			fSettings.put(WIDTH, size.x);
-			fSettings.put(HEIGHT, size.y);
-		}
-	}
-	
-	public Button getCancelButton() {
-		return getButton(IDialogConstants.CANCEL_ID);
-	}
-
-	//---- IRefactoringWizardDialog ------------------------------------
-	
-	public void makeNextButtonDefault() {
-		fMakeNextButtonDefault= true;
-	}
-	
-	//---- IWizardContainer --------------------------------------------
-
-	/* (non-Javadoc)
-	 * Method declared on IWizardContainer.
-	 */
-	public void showPage(IWizardPage page) {
-		fCurrentPage= page;
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IWizardContainer.
-	 */
-	public void updateButtons() {
-		boolean previewPage= isPreviewPageActive();
-		boolean ok= fWizard.canFinish();
-		boolean canFlip= fCurrentPage.canFlipToNextPage();
-		Button previewButton= getButton(PREVIEW_ID);
-		Button defaultButton= null;
-		if (previewButton != null && !previewButton.isDisposed()) {
-			previewButton.setEnabled(!previewPage);
-			if (!previewPage)
-				previewButton.setEnabled(canFlip);
-			if (previewButton.isEnabled())
-				defaultButton= previewButton;
-		}
-		Button okButton= getButton(IDialogConstants.OK_ID);
-		if (okButton != null && !okButton.isDisposed()) {
-			okButton.setEnabled(ok);
-			if (ok)
-				defaultButton= okButton;
-		}
-		if (defaultButton != null) {
-			defaultButton.getShell().setDefaultButton(defaultButton);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IWizardContainer.
-	 */
-	public void updateMessage() {
-		if (fStatusContainer == null || fStatusContainer.isDisposed())
-			return;
-		fStatusContainer.showPage(fMessageBox);
-		fMessageBox.setMessage(fCurrentPage);
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IWizardContainer.
-	 */
-	public void updateTitleBar() {
-		// we don't have a title bar.
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IWizardContainer.
-	 */
-	public void updateWindowTitle() {
-		getShell().setText(fWizard.getWindowTitle());
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IWizardContainer.
-	 */
-	public IWizardPage getCurrentPage() {
-		return fCurrentPage;
-	}
-	
-	//---- IRunnableContext --------------------------------------------
-
-	/* (non-Javadoc)
-	 * Method declared on IRunnableContext
-	 */
-	public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
-		if (fProgressMonitorPart == null) {
-			ModalContext.run(runnable, false, new NullProgressMonitor(), getShell().getDisplay());
-		} else {
-			Object state = null;
-			if(fActiveRunningOperations == 0)
-				state = aboutToStart(fork && cancelable);
-		
-			fActiveRunningOperations++;
-			try {
-				ModalContext.run(runnable, fork, fProgressMonitorPart, getShell().getDisplay());
-			} finally {
-				fActiveRunningOperations--;
-				//Stop if this is the last one
-				if(state!= null)
-					stopped(state);
-			}
-		}
-	}
-	
-	private Object aboutToStart(boolean cancelable) {
-		Map savedState = null;
-		Shell shell= getShell();
-		if (shell != null) {
-			// Save focus control
-			Control focusControl = getShell().getDisplay().getFocusControl();
-			if (focusControl != null && focusControl.getShell() != getShell())
-				focusControl = null;
-				
-			Button cancelButton= getButton(IDialogConstants.CANCEL_ID);	
-			// Set the busy cursor to all shells.
-			Display d = getShell().getDisplay();
-			fWaitCursor = new Cursor(d, SWT.CURSOR_WAIT);
-			setDisplayCursor(d, fWaitCursor);
-					
-			// Set the arrow cursor to the cancel component.
-			fArrowCursor= new Cursor(d, SWT.CURSOR_ARROW);
-			cancelButton.setCursor(fArrowCursor);
-	
-			boolean hasProgressMonitor= fProgressMonitorPart != null;
-	
-			// Deactivate shell
-			savedState= saveUIState(hasProgressMonitor && cancelable);
-			if (focusControl != null)
-				savedState.put("focus", focusControl); //$NON-NLS-1$
-			
-			if (hasProgressMonitor) {	
-				fProgressMonitorPart.attachToCancelComponent(cancelButton);
-				fStatusContainer.showPage(fProgressMonitorPart);
-			}
-			// Update the status container since we are blocking the event loop right now.
-			fStatusContainer.update();
-		}
-		return savedState;
-	}
-	
-	private Map saveUIState(boolean keepCancelEnabled) {
-		Map savedState= new HashMap(10);
-		saveEnableStateAndSet(getButton(PREVIEW_ID), savedState, "preview", false); //$NON-NLS-1$
-		saveEnableStateAndSet(getButton(IDialogConstants.OK_ID), savedState, "ok", false); //$NON-NLS-1$
-		saveEnableStateAndSet(getButton(IDialogConstants.CANCEL_ID), savedState, "cancel", keepCancelEnabled); //$NON-NLS-1$
-		savedState.put("page", ControlEnableState.disable(fVisiblePage.getControl())); //$NON-NLS-1$
-		return savedState;
-	}
-	
-	private void saveEnableStateAndSet(Control w, Map h, String key, boolean enabled) {
-		if (w != null) {
-			h.put(key, new Boolean(w.getEnabled()));
-			w.setEnabled(enabled);
-		}
-	}
-	
-	private void setDisplayCursor(Display d, Cursor c) {
-		Shell[] shells= d.getShells();
-		for (int i= 0; i < shells.length; i++)
-			shells[i].setCursor(c);
-	}	
-
-	private void stopped(Object savedState) {
-		Shell shell= getShell();
-		if (shell != null) {
-			Button cancelButton= getButton(IDialogConstants.CANCEL_ID);
-			
-			if (fProgressMonitorPart != null)
-				fProgressMonitorPart.removeFromCancelComponent(cancelButton);
-				
-			fStatusContainer.showPage(fMessageBox);
-			Map state = (Map)savedState;
-			restoreUIState(state);
-	
-			setDisplayCursor(shell.getDisplay(), null);	
-			cancelButton.setCursor(null);
-			fWaitCursor.dispose();
-			fWaitCursor = null;
-			fArrowCursor.dispose();
-			fArrowCursor = null;
-			Control focusControl = (Control)state.get("focus"); //$NON-NLS-1$
-			if (focusControl != null)
-				focusControl.setFocus();
-		}
-	}
-	
-	private void restoreUIState(Map state) {
-		restoreEnableState(getButton(PREVIEW_ID), state, "preview");//$NON-NLS-1$
-		restoreEnableState(getButton(IDialogConstants.OK_ID), state, "ok");//$NON-NLS-1$
-		restoreEnableState(getButton(IDialogConstants.CANCEL_ID), state, "cancel");//$NON-NLS-1$
-		ControlEnableState pageState = (ControlEnableState) state.get("page");//$NON-NLS-1$
-		pageState.restore();
-	}
-	
-	private void restoreEnableState(Control w, Map h, String key) {
-		if (w != null) {
-			Boolean b = (Boolean) h.get(key);
-			if (b != null)
-				w.setEnabled(b.booleanValue());
-		}
-	}
-	
-	//---- Dialog -----------------------------------------------------------
-	
-	public boolean close() {
-		fWizard.dispose();
-		return super.close();
-	}
-
-	protected void cancelPressed() {
-		if (fActiveRunningOperations == 0)	{
-			if (fWizard.performCancel())	
-				super.cancelPressed();
-		}
-	}
-
-	protected void okPressed() {
-		IWizardPage current= fCurrentPage;
-		if (fWizard.performFinish()) {
-			saveSize();
-			super.okPressed();
-			return;
-		}
-		if (fCurrentPage == current)
-			return;
-		Assert.isTrue(ErrorWizardPage.PAGE_NAME.equals(fCurrentPage.getName()));
-		if (showErrorDialog((ErrorWizardPage)fCurrentPage)) {
-			if (fWizard.performFinish()) {
-				super.okPressed();
-				return;
-			}
-		}
-		fCurrentPage= current;
-	}
-	
-	protected void handleShellCloseEvent() {
-		if (fActiveRunningOperations == 0)	{
-			if (fWizard.performCancel())	
-				super.handleShellCloseEvent();
-		}
-	}
-	
-	private boolean isPreviewPageActive() {
-		return IPreviewWizardPage.PAGE_NAME.equals(fCurrentPage.getName());
-	}
-	
-	private void previewPressed() {
-		IWizardPage current= fCurrentPage;
-		fCurrentPage= fCurrentPage.getNextPage();
-		if (current == fCurrentPage)
-			return;
-		String pageName= fCurrentPage.getName();
-		if (ErrorWizardPage.PAGE_NAME.equals(pageName)) {
-			if (showErrorDialog((ErrorWizardPage)fCurrentPage)) {
-				fCurrentPage= fCurrentPage.getNextPage();
-				pageName= fCurrentPage.getName();
-			} else {
-				return;
-			}
-		}
-		if (IPreviewWizardPage.PAGE_NAME.equals(pageName)) {
-			fCurrentPage.createControl(fPageContainer);
-			makeVisible(fCurrentPage);
-			updateButtons();
-			if (((PreviewWizardPage)fCurrentPage).hasChanges())
-				resize();
-			else
-				getButton(IDialogConstants.OK_ID).setEnabled(false);
-		} else {
-			fCurrentPage= current;
-		}
-	}
-	
-	private boolean showErrorDialog(ErrorWizardPage page) {
-		RefactoringStatusDialog dialog= new RefactoringStatusDialog(getShell(), page, 
-			fWizard.internalShowBackButtonOnStatusDialog(InternalAPI.INSTANCE));
-		switch (dialog.open()) {
-			case IDialogConstants.OK_ID:
-				return true;
-			case IDialogConstants.BACK_ID:
-				fCurrentPage= fCurrentPage.getPreviousPage();
-				break;
-			case IDialogConstants.CANCEL_ID:
-				super.cancelPressed();
-		}
-		return false;
-	}
-	
-	private void resize() {
-		Control control= fPageContainer.getTopPage();
-		Point size= control.getSize();
-		int dw= Math.max(0, fPreviewWidth - size.x);
-		int dh= Math.max(0, fPreviewHeight - size.y);
-		int dx = dw / 2;
-		int dy= dh / 2;
-		Shell shell= getShell();
-		Rectangle rect= shell.getBounds();
-		Rectangle display= shell.getDisplay().getClientArea();
-		rect.x= Math.max(0, rect.x - dx);
-		rect.y= Math.max(0, rect.y - dy);
-		rect.width= Math.min(rect.width + dw, display.width);
-		rect.height= Math.min(rect.height + dh, display.height);
-		int xe= rect.x + rect.width;
-		if (xe > display.width) {
-			rect.x-= xe - display.width; 
-		}
-		int ye= rect.y + rect.height;
-		if (ye > display.height) {
-			rect.y-= ye - display.height; 
-		}
-		shell.setBounds(rect);
-	}
-	
-	//---- UI construction ---------------------------------------------------
-	
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(fWizard.getDefaultPageTitle());
-		fWizard.getRefactoring().setValidationContext(newShell);
-	}
-	
-	protected Control createContents(Composite parent) {
-		Composite result= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= 0; layout.marginWidth= 0;
-		layout.verticalSpacing= 0; layout.horizontalSpacing= 0;
-		result.setLayout(layout);
-		result.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		// initialize the dialog units
-		initializeDialogUnits(result);
-	
-		fPageContainer= new PageBook(result, SWT.NONE);
-		GridData gd= new GridData(GridData.FILL_BOTH);
-		fPageContainer.setLayoutData(gd);
-		fCurrentPage= fWizard.getStartingPage();
-		dialogArea= fPageContainer;
-		if (fCurrentPage instanceof PreviewWizardPage) {
-			gd.widthHint= fPreviewWidth;
-			gd.heightHint= fPreviewHeight;
-		}
-		
-		fStatusContainer= new PageBook(result, SWT.NONE);
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint= convertWidthInCharsToPixels(fWizard.getMessageLineWidthInChars());
-		fStatusContainer.setLayoutData(gd);
-		if (fWizard.needsProgressMonitor())
-			createProgressMonitorPart();
-		createMessageBox();
-		fStatusContainer.showPage(fMessageBox);
-		
-		buttonBar= createButtonBar(result);
-		
-		fCurrentPage.createControl(fPageContainer);
-		makeVisible(fCurrentPage);
-				
-		updateMessage();
-		updateButtons();
-		applyDialogFont(result);		
-		return result;
-	}
-	
-	private void createProgressMonitorPart() {
-		// Insert a progress monitor 
-		GridLayout pmlayout= new GridLayout();
-		pmlayout.numColumns= 1;
-		pmlayout.marginHeight= 0;
-		fProgressMonitorPart= new ProgressMonitorPart(fStatusContainer, pmlayout);
-	}
-	
-	private void createMessageBox() {
-		fMessageBox= new MessageBox(fStatusContainer, SWT.NONE);
-	}
-	
-	protected void createButtonsForButtonBar(Composite parent) {
-		if (! (fCurrentPage instanceof PreviewWizardPage) && fWizard.internalHasPreviewPage(InternalAPI.INSTANCE)) {
-			Button preview= createButton(parent, PREVIEW_ID, RefactoringUIMessages.getString("RefactoringWizardDialog2.buttons.preview.label"), false); //$NON-NLS-1$
-			if (fMakeNextButtonDefault) {
-				preview.getShell().setDefaultButton(preview);
-			}
-			preview.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					previewPressed();
-				}
-			});
-		}
-		
-		String OK_LABEL= IDialogConstants.OK_LABEL;
-		String CANCEL_LABEL= IDialogConstants.CANCEL_LABEL;
-		if (fWizard.internalIsYesNoStyle(InternalAPI.INSTANCE)) {
-			OK_LABEL= IDialogConstants.YES_LABEL;
-			CANCEL_LABEL= IDialogConstants.NO_LABEL;
-		}
-		createButton(
-			parent,
-			IDialogConstants.OK_ID,
-			OK_LABEL,
-			true);
-		createButton(
-			parent,
-			IDialogConstants.CANCEL_ID,
-			CANCEL_LABEL,
-			false);
-		Button okButton= getButton(IDialogConstants.OK_ID);
-		okButton.setFocus();
-	}
-	
-	private void makeVisible(IWizardPage page) {
-		if (fVisiblePage == page)
-			return;
-		if (fVisiblePage != null)	
-			fVisiblePage.setVisible(false);
-		fVisiblePage= page;
-		fPageContainer.showPage(page.getControl());
-		fVisiblePage.setVisible(true);
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/StatusContextViewerDescriptor.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/StatusContextViewerDescriptor.java
deleted file mode 100644
index 620e06a..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/StatusContextViewerDescriptor.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.ltk.ui.refactoring.IStatusContextViewer;
-
-public class StatusContextViewerDescriptor extends AbstractDescriptor {
-	
-	private static final String EXT_ID= "statusContextViewers"; //$NON-NLS-1$
-	
-	private static DescriptorManager fgDescriptions= new DescriptorManager(EXT_ID, "context") { //$NON-NLS-1$
-		protected AbstractDescriptor createDescriptor(IConfigurationElement element) {
-			return new StatusContextViewerDescriptor(element);
-		}
-	};
-	
-	public static StatusContextViewerDescriptor get(Object element) throws CoreException {
-		return (StatusContextViewerDescriptor)fgDescriptions.getDescriptor(element);
-	}
-
-	public StatusContextViewerDescriptor(IConfigurationElement element) {
-		super(element);
-	}
-	
-	public IStatusContextViewer createViewer() throws CoreException {
-		return (IStatusContextViewer)fConfigurationElement.createExecutableExtension(CLASS);
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextChangePreviewViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextChangePreviewViewer.java
deleted file mode 100644
index 9a711f7..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextChangePreviewViewer.java
+++ /dev/null

@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.compare.CompareConfiguration;
-import org.eclipse.compare.CompareUI;
-import org.eclipse.compare.CompareViewerSwitchingPane;
-import org.eclipse.compare.IEncodedStreamContentAccessor;
-import org.eclipse.compare.ITypedElement;
-import org.eclipse.compare.structuremergeviewer.DiffNode;
-import org.eclipse.compare.structuremergeviewer.ICompareInput;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.viewers.Viewer;
-
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextEditChangeGroup;
-import org.eclipse.ltk.ui.refactoring.ChangePreviewViewerInput;
-import org.eclipse.ltk.ui.refactoring.IChangePreviewViewer;
-
-public class TextChangePreviewViewer implements IChangePreviewViewer {
-
-	private ComparePreviewer fViewer;
-	
-	private static class TextEditChangeInput extends ChangePreviewViewerInput {
-		TextEditChangeGroup group;
-		int surroundingLines;
-		
-		TextEditChangeGroup[] groups;
-		IRegion range;
-		
-		public TextEditChangeInput(Change change) {
-			super(change);
-		}
-	}
-	
-	private static class ComparePreviewer extends CompareViewerSwitchingPane {
-		private CompareConfiguration fCompareConfiguration;
-		private String fLabel;
-		private ImageDescriptor fDescriptor;
-		private Image fImage;
-		public ComparePreviewer(Composite parent) {
-			super(parent, SWT.BORDER | SWT.FLAT, true);
-			fCompareConfiguration= new CompareConfiguration();
-			fCompareConfiguration.setLeftEditable(false);
-			fCompareConfiguration.setLeftLabel(RefactoringUIMessages.getString("ComparePreviewer.original_source")); //$NON-NLS-1$
-			fCompareConfiguration.setRightEditable(false);
-			fCompareConfiguration.setRightLabel(RefactoringUIMessages.getString("ComparePreviewer.refactored_source")); //$NON-NLS-1$
-			addDisposeListener(new DisposeListener() {
-				public void widgetDisposed(DisposeEvent e) {
-					if (fImage != null && !fImage.isDisposed())
-						fImage.dispose();
-				}
-			});
-		}
-		public void setLabel(String label) {
-			fLabel= label;
-		}
-		public void setImageDescriptor(ImageDescriptor imageDescriptor) {
-			fDescriptor= imageDescriptor;
-		}
-		protected Viewer getViewer(Viewer oldViewer, Object input) {
-			return CompareUI.findContentViewer(oldViewer, (ICompareInput)input, this, fCompareConfiguration);
-		}
-		public void setText(String text) {
-			if (fLabel != null) {
-				super.setText(fLabel);
-			} else {
-				super.setText(text);
-			}
-			Image current= null;
-			if (fDescriptor != null) {
-				current= fImage;
-				fImage= fDescriptor.createImage();
-			} else {
-				current= fImage;
-				fImage= null;
-			}
-			setImage(fImage);
-			if (current != null) {
-				current.dispose();
-			}
-		}
-	}
-	
-	private static class CompareElement implements ITypedElement, IEncodedStreamContentAccessor {
-		// we use an encoding that preserves Unicode across the stream
-		private static final String ENCODING= "UTF-8";	//$NON-NLS-1$ 
-		private String fContent;
-		private String fType;
-		public CompareElement(String content, String type) {
-			fContent= content;
-			fType= type;
-		}
-		public String getName() {
-			return RefactoringUIMessages.getString("ComparePreviewer.element_name"); //$NON-NLS-1$
-		}
-		public Image getImage() {
-			return null;
-		}
-		public String getType() {
-			return fType;
-		}
-		public InputStream getContents() throws CoreException {
-			try {
-				return new ByteArrayInputStream(fContent.getBytes(ENCODING));
-			} catch (UnsupportedEncodingException e) {
-				return new ByteArrayInputStream(fContent.getBytes());
-			}
-		}
-		public String getCharset() {
-			return ENCODING;
-		}
-	}
-	
-	public static ChangePreviewViewerInput createInput(TextChange change) {
-		return new ChangePreviewViewerInput(change);
-	}
-	
-	public static ChangePreviewViewerInput createInput(Change change, TextEditChangeGroup group, int surroundingLines) {
-		TextEditChangeInput result= new TextEditChangeInput(change);
-		result.group= group;
-		result.surroundingLines= surroundingLines;
-		return result;
-	}
-	
-	public static ChangePreviewViewerInput createInput(Change change, TextEditChangeGroup[] groups, IRegion range) {
-		TextEditChangeInput result= new TextEditChangeInput(change);
-		result.groups= groups;
-		result.range= range;
-		return result;
-	}
-
-	public void createControl(Composite parent) {
-		fViewer= new ComparePreviewer(parent);
-	}
-
-	public Control getControl() {
-		return fViewer;
-	}
-
-	public void setInput(ChangePreviewViewerInput input) {
-		try {
-			Change change= input.getChange();
-			if (input instanceof TextEditChangeInput) {
-				TextEditChangeInput edi= (TextEditChangeInput)input;
-				if (edi.group != null && edi.surroundingLines >= 0) {
-					TextEditChangeGroup editChange= edi.group;
-					TextChange textChange= editChange.getTextChange();
-					setInput(textChange, textChange.getCurrentContent(editChange.getRegion(), true, 2, new NullProgressMonitor()),
-						textChange.getPreviewContent(new TextEditChangeGroup[] { editChange }, editChange.getRegion(), true, 2, new NullProgressMonitor()),
-						textChange.getTextType());
-					return;
-				} else if (edi.groups != null && edi.groups.length > 0 && edi.range != null) {
-					TextChange textChange= edi.groups[0].getTextChange();
-					setInput(textChange, textChange.getCurrentContent(edi.range, true, 0, new NullProgressMonitor()),
-						textChange.getPreviewContent(edi.groups, edi.range, true, 0, new NullProgressMonitor()),
-						textChange.getTextType());
-					return;
-				}
-			} else if (change instanceof TextChange) {
-				TextChange textChange= (TextChange)change;
-				setInput(textChange, textChange.getCurrentContent(new NullProgressMonitor()), textChange.getPreviewContent(new NullProgressMonitor()), textChange.getTextType());
-				return;
-			} else {
-				fViewer.setInput(null);
-			}
-		} catch (CoreException e) {
-			RefactoringUIPlugin.log(e);
-			fViewer.setInput(null);
-		}
-	}
-
-	public void refresh() {
-		fViewer.getViewer().refresh();
-	}
-	
-	private void setInput(TextChange change, String left, String right, String type) {
-		Object element= change.getModifiedElement();
-		if (element instanceof IAdaptable) {
-			IWorkbenchAdapter adapter= (IWorkbenchAdapter)((IAdaptable)element).getAdapter(IWorkbenchAdapter.class);
-			if (adapter != null) {
-				fViewer.setLabel(adapter.getLabel(element));
-				fViewer.setImageDescriptor(adapter.getImageDescriptor(element));
-			} else {
-				fViewer.setLabel(null);
-				fViewer.setImageDescriptor(null);
-			}
-		} else {
-			fViewer.setLabel(null);
-			fViewer.setImageDescriptor(null);
-		}
-		fViewer.setInput(new DiffNode( 
-			new CompareElement(left, type), 
-			new CompareElement(right, type)));
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangeElement.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangeElement.java
deleted file mode 100644
index c357c06..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/TextEditChangeElement.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.util.Assert;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextEditChangeGroup;
-import org.eclipse.ltk.ui.refactoring.ChangePreviewViewerInput;
-import org.eclipse.ltk.ui.refactoring.IChangePreviewViewer;
-
-/* package */ class TextEditChangeElement extends ChangeElement {
-	
-	private static final ChangeElement[] fgChildren= new ChangeElement[0];
-	
-	private TextEditChangeGroup fChangeGroup;
-	
-	public TextEditChangeElement(ChangeElement parent, TextEditChangeGroup changeGroup) {
-		super(parent);
-		fChangeGroup= changeGroup;
-		Assert.isNotNull(fChangeGroup);
-	}
-	
-	/**
-	 * Returns the <code>TextEditChange</code> managed by this node.
-	 * 
-	 * @return the <code>TextEditChange</code>
-	 */
-	public TextEditChangeGroup getTextEditChange() {
-		return fChangeGroup;
-	}
-		
-	public Change getChange() {
-		return null;
-	}
-	
-	public ChangePreviewViewerDescriptor getChangePreviewViewerDescriptor() throws CoreException {
-		DefaultChangeElement element= getDefaultChangeElement();
-		if (element == null)
-			return null;
-		return element.getChangePreviewViewerDescriptor();
-	}
-	
-	public void feedInput(IChangePreviewViewer viewer) throws CoreException {
-		DefaultChangeElement element= getDefaultChangeElement();
-		if (element != null) {
-			Change change= element.getChange();
-			if (change instanceof TextChange) {
-				IRegion range= getTextRange(this);
-				ChangePreviewViewerInput input= null;
-				if (range != null) {
-					input= TextChangePreviewViewer.createInput(change, new TextEditChangeGroup[] {fChangeGroup}, range);
-				} else {
-					input= TextChangePreviewViewer.createInput(change, fChangeGroup, 2);
-				}
-				viewer.setInput(input);
-			}
-		} else {
-			viewer.setInput(null);
-		}
-	}
-	
-	/* non Java-doc
-	 * @see ChangeElement#setActive
-	 */
-	public void setActive(boolean active) {
-		fChangeGroup.setEnabled(active);
-	}
-	
-	/* non Java-doc
-	 * @see ChangeElement.getActive
-	 */
-	public int getActive() {
-		return fChangeGroup.isEnabled() ? ACTIVE : INACTIVE;
-	}
-	
-	/* non Java-doc
-	 * @see ChangeElement.getChildren
-	 */
-	public ChangeElement[] getChildren() {
-		return fgChildren;
-	}
-	
-	private DefaultChangeElement getDefaultChangeElement() {
-		ChangeElement element= getParent();
-		while(!(element instanceof DefaultChangeElement) && element != null) {
-			element= element.getParent();
-		}
-		return (DefaultChangeElement)element;
-	}
-	
-	private static IRegion getTextRange(ChangeElement element) throws CoreException {
-		if (element == null)
-			return null;
-		if (element instanceof PseudoJavaChangeElement) {
-			return ((PseudoJavaChangeElement)element).getTextRange();
-		} else if (element instanceof DefaultChangeElement) {
-			return null;
-		}
-		return getTextRange(element.getParent());
-	}
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/UIPerformChangeOperation.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/UIPerformChangeOperation.java
deleted file mode 100644
index 190c080..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/UIPerformChangeOperation.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.text.IRewriteTarget;
-import org.eclipse.jface.wizard.IWizardContainer;
-
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-
-public class UIPerformChangeOperation extends PerformChangeOperation {
-
-	private Display fDisplay;
-	private IWizardContainer fWizardContainer;
-	
-	public UIPerformChangeOperation(Display display, Change change, IWizardContainer container) {
-		super(change);
-		fDisplay= display;
-		fWizardContainer= container;
-	}
-
-	public UIPerformChangeOperation(Display display, CreateChangeOperation op, IWizardContainer container) {
-		super(op);
-		fDisplay= display;
-		fWizardContainer= container;
-	}
-	
-	protected void executeChange(final IProgressMonitor pm) throws CoreException {
-		if (fDisplay != null && !fDisplay.isDisposed()) {
-			final CoreException[] exception= new CoreException[1]; 
-			Runnable r= new Runnable() {
-				public void run() {
-					IRewriteTarget[] targets= null;
-					try {
-						final Button cancel= getCancelButton();
-						targets= getRewriteTargets();
-						beginCompoundChange(targets);
-						boolean enabled= true;
-						if (cancel != null && !cancel.isDisposed()) {
-							enabled= cancel.isEnabled();
-							cancel.setEnabled(false);
-						}
-						try {
-							UIPerformChangeOperation.super.executeChange(pm);
-						} finally {
-							if (cancel != null && !cancel.isDisposed()) {
-								cancel.setEnabled(enabled);
-							}
-						}
-					} catch (CoreException e) {
-						exception[0]= e;
-					} finally {
-						if (targets != null)
-							endCompoundChange(targets);
-					}
-				}
-			};
-			fDisplay.syncExec(r);
-			if (exception[0] != null)
-				throw new CoreException(exception[0].getStatus());
-		} else {
-			IRewriteTarget[] targets= null;
-			try {
-				targets= getRewriteTargets();
-				beginCompoundChange(targets);
-				super.executeChange(pm);
-			} finally {
-				if (targets != null)
-					endCompoundChange(targets);
-			}
-		}
-	}
-
-	private static void beginCompoundChange(IRewriteTarget[] targets) {
-		for (int i= 0; i < targets.length; i++) {
-			targets[i].beginCompoundChange();
-		}
-	}
-	
-	private static void endCompoundChange(IRewriteTarget[] targets) {
-		for (int i= 0; i < targets.length; i++) {
-			targets[i].endCompoundChange();
-		}
-	}
-	
-	private static IRewriteTarget[] getRewriteTargets() {
-		IEditorPart[] editors= RefactoringUIPlugin.getInstanciatedEditors();
-		List result= new ArrayList(editors.length);
-		for (int i= 0; i < editors.length; i++) {
-			IRewriteTarget target= (IRewriteTarget)editors[i].getAdapter(IRewriteTarget.class);
-			if (target != null) {
-				result.add(target);
-			}
-		}
-		return (IRewriteTarget[]) result.toArray(new IRewriteTarget[result.size()]);
-	}
-	
-	private Button getCancelButton() {
-		if (fWizardContainer instanceof RefactoringWizardDialog2) {
-			return ((RefactoringWizardDialog2)fWizardContainer).getCancelButton();
-		} else if (fWizardContainer instanceof RefactoringWizardDialog) {
-			return ((RefactoringWizardDialog)fWizardContainer).getCancelButton();
-		}
-		return null;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/UndoManagerAction.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/UndoManagerAction.java
deleted file mode 100644
index ae44666..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/UndoManagerAction.java
+++ /dev/null

@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.OperationCanceledException;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.ltk.core.refactoring.IValidationCheckResultQuery;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.UndoManagerAdapter;
-import org.eclipse.ltk.ui.refactoring.RefactoringUI;
-
-public abstract class UndoManagerAction implements IWorkbenchWindowActionDelegate {
-
-	private static final int MAX_LENGTH= 30;
-
-	private IAction fAction;
-	private IWorkbenchWindow fWorkbenchWindow;
-	private UndoManagerAdapter fUndoManagerListener;
-	
-	protected static abstract class Query implements IValidationCheckResultQuery  {
-		private Shell fParent;
-		private String fTitle;
-		public Query(Shell parent, String title) {
-			fParent= parent;
-			fTitle= title;
-		}
-		public boolean proceed(RefactoringStatus status) {
-			final Dialog dialog= RefactoringUI.createRefactoringStatusDialog(status, fParent, fTitle, false);
-			final int[] result= new int[1];
-			Runnable r= new Runnable() {
-				public void run() {
-					result[0]= dialog.open();
-				}
-			};
-			fParent.getDisplay().syncExec(r);
-			return result[0] == IDialogConstants.OK_ID;
-		}
-		public void stopped(final RefactoringStatus status) {
-			Runnable r= new Runnable() {
-				public void run() {
-					String message= status.getMessageMatchingSeverity(RefactoringStatus.FATAL);
-					MessageDialog.openWarning(fParent, fTitle, getFullMessage(message));
-				}
-			};
-			fParent.getDisplay().syncExec(r);
-		}
-		protected abstract String getFullMessage(String errorMessage);
-	}
-
-	public UndoManagerAction() {
-	}
-	
-	protected abstract IRunnableWithProgress createOperation(Shell parent);
-	
-	protected abstract UndoManagerAdapter createUndoManagerListener();
-	
-	protected abstract String getName();
-	
-	protected IWorkbenchWindow getWorkbenchWindow() {
-		return fWorkbenchWindow;
-	}
-	
-	protected IAction getAction() {
-		return fAction;
-	}
-	
-	protected boolean isHooked() {
-		return fAction != null;
-	}
-	
-	protected void hookListener(IAction action) {
-		if (isHooked())
-			return;
-		fAction= action;
-		fUndoManagerListener= createUndoManagerListener();
-		RefactoringCore.getUndoManager().addListener(fUndoManagerListener);
-	}
-	
-	protected String shortenText(String text, int patternLength) {
-		int length= text.length();
-		final int finalLength = MAX_LENGTH + patternLength;
-		if (text.length() <= finalLength)
-			return text;
-		StringBuffer result= new StringBuffer();
-		int mid= finalLength / 2;
-		result.append(text.substring(0, mid));
-		result.append("..."); //$NON-NLS-1$
-		result.append(text.substring(length - mid));
-		return result.toString();
-	}
-			
-	/* (non-Javadoc)
-	 * Method declared in IActionDelegate
-	 */
-	public void dispose() {
-		if (fUndoManagerListener != null)
-			RefactoringCore.getUndoManager().removeListener(fUndoManagerListener);
-		fWorkbenchWindow= null;
-		fAction= null;
-		fUndoManagerListener= null;
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in IActionDelegate
-	 */
-	public void init(IWorkbenchWindow window) {
-		fWorkbenchWindow= window;
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in IActionDelegate
-	 */
-	public void run(IAction action) {
-		Shell parent= fWorkbenchWindow.getShell();
-		IRunnableWithProgress op= createOperation(parent);
-		try {
-			PlatformUI.getWorkbench().getProgressService().runInUI(
-				new ProgressMonitorDialog(fWorkbenchWindow.getShell()),
-				op, ResourcesPlugin.getWorkspace().getRoot());
-		} catch (InvocationTargetException e) {
-			RefactoringCore.getUndoManager().flush();
-			ExceptionHandler.handle(e,
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-				RefactoringUIMessages.getString("UndoManagerAction.internal_error.title"),  //$NON-NLS-1$
-				RefactoringUIMessages.getString("UndoManagerAction.internal_error.message")); //$NON-NLS-1$
-		} catch (InterruptedException e) {
-			// Opertation isn't cancelable.
-		} catch (OperationCanceledException e) {
-			// the waiting dialog got canceled.
-		}
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/WorkbenchRunnableAdapter.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/WorkbenchRunnableAdapter.java
deleted file mode 100644
index 6df2cba..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/WorkbenchRunnableAdapter.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * An <code>IRunnableWithProgress</code> that adapts and  <code>IWorkspaceRunnable</code>
- * so that is can be executed inside <code>IRunnableContext</code>. <code>OperationCanceledException</code> 
- * thrown by the adapted runnable are caught and re-thrown as a <code>InterruptedException</code>.
- */
-public class WorkbenchRunnableAdapter implements IRunnableWithProgress {
-	
-	private IWorkspaceRunnable fWorkspaceRunnable;
-	private ISchedulingRule fRule;
-	
-	/**
-	 * Runs a workspace runnable with the given lock or <code>null</code> to run with no lock at all.
-	 * 
-	 * @param runnable the workspace runnable
-	 * @param rule the scheduling rule
-	 */
-	public WorkbenchRunnableAdapter(IWorkspaceRunnable runnable, ISchedulingRule rule) {
-		Assert.isNotNull(runnable);
-		Assert.isNotNull(rule);
-		fWorkspaceRunnable= runnable;
-		fRule= rule;
-	}
-	
-	public ISchedulingRule getSchedulingRule() {
-		return fRule;
-	}
-
-	/*
-	 * @see IRunnableWithProgress#run(IProgressMonitor)
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		try {
-			ResourcesPlugin.getWorkspace().run(fWorkspaceRunnable, fRule, IWorkspace.AVOID_UPDATE, monitor);
-		} catch (OperationCanceledException e) {
-			throw new InterruptedException(e.getMessage());
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/PixelConverter.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/PixelConverter.java
deleted file mode 100644
index 9c0e1ad..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/PixelConverter.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring.util;
-
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.dialogs.Dialog;
-
-public class PixelConverter {
-	
-	private FontMetrics fFontMetrics;
-	
-	public PixelConverter(Control control) {
-		GC gc= null;
-		try {
-			gc= new GC(control);
-			gc.setFont(control.getFont());
-			fFontMetrics= gc.getFontMetrics();
-		} finally {
-			if (gc != null)
-				gc.dispose();
-		}
-	}
-	
-	public int convertHeightInCharsToPixels(int chars) {
-		return Dialog.convertHeightInCharsToPixels(fFontMetrics, chars);
-	}
-
-	public int convertHorizontalDLUsToPixels(int dlus) {
-		return Dialog.convertHorizontalDLUsToPixels(fFontMetrics, dlus);
-	}
-
-	public int convertVerticalDLUsToPixels(int dlus) {
-		return Dialog.convertVerticalDLUsToPixels(fFontMetrics, dlus);
-	}
-	
-	public int convertWidthInCharsToPixels(int chars) {
-		return Dialog.convertWidthInCharsToPixels(fFontMetrics, chars);
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/Strings.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/Strings.java
deleted file mode 100644
index 1b1fd7e..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/Strings.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring.util;
-
-
-/**
- * Helper class to provide String manipulation functions not available in standard JDK.
- */
-public class Strings {
-	
-	private Strings(){}
-	
-	public static String removeNewLine(String message) {
-		StringBuffer result= new StringBuffer();
-		int current= 0;
-		int index= message.indexOf('\n', 0);
-		while (index != -1) {
-			result.append(message.substring(current, index));
-			if (current < index && index != 0)
-				result.append(' ');
-			current= index + 1;
-			index= message.indexOf('\n', current);
-		}
-		result.append(message.substring(current));
-		return result.toString();
-	}
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/ViewerPane.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/ViewerPane.java
deleted file mode 100644
index aacb6ff..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/util/ViewerPane.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.internal.ui.refactoring.util;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolBar;
-
-import org.eclipse.jface.action.ToolBarManager;
-
-/**
- * A <code>ViewerPane</code> is a convenience class which installs a
- * <code>CLabel</code> and a <code>Toolbar</code> in a <code>ViewForm</code>.
- * <P>
- */
-public class ViewerPane extends ViewForm {
-	
-	private ToolBarManager fToolBarManager;
-
-	public ViewerPane(Composite parent, int style) {
-		super(parent, style);
-		
-		marginWidth= 0;
-		marginHeight= 0;
-		
-		CLabel label= new CLabel(this, SWT.NONE);
-		setTopLeft(label);
-		
-		ToolBar tb= new ToolBar(this, SWT.FLAT);
-		setTopCenter(tb);
-		fToolBarManager= new ToolBarManager(tb);
-	}
-	
-	/**
-	 * Sets the receiver's title text.
-	 * 
-	 * @param label the text
-	 */
-	public void setText(String label) {
-		CLabel cl= (CLabel) getTopLeft();
-		cl.setText(label);		
-	}
-	
-	public String getText() {
-		CLabel cl= (CLabel) getTopLeft();
-		return cl.getText();
-	}
-	
-	/**
-	 * Sets the receiver's title image.
-	 * 
-	 * @param image the image
-	 */
-	public void setImage(Image image) {
-		CLabel cl= (CLabel) getTopLeft();
-		cl.setImage(image);
-	}
-	
-	public Image getImage() {
-		CLabel cl= (CLabel) getTopLeft();
-		return cl.getImage();
-	}
-	
-	public ToolBarManager getToolBarManager() {
-		return fToolBarManager;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/ChangePreviewViewerInput.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/ChangePreviewViewerInput.java
deleted file mode 100644
index 8ab1ce2..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/ChangePreviewViewerInput.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.internal.ui.refactoring.Assert;
-
-/**
- * Instances of this class represent the input for an {@link IChangePreviewViewer}.
- * The input object manages the change object the viewer is associated with.
- * <p>
- * This class is not intended to be extended outside the refactoring framework.
- * </p>
- * 
- * @since 3.0
- */
-public class ChangePreviewViewerInput {
-	private Change fChange;
-	
-	/**
-	 * Creates a new input object for the given change.
-	 * 
-	 * @param change the change object
-	 */
-	public ChangePreviewViewerInput(Change change) {
-		Assert.isNotNull(change);
-		fChange= change;
-	}
-	
-	/**
-	 * Returns the change of this input object.
-	 * 
-	 * @return the change of this input object
-	 */
-	public Change getChange() {
-		return fChange;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IChangePreviewViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IChangePreviewViewer.java
deleted file mode 100644
index 321fa7e..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IChangePreviewViewer.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * Viewer to present the preview for a {@link org.eclipse.ltk.core.refactoring.Change}.
- * <p>
- * Viewers are associated with a change object via the extension point <code>
- * org.eclipse.ltk.ui.refactoring.changePreviewViewers</code>. Implementors of this
- * extension point must therefore implement this interface.
- * </p>
- * <p>
- * To ensure visual consistency across all provided preview viewers the widget
- * hierarchy provided through the method {@link #createControl(Composite)} has to
- * use a {@link org.eclipse.swt.custom.ViewForm} as its root widget.
- * </p>
- * <p>
- * Clients of this interface should call <code>createControl</code> before calling
- * <code>setInput</code>.
- * </p>
- * 
- * @since 3.0
- */
-public interface IChangePreviewViewer {
-
-	/**
-	 * Creates the preview viewer's widget hierarchy. This method 
-	 * is only called once. Method <code>getControl()</code>
-	 * should be used to retrieve the widget hierarchy.
-	 * 
-	 * @param parent the parent for the widget hierarchy
-	 * 
-	 * @see #getControl()
-	 */
-	public void createControl(Composite parent);
-	
-	/**
-	 * Returns the preview viewer's SWT control.
-	 * 
-	 * @return the preview viewer's SWT control or <code>null</code>
-	 *  is the widget hierarchy hasn't been created yet
-	 */
-	public Control getControl();	
-	
-	/**
-	 * Sets the preview viewer's input element.
-	 * 
-	 * @param input the input element
-	 */
-	public void setInput(ChangePreviewViewerInput input);	
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IRefactoringUIStatusCodes.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IRefactoringUIStatusCodes.java
deleted file mode 100644
index 387e3e5..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IRefactoringUIStatusCodes.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-/**
- * Status codes used by the refactoring ui plug-in.
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.core.runtime.Status
- * 
- * @since 3.0
- */
-public interface IRefactoringUIStatusCodes {
-
-	/**
-	 * Status code (value 10000) indicating an internal error.
-	 */
-	public static final int INTERNAL_ERROR= 10000;
-
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IStatusContextViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IStatusContextViewer.java
deleted file mode 100644
index b1dcece..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/IStatusContextViewer.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatusContext;
-
-/**
- * Viewer to present the the context object of a {@linkplain org.eclipse.ltk.core.refactoring.RefactoringStatusEntry
- * refactoring status entry}.
- * <p>
- * Status context viewers are associated with a context object via the extension point <code>
- * org.eclipse.ltk.ui.refactoring.statusContextViewers</code>. Implementors of this
- * extension point must therefore implement this interface.
- * </p>
- * <p>
- * To ensure visual consistency across all provided context viewers the widget
- * hierarchy provided through the method {@link #createControl(Composite)} has to
- * use a {@link org.eclipse.swt.custom.ViewForm} as its root widget.
- * </p>
- * <p>
- * Clients of this interface should call <code>createControl</code> before calling
- * <code>setInput</code>.
- * </p>
- * @since 3.0
- */
-public interface IStatusContextViewer {
-	
-	/**
-	 * Creates the status viewer's widget hierarchy. This method 
-	 * is only called once. Method <code>getControl()</code> should 
-	 * be used to retrieve the widget hierarchy.
-	 * 
-	 * @param parent the parent for the widget hierarchy
-	 * 
-	 * @see #getControl()
-	 */
-	public void createControl(Composite parent);
-	
-	/**
-	 * Returns the status context viewer's SWT control.
-	 * 
-	 * @return the status context viewer's SWT control or <code>null</code>
-	 *  is the widget hierarchy hasn't been created yet
-	 */
-	public Control getControl();	
-	
-	/**
-	 * Sets the status context viewer's input element.
-	 * 
-	 * @param input the input element
-	 */
-	public void setInput(RefactoringStatusContext input);	
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RedoRefactoringAction.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RedoRefactoringAction.java
deleted file mode 100644
index 1ff8c90..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RedoRefactoringAction.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.IValidationCheckResultQuery;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.UndoManagerAdapter;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringUIMessages;
-import org.eclipse.ltk.internal.ui.refactoring.UndoManagerAction;
-
-/**
- * The refactoring redo action. When executed the action performs 
- * the top most change from the refactoring undo manager's redo
- * stack.
- * <p>
- * The action is typically added to a global refactoring menu via
- * the <code>org.eclipse.ui.actionSets</code> extension point.
- * </p>
- * <p>
- * Note: this class isn't intended to be subclassed. Clients are only
- * allowed to instantiate the class or to reference it from an action 
- * set.
- * </p>
- *  
- * @since 3.0
- */
-public class RedoRefactoringAction extends UndoManagerAction implements IWorkbenchWindowActionDelegate {
-
-	private int fPatternLength;
-
-	/**
-	 * Creates a new redo refactoring action.
-	 */
-	public RedoRefactoringAction() {
-	}
-
-	/* (non-Javadoc)
-	 * Method declared in UndoManagerAction
-	 */
-	protected String getName() {
-		return RefactoringUIMessages.getString("RedoRefactoringAction.name"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in UndoManagerAction
-	 */
-	protected IRunnableWithProgress createOperation(Shell parent) {
-		final IValidationCheckResultQuery query= new Query(parent, RefactoringUIMessages.getString("RedoRefactoringAction.error.title")) { //$NON-NLS-1$
-			protected String getFullMessage(String errorMessage) {
-				return RefactoringUIMessages.getFormattedString(
-					"RedoRefactoringAction.error.message",  //$NON-NLS-1$
-					errorMessage);
-			}
-		};
-		return new IRunnableWithProgress(){
-			public void run(IProgressMonitor pm) throws InvocationTargetException {
-				try {
-					RefactoringCore.getUndoManager().performRedo(query, pm);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);			
-				}
-			}
-		};
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in UndoManagerAction
-	 */
-	protected UndoManagerAdapter createUndoManagerListener() {
-		return new UndoManagerAdapter() {
-			public void redoStackChanged(IUndoManager manager) {
-				IAction action= getAction();
-				if (action == null)
-					return;
-				boolean enabled= false;
-				String text= null;
-				if (manager.anythingToRedo()) {
-					enabled= true;
-					text= getActionText();
-				} else {
-					text= RefactoringUIMessages.getString("RedoRefactoringAction.label"); //$NON-NLS-1$
-				}
-				action.setEnabled(enabled);
-				action.setText(text);
-			}
-		};
-	}
-		
-	/* (non-Javadoc)
-	 * Method declared in IActionDelegate
-	 */
-	public void selectionChanged(IAction action, ISelection s) {
-		if (!isHooked()) {
-			hookListener(action);
-			fPatternLength= RefactoringUIMessages.getString("RedoRefactoringAction.extendedLabel").length(); //$NON-NLS-1$
-			IUndoManager undoManager = RefactoringCore.getUndoManager();
-			if (undoManager.anythingToRedo()) {
-				if (undoManager.peekRedoName() != null)
-					action.setText(getActionText());
-				action.setEnabled(true);
-			} else {
-				action.setEnabled(false);
-			}
-		}
-	}	
-	
-	private String getActionText() {
-		return shortenText(RefactoringUIMessages.getFormattedString(
-			"RedoRefactoringAction.extendedLabel", //$NON-NLS-1$
-			RefactoringCore.getUndoManager().peekRedoName()), fPatternLength);
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringUI.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringUI.java
deleted file mode 100644
index bc91c52..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringUI.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringStatusDialog;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringWizardDialog;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringWizardDialog2;
-import org.eclipse.ltk.internal.ui.refactoring.UIPerformChangeOperation;
-
-/**
- * Central access point to access resources managed by the refactoring
- * ui plug-in.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0
- */
-public class RefactoringUI {
-	
-	private RefactoringUI() {
-		// no instance
-	}
-	
-	/**
-	 * Creates a dialog to present a {@link RefactoringStatus} to the user. The following values are 
-	 * returned from the dialogs open method: 
-	 * <ul>
-	 *   <li>{@link org.eclipse.jface.dialogs.IDialogConstants#OK_ID IDialogConstants#OK_ID}:
-	 *       if the user has pressed the continue button.</li> 
-	 *   <li>{@link org.eclipse.jface.dialogs.IDialogConstants#CANCEL_ID IDialogConstants#CANCEL_ID}:
-	 *       if the user has pressed the cancel button.</li>
-	 *   <li>{@link org.eclipse.jface.dialogs.IDialogConstants#BACK_ID IDialogConstants#BACK_ID}: 
-	 *       if the user has pressed the back button.</li>
-	 * </ul>
-	 * 
-	 * @param status the status to present
-	 * @param parent the parent shell of the dialog. May be <code>null</code>
-	 *  if the dialog is a top-level dialog
-	 * @param windowTitle the dialog's window title
-	 * @param backButton if <code>true</code> the dialog will contain a back button;
-	 *  otherwise no back button will be present.
-	 * @return a dialog to present a refactoring status.
-	 */
-	public static Dialog createRefactoringStatusDialog(RefactoringStatus status, Shell parent, String windowTitle, boolean backButton) {
-		return new RefactoringStatusDialog(status, parent, windowTitle, backButton);
-	}
-	
-	/**
-	 * Creates a dialog capable to present the given refactoring wizard. Clients of
-	 * this method can assume that the returned dialog is an instance of 
-	 * {@link org.eclipse.jface.wizard.IWizardContainer IWizardContainer}. However the 
-	 * dialog is not necessarily an instance of {@link org.eclipse.jface.wizard.WizardDialog
-	 * WizardDialog}.
-	 * 
-	 * @param wizard the refactoring wizard to create a dialog for
-	 * @param parent the parent of the created dialog or <code>null</code> to create a top-level dialog
-	 * 
-	 * @return the dialog 
-	 */
-	/* package */ static Dialog createRefactoringWizardDialog(RefactoringWizard wizard, Shell parent) {
-		Dialog result;
-		if (wizard.needsWizardBasedUserInterface())
-			result= new RefactoringWizardDialog(parent, wizard);
-		else 
-			result= new RefactoringWizardDialog2(parent, wizard);
-		return result;
-	}
-	
-	/**
-	 * Creates a special perform change operations that knows how to batch
-	 * undo operations in open editors into one undo object. The operation
-	 * batches the undo operations for those editors that implement the
-	 * interface {@link org.eclipse.jface.text.IRewriteTarget}.
-	 * 
-	 * @param change the change to perform
-	 * 
-	 * @return a special perform change operation that knows how to batch
-	 *  undo operations for open editors if they implement <code>IRewriteTarget
-	 *  </code>
-	 */
-	public static PerformChangeOperation createUIAwareChangeOperation(Change change) {
-		return new UIPerformChangeOperation(null, change, null);
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java
deleted file mode 100644
index ff54a31..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java
+++ /dev/null

@@ -1,694 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ltk.ui.refactoring;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.ui.refactoring.Assert;
-import org.eclipse.ltk.internal.ui.refactoring.ChangeExceptionHandler;
-import org.eclipse.ltk.internal.ui.refactoring.ErrorWizardPage;
-import org.eclipse.ltk.internal.ui.refactoring.ExceptionHandler;
-import org.eclipse.ltk.internal.ui.refactoring.FinishResult;
-import org.eclipse.ltk.internal.ui.refactoring.IPreviewWizardPage;
-import org.eclipse.ltk.internal.ui.refactoring.InternalAPI;
-import org.eclipse.ltk.internal.ui.refactoring.PreviewWizardPage;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringPluginImages;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringUIMessages;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin;
-import org.eclipse.ltk.internal.ui.refactoring.WorkbenchRunnableAdapter;
-
-/**
- * An abstract base implementation of a refactoring wizard. A refactoring
- * wizard differs from a normal wizard in the following characteristics:
- * <ul>
- *   <li>only pages of type {@link org.eclipse.ltk.ui.refactoring.RefactoringWizardPage
- *       RefactoringWizardPage} can be added to a refactoring wizard. Trying to
- *       add a different kind of page results in an exception.</li>
- *   <li>a refactoring wizard consists of 0 .. n user input pages, one error page
- *       to present the outcome of the refactoring's condition checking and one
- *       preview page to present a preview of the workspace changes.</li> 
- * </ul> 
- * <p>
- * A refactoring wizard is best opened using the {@link RefactoringWizardOpenOperation}.
- * </p>
- * <p>
- * Clients may extend this class.
- * </p>
- * 
- * @see org.eclipse.ltk.core.refactoring.Refactoring
- * 
- * @since 3.0
- */
-public abstract class RefactoringWizard extends Wizard {
-
-	/** 
-	 * Flag (value 0) indicating that no special flags are provided.
-	 */
-	public static final int NONE= 0;
-	
-	/**
-	 * Flag (value 1) indicating that the initial condition checking of the refactoring is done when 
-	 * the wizard opens. If not specified it is assumed that the initial condition checking
-	 * has been done by the client before opening the wizard dialog. 
-	 */
-	public static final int CHECK_INITIAL_CONDITIONS_ON_OPEN= 1 << 0;
-	
-	/**
-	 * Flag (value 2) indicating that a normal wizard based user interface consisting
-	 * of a back, next, finish and cancel button should be used to present
-	 * this refactoring wizard. This flag can't be specified together with
-	 * the flag {@link #DIALOG_BASED_UESR_INTERFACE}.
-	 */
-	public static final int WIZARD_BASED_USER_INTERFACE= 1 << 1;
-	
-	/**
-	 * Flag (value 4) indicating that a lightweight dialog based user interface should
-	 * be used to present this refactoring wizard. This user interface consists
-	 * of a preview, finish and cancel button and the initial size of dialog
-	 * is based on the first user input page. This flag is only valid if only
-	 * one user input page is present. Specifying this flag together with more
-	 * than one input page will result in an exception when adding the user input
-	 * pages. This flag can't be specified together with the flag 
-	 * {@link #WIZARD_BASED_USER_INTERFACE}.
-	 */
-	public static final int DIALOG_BASED_UESR_INTERFACE= 1 << 2;
-	
-	/**
-	 * Flag (value 8) indicating that the finish and cancel button should be named
-	 * yes and no. The flag is ignored if the flag {@link #WIZARD_BASED_USER_INTERFACE}
-	 * is specified.
-	 */
-	public static final int YES_NO_BUTTON_STYLE= 1 << 3;
-	
-	/**
-	 * Flag (value 16) indicating that the wizard should not show a preview page.
-	 * The flag is ignored if the flag {@link #WIZARD_BASED_USER_INTERFACE}
-	 * is specified.
-	 * */
-	public static final int NO_PREVIEW_PAGE= 1 << 4;
-	
-	/**
-	 * Flag (value 32) indicating that the first change node presented in the
-	 * preview page should be fully expanded.
-	 */
-	public static final int PREVIEW_EXPAND_FIRST_NODE= 1 << 5;
-
-	/**
-	 * Flag (value 64) indicating that the dialog representing the refactoring
-	 * status to the user will not contain a back button. The flag
-	 * is ignored if the flag (@link #WIZARD_BASED_USER_INTERFACE}
-	 * is specified.
-	 */
-	public static final int NO_BACK_BUTTON_ON_STATUS_DIALOG= 1 << 6;
-	
-	private static final int LAST= 1 << 7;
-	
-	private int fFlags;
-	private Refactoring fRefactoring;
-	private String fDefaultPageTitle;
-	
-	private Change fChange;
-	private RefactoringStatus fInitialConditionCheckingStatus= new RefactoringStatus();
-	private RefactoringStatus fConditionCheckingStatus;
-	
-	private int fUserInputPages;
-	private boolean fInAddPages;
-	
-	private boolean fIsChangeCreationCancelable;
-	private boolean fForcePreviewReview;
-	private boolean fPreviewShown;
-	
-	/**
-	 * Creates a new refactoring wizard for the given refactoring. 
-	 * 
-	 * @param refactoring the refactoring the wizard is presenting
-	 * @param flags flags specifying the behaviour of the wizard. If neither 
-	 *  <code>WIZARD_BASED_USER_INTERFACE</code> nor <code>DIALOG_BASED_UESR_INTERFACE</code> 
-	 *  is specified then <code>WIZARD_BASED_USER_INTERFACE</code> will be
-	 *  taken as a default.
-	 */
-	public RefactoringWizard(Refactoring refactoring, int flags) {
-		Assert.isNotNull(refactoring);
-		Assert.isTrue(flags < LAST);
-		if ((flags & DIALOG_BASED_UESR_INTERFACE) == 0) 
-			flags |= WIZARD_BASED_USER_INTERFACE;
-		Assert.isTrue((flags & DIALOG_BASED_UESR_INTERFACE) != 0 || (flags & WIZARD_BASED_USER_INTERFACE) != 0);
-		fRefactoring= refactoring;
-		fFlags= flags;
-		setNeedsProgressMonitor(true);
-		setChangeCreationCancelable(true);
-		setWindowTitle(RefactoringUIMessages.getString("RefactoringWizard.title")); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(RefactoringPluginImages.DESC_WIZBAN_REFACTOR);
-	} 
-	
-	//---- Setter and Getters ------------------------------------------------------------
-	
-	/**
-	 * Returns the refactoring this wizard is associated with.
-	 * 
-	 * @return the wizard's refactoring
-	 */	
-	public final Refactoring getRefactoring(){
-		return fRefactoring;
-	}
-	
-	/**
-	 * Sets the default page title to the given value. This value is used
-	 * as a page title for wizard pages which don't provide their own
-	 * page title. Setting this value has only an effect as long as the
-	 * user interface hasn't been created yet. 
-	 * 
-	 * @param defaultPageTitle the default page title.
-	 * @see Wizard#setDefaultPageImageDescriptor(org.eclipse.jface.resource.ImageDescriptor)
-	 */
-	public final void setDefaultPageTitle(String defaultPageTitle) {
-		Assert.isNotNull(defaultPageTitle);
-		fDefaultPageTitle= defaultPageTitle;
-	}
-	
-	/**
-	 * Returns the default page title used for pages that don't provide their 
-	 * own page title.
-	 * 
-	 * @return the default page title or <code>null</code> if non has been set
-	 * 
-	 * @see #setDefaultPageTitle(String)
-	 */
-	public final String getDefaultPageTitle() {
-		return fDefaultPageTitle;
-	}
-	
-	/**
-	 * If set to <code>true</code> the Finish or OK button, respectively will
-	 * be disabled until the user has visited the preview page. If set to
-	 * <code>false</code> the refactoring can be performed before the preview
-	 * page has been visited.
-	 * 
-	 * @param forcePreviewReview if <code>true</code> to user must confirm the
-	 *  preview
-	 */
-	public final void setForcePreviewReview(boolean forcePreviewReview) {
-		fForcePreviewReview= forcePreviewReview;
-		getContainer().updateButtons();	
-	}
-	
-	/**
-	 * Returns the width in characters to be used for the message line embedded into
-	 * the refactoring wizard dialog.
-	 * <p>
-	 * Subclasses may override this method and return a different value.
-	 * </p>
-	 * 
-	 * @return the message lines width in characters
-	 */
-	public int getMessageLineWidthInChars() {
-		return 80;
-	}
-	
-	/**
-	 * If set to <code>true</code> the change creation is cancelable by the user.
-	 * <p>
-	 * By default, change creation is cancelable.
-	 * </p>
-	 * @param isChangeCreationCancelable determines whether the change creation
-	 *  is cancelable by the user or not.
-	 * 
-	 * @see Refactoring#createChange(IProgressMonitor)
-	 */
-	public final void setChangeCreationCancelable(boolean isChangeCreationCancelable){
-		fIsChangeCreationCancelable= isChangeCreationCancelable;
-	}
-	
-	/**
-	 * Sets the initial condition checking status computed by the refactoring.
-	 * Clients should uses this method if the initial condition checking
-	 * status has been computed outside of this refactoring wizard.
-	 * 
-	 * @param status the initial condition checking status.
-	 * 
-	 * @see Refactoring#checkInitialConditions(IProgressMonitor)
-	 * @see #CHECK_INITIAL_CONDITIONS_ON_OPEN
-	 */
-	public final void setInitialConditionCheckingStatus(RefactoringStatus status) {
-		Assert.isNotNull(status);
-		fInitialConditionCheckingStatus= status;
-		setConditionCheckingStatus(status);
-	}
-		
-	/**
-	 * Returns the refactoring's change object or <code>null</code> if no change
-	 * object has been created yet.
-	 * 
-	 * @return the refactoring's change object or <code>null</code>
-	 * 
-	 * @see Refactoring#createChange(IProgressMonitor)
-	 */
-	public final Change getChange() {
-		return fChange;
-	}
-	
-	/**
-	 * Returns the status of the initial condition checking or <code>null</code>
-	 * if the initial condition checking hasn't been performed yet.
-	 * 
-	 * @return the status of the initial condition checking or <code>null</code>
-	 * 
-	 * @see Refactoring#checkInitialConditions(IProgressMonitor)
-	 */
-	/* package */ final RefactoringStatus getInitialConditionCheckingStatus() {
-		return fInitialConditionCheckingStatus;
-	}
-	
-	/**
-	 * Returns <code>true</code> if the wizard needs a wizard based user interface.
-	 * Otherwise <code>false</code> is returned.
-	 * 
-	 * @return whether the wizard needs a wizard based user interface or not
-	 */
-	/* package */ boolean needsWizardBasedUserInterface() {
-		return (fFlags & WIZARD_BASED_USER_INTERFACE) != 0;
-	}
-	
-	//---- Page management ------------------------------------------------------------
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * This method calls the hook method {@link #addUserInputPages()} to allow
-	 * subclasses to add specific user input pages.
-	 */
-	public final void addPages() {
-		Assert.isNotNull(fRefactoring);
-		try {
-			fInAddPages= true;
-			if (checkActivationOnOpen()) {
-				internalCheckCondition(CheckConditionsOperation.INITIAL_CONDITONS);
-			}
-			if (fInitialConditionCheckingStatus.hasFatalError()) {
-				addErrorPage();
-				// Set the status since we added the error page
-				setConditionCheckingStatus(getConditionCheckingStatus());	
-			} else { 
-				Assert.isTrue(getPageCount() == 0);
-				addUserInputPages();
-				fUserInputPages= getPageCount();
-				if (fUserInputPages > 0) {
-					IWizardPage[] pages= getPages();
-					((UserInputWizardPage)pages[fUserInputPages - 1]).markAsLastUserInputPage();
-				}
-				if (fUserInputPages > 1) {
-					Assert.isTrue((fFlags & WIZARD_BASED_USER_INTERFACE) != 0);
-				}
-				addErrorPage();
-				addPreviewPage();	
-			}
-			initializeDefaultPageTitles();
-		} finally {
-			fInAddPages= false;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * This method asserts that the pages added to the refactoring wizard
-	 * are instances of type {@link RefactoringWizardPage}.
-	 */
-	public final void addPage(IWizardPage page) {
-		Assert.isTrue(page instanceof RefactoringWizardPage && fInAddPages);
-		super.addPage(page);
-	}
-	
-	/**
-	 * Hook method to add user input pages to this refactoring wizard. Pages
-	 * added via this call have to be instances of the type {@link UserInputWizardPage}.
-	 * Adding pages of a different kind is not permitted and will result
-	 * in unexpected behaviour.
-	 */
-	protected abstract void addUserInputPages();
-	
-	private void addErrorPage(){
-		addPage(new ErrorWizardPage());
-	}
-	
-	private void addPreviewPage(){
-		addPage(new PreviewWizardPage());
-	}
-	
-	private boolean hasUserInput() {
-		return fUserInputPages > 0;		
-	}
-	
-	private void initializeDefaultPageTitles() {
-		if (fDefaultPageTitle == null)
-			return;
-			
-		IWizardPage[] pages= getPages();
-		for (int i= 0; i < pages.length; i++) {
-			IWizardPage page= pages[i];
-			if (page.getTitle() == null)
-				page.setTitle(fDefaultPageTitle);
-		}
-	}
-	
-	//---- Page computation -----------------------------------------------------------
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public IWizardPage getStartingPage() {
-		if (hasUserInput())
-			return super.getStartingPage();
-		return computeUserInputSuccessorPage(null, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public IWizardPage getPreviousPage(IWizardPage page) {
-		if (hasUserInput())
-			return super.getPreviousPage(page);
-		if (! page.getName().equals(ErrorWizardPage.PAGE_NAME)){
-			if (fConditionCheckingStatus.isOK())
-				return null;
-		}		
-		return super.getPreviousPage(page);		
-	}
-
-	/* package */ IWizardPage computeUserInputSuccessorPage(IWizardPage caller, IRunnableContext context) {
-		Change change= createChange(new CreateChangeOperation(
-			new CheckConditionsOperation(fRefactoring, CheckConditionsOperation.FINAL_CONDITIONS),
-			RefactoringStatus.FATAL), true, context);
-		// Status has been updated since we have passed true
-		RefactoringStatus status= getConditionCheckingStatus();
-		
-		// Creating the change has been canceled
-		if (change == null && status == null) {		
-			internalSetChange(InternalAPI.INSTANCE, change);
-			return caller;
-		}
-				
-		// Set change if we don't have fatal errors.
-		if (!status.hasFatalError())
-			internalSetChange(InternalAPI.INSTANCE, change);
-		
-		if (status.isOK()) {
-			return getPage(IPreviewWizardPage.PAGE_NAME);
-		} else {
-			return getPage(ErrorWizardPage.PAGE_NAME);
-		}
-	} 
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean canFinish() {
-		if (fForcePreviewReview && !fPreviewShown)
-			return false;
-		return super.canFinish();
-	}
-
-	//---- Condition checking ------------------------------------------------------------
-
-	/* package */ final RefactoringStatus checkFinalConditions() {
-		return internalCheckCondition(CheckConditionsOperation.FINAL_CONDITIONS);
-	}
-	
-	private RefactoringStatus internalCheckCondition(int style) {
-		
-		CheckConditionsOperation op= new CheckConditionsOperation(fRefactoring, style); 
-
-		Exception exception= null;
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(
-				new WorkbenchRunnableAdapter(op, ResourcesPlugin.getWorkspace().getRoot()));
-		} catch (InterruptedException e) {
-			exception= e;
-		} catch (InvocationTargetException e) {
-			exception= e;
-		}
-		RefactoringStatus status= null;
-		if (exception != null) {
-			RefactoringUIPlugin.log(exception);
-			status= new RefactoringStatus();
-			status.addFatalError(RefactoringUIMessages.getString("RefactoringWizard.internal_error_1")); //$NON-NLS-1$
-		} else {
-			status= op.getStatus();
-		}
-		setConditionCheckingStatus(status, style);
-		return status;	
-	}
-	
-	private void setConditionCheckingStatus(RefactoringStatus status, int style) {
-		if ((style & CheckConditionsOperation.ALL_CONDITIONS) == CheckConditionsOperation.ALL_CONDITIONS)
-			setConditionCheckingStatus(status);
-		else if ((style & CheckConditionsOperation.INITIAL_CONDITONS) == CheckConditionsOperation.INITIAL_CONDITONS)
-			setInitialConditionCheckingStatus(status);
-		else if ((style & CheckConditionsOperation.FINAL_CONDITIONS) == CheckConditionsOperation.FINAL_CONDITIONS)
-			setFinalConditionCheckingStatus(status);
-	}
-
-	private RefactoringStatus getConditionCheckingStatus() {
-		return fConditionCheckingStatus;
-	} 
-		
-	/**
-	 * Sets the refactoring status.
-	 * 
-	 * @param status the refactoring status to set.
-	 */
-	/* package */ final void setConditionCheckingStatus(RefactoringStatus status) {
-		ErrorWizardPage page= (ErrorWizardPage)getPage(ErrorWizardPage.PAGE_NAME);
-		if (page != null)
-			page.setStatus(status);
-		fConditionCheckingStatus= status;
-	}
-	
-	/**
-	 * Sets the refactoring status returned from final condition checking. Any previously 
-	 * computed initial status is merged into the given status before it is set to the 
-	 * error page.
-	 * 
-	 * @param status the final condition checking status to set
-	 */
-	private void setFinalConditionCheckingStatus(RefactoringStatus status) {
-		RefactoringStatus newStatus= new RefactoringStatus();
-		if (fInitialConditionCheckingStatus != null)
-			newStatus.merge(fInitialConditionCheckingStatus);
-		newStatus.merge(status);	
-		setConditionCheckingStatus(newStatus);			
-	}
-	
-	//---- Change management -------------------------------------------------------------
-
-	/**
-	 * Note: This method is for internal use only. Clients are not allowed to call this method.
-	 * 
-	 * @param api internal instance to avoid access from external clients
-	 * @param operation the create change operation
-	 * @param updateStatus flag indicating if status updating is requested
-	 * 
-	 * @return the created change
-	 */
-	public final Change internalCreateChange(InternalAPI api, CreateChangeOperation operation, boolean updateStatus) {
-		Assert.isNotNull(api);
-		return createChange(operation, updateStatus, getContainer());
-	}
-
-	/**
-	 * Note: This method is for internal use only. Clients are not allowed to call this method.
-	 * 
-	 * @param api internal instance to avoid access from external clients
-	 * @param op the perform change operation
-	 * 
-	 * @return whether the finish ended OK or not
-	 */
-	public final FinishResult internalPerformFinish(InternalAPI api, PerformChangeOperation op) {
-		op.setUndoManager(RefactoringCore.getUndoManager(), fRefactoring.getName());
-		Shell parent= getContainer().getShell();
-		try{
-			getContainer().run(true, true, new WorkbenchRunnableAdapter(op, ResourcesPlugin.getWorkspace().getRoot()));
-		} catch (InvocationTargetException e) {
-			Throwable inner= e.getTargetException();
-			if (op.changeExecutionFailed()) {
-				ChangeExceptionHandler handler= new ChangeExceptionHandler(parent, fRefactoring);
-				if (inner instanceof RuntimeException) {
-					handler.handle(op.getChange(), (RuntimeException)inner);
-					return FinishResult.createException();
-				} else if (inner instanceof CoreException) {
-					handler.handle(op.getChange(), (CoreException)inner);
-					return FinishResult.createException();
-				}
-			}
-			ExceptionHandler.handle(e, parent, 
-				RefactoringUIMessages.getString("RefactoringWizard.refactoring"), //$NON-NLS-1$
-				RefactoringUIMessages.getString("RefactoringWizard.unexpected_exception_1")); //$NON-NLS-1$
-			return FinishResult.createException();
-		} catch (InterruptedException e) {
-			return FinishResult.createInterrupted();
-		}
-		return FinishResult.createOK();
-	}
-	
-	private Change createChange(CreateChangeOperation operation, boolean updateStatus, IRunnableContext context){
-		InvocationTargetException exception= null;
-		try {
-			context.run(true, fIsChangeCreationCancelable, new WorkbenchRunnableAdapter(
-				operation, ResourcesPlugin.getWorkspace().getRoot()));
-		} catch (InterruptedException e) {
-			setConditionCheckingStatus(null);
-			return null;
-		} catch (InvocationTargetException e) {
-			exception= e;
-		}
-		
-		if (updateStatus) {
-			RefactoringStatus status= null;
-			if (exception != null) {
-				status= new RefactoringStatus();
-				String msg= exception.getMessage();
-				if (msg != null) {
-					status.addFatalError(RefactoringUIMessages.getFormattedString("RefactoringWizard.see_log", msg)); //$NON-NLS-1$
-				} else {
-					status.addFatalError(RefactoringUIMessages.getString("RefactoringWizard.Internal_error")); //$NON-NLS-1$
-				}
-				RefactoringUIPlugin.log(exception);
-			} else {
-				status= operation.getConditionCheckingStatus();
-			}
-			setConditionCheckingStatus(status, operation.getConditionCheckingStyle());
-		} else {
-			if (exception != null)
-				ExceptionHandler.handle(exception, getContainer().getShell(), 
-					RefactoringUIMessages.getString("RefactoringWizard.refactoring"),  //$NON-NLS-1$
-					RefactoringUIMessages.getString("RefactoringWizard.unexpected_exception")); //$NON-NLS-1$
-		}
-		Change change= operation.getChange();	
-		return change;
-	}
-
-	//---- Reimplementation of Wizard methods --------------------------------------------
-
-	public boolean performFinish() {
-		Assert.isNotNull(fRefactoring);
-		
-		RefactoringWizardPage page= (RefactoringWizardPage)getContainer().getCurrentPage();
-		return page.performFinish();
-	}
-	
-	public boolean performCancel() {
-		if (fChange != null)
-			fChange.dispose();
-		return super.performCancel();
-	}
-	
-	//---- Internal API, but public due to Java constraints ------------------------------
-	
-	/**
-	 * Note: This method is for internal use only. Clients are not allowed to call this method.
-	 * 
-	 * @param api internal instance to avoid access from external clients
-	 * 
-	 * @return whether the wizard has a preview page or not.
-	 */
-	public final boolean internalHasPreviewPage(InternalAPI api) {
-		Assert.isNotNull(api);
-		return (fFlags & NO_PREVIEW_PAGE) == 0;
-	}
-	
-	/**
-	 * Note: This method is for internal use only. Clients are not allowed to call this method.
-	 * 
-	 * @param api internal instance to avoid access from external clients
-	 * 
-	 * @return whether yes no button style is requested
-	 */
-	public final boolean internalIsYesNoStyle(InternalAPI api) {
-		Assert.isNotNull(api);
-		return (fFlags & YES_NO_BUTTON_STYLE) != 0;
-	}
-	
-	/**
-	 * Note: This method is for internal use only. Clients are not allowed to call this method.
-	 * 
-	 * @param api internal instance to avoid access from external clients
-	 * 
-	 * @return whether the first node of the preview is supposed to be expanded
-	 */
-	public final boolean internalGetExpandFirstNode(InternalAPI api) {
-		Assert.isNotNull(api);
-		return (fFlags & PREVIEW_EXPAND_FIRST_NODE) != 0;
-	}
-	
-	/**
-	 * Note: This method is for internal use only. Clients are not allowed to call this method.
-	 * 
-	 * @param api internal instance to avoid access from external clients
-	 * @param change the change to set
-	 */
-	public final void internalSetChange(InternalAPI api, Change change){
-		Assert.isNotNull(api);
-		IPreviewWizardPage page= (IPreviewWizardPage)getPage(IPreviewWizardPage.PAGE_NAME);
-		if (page != null)
-			page.setChange(change);
-		fChange= change;
-	}
-
-	/**
-	 * Note: This method is for internal use only. Clients are not allowed to call this method.
-	 * 
-	 * @param api internal instance to avoid access from external clients
-	 * @param shown a boolean indicating if the preview page has been shown or not
-	 */
-	public final void internalSetPreviewShown(InternalAPI api, boolean shown) {
-		Assert.isNotNull(api);
-		fPreviewShown= shown;
-		getContainer().updateButtons();
-	}
-	
-	/**
-	 * Note: This method is for internal use only. Clients are not allowed to call this method.
-	 * 
-	 * @param api internal instance to avoid access from external clients
-	 * @return whether to show a back button or not
-	 */
-	public final boolean internalShowBackButtonOnStatusDialog(InternalAPI api) {
-		Assert.isNotNull(api);
-		return (fFlags & NO_BACK_BUTTON_ON_STATUS_DIALOG) == 0;
-	}
-	
-	//---- Helper methods to check style bits --------------------------------------------
-	
-	private boolean checkActivationOnOpen() {
-		return (fFlags & CHECK_INITIAL_CONDITIONS_ON_OPEN) != 0;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizardOpenOperation.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizardOpenOperation.java
deleted file mode 100644
index 4b17198..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizardOpenOperation.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.IJobManager;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.ui.refactoring.Assert;
-import org.eclipse.ltk.internal.ui.refactoring.ExceptionHandler;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringUIMessages;
-import org.eclipse.ltk.internal.ui.refactoring.WorkbenchRunnableAdapter;
-
-/**
- * A helper class to open a refactoring wizard dialog. The class first checks
- * the initial conditions of the refactoring and depending on its outcome
- * the wizard dialog or an error dialog is shown.
- * <p> 
- * Note: this class is not intended to be extended by clients.
- * </p>
- * 
- * @since 3.0 
- */ 
-public class RefactoringWizardOpenOperation {
-
-	private RefactoringWizard fWizard;
-	private RefactoringStatus fInitialConditions;
-	
-	/**
-	 * Constant (value 1025) indicating that the precondition check failed
-	 * when opening a refactoring wizard dialog.
-	 * 
-	 * @see #run(Shell, String)
-	 */
-	public static final int INITIAL_CONDITION_CHECKING_FAILED= IDialogConstants.CLIENT_ID + 1;
-	
-	/**
-	 * Creates a new refactoring wizard starter for the given wizard.
-	 * 
-	 * @param wizard the wizard to open a dialog for
-	 */
-	public RefactoringWizardOpenOperation(RefactoringWizard wizard) {
-		Assert.isNotNull(wizard);
-		fWizard= wizard;
-	}
-	
-	/**
-	 * Returns the outcome of the initial condition checking.
-	 * 
-	 * @return the outcome of the initial condition checking or <code>null</code>
-	 *  if the condition checking hasn't been performed yet
-	 */
-	public RefactoringStatus getInitialConditionCheckingStatus() {
-		return fInitialConditions;
-	}
-	
-	/**
-	 * Opens the refactoring dialog for the refactoring wizard passed to the constructor. 
-	 * The method first checks the initial conditions of the refactoring. If the condition 
-	 * checking returns a status with a severity of {@link RefactoringStatus#FATAL} then
-	 * a message dialog is opened containing the corresponding status message. No wizard 
-	 * dialog is opened in this situation. If the condition checking passes then the 
-	 * refactoring dialog is opened. 
-	 * 
-	 * @param parent the parent shell for the dialog or <code>null</code> if the dialog
-	 *  is a top level dialog
-	 * @param dialogTitle the dialog title of the message box presenting the failed
-	 *  condition check (if any)
-	 *   
-	 * @return {@link #INITIAL_CONDITION_CHECKING_FAILED} if the initial condition checking
-	 *  failed and no wizard dialog was presented. Otherwise either {@link IDialogConstants#OK_ID}
-	 *  or {@link IDialogConstants#CANCEL_ID} is returned depending on whether the user
-	 *  has pressed the OK or cancel button on the wizard dialog.
-	 * 
-	 * @throws InterruptedException if the initial condition checking got cancelled by
-	 *  the user.
-	 */
-	public int run(final Shell parent, final String dialogTitle) throws InterruptedException {
-		Assert.isNotNull(dialogTitle);
-		final Refactoring refactoring= fWizard.getRefactoring();
-		final IJobManager manager= Platform.getJobManager();
-		final int[] result= new int[1];
-		final InterruptedException[] canceled= new InterruptedException[1];
-		Runnable r= new Runnable() {
-			public void run() {
-				try {
-					// we are getting the block dialog for free if we pass in null
-					manager.suspend(ResourcesPlugin.getWorkspace().getRoot(), null);
-					
-					refactoring.setValidationContext(parent);
-					fInitialConditions= checkInitialConditions(refactoring, parent, dialogTitle);
-					if (fInitialConditions.hasFatalError()) {
-						String message= fInitialConditions.getMessageMatchingSeverity(RefactoringStatus.FATAL);
-						MessageDialog.openInformation(parent, dialogTitle, message);
-						result[0]= INITIAL_CONDITION_CHECKING_FAILED;
-						return;
-					} else {
-						fWizard.setInitialConditionCheckingStatus(fInitialConditions);
-						Dialog dialog= RefactoringUI.createRefactoringWizardDialog(fWizard, parent);
-						result[0]= dialog.open();
-						return;
-					} 
-				} catch (InterruptedException e) {
-					canceled[0]= e;
-				} catch (OperationCanceledException e) {
-					canceled[0]= new InterruptedException(e.getMessage());
-				} finally {
-					manager.resume(ResourcesPlugin.getWorkspace().getRoot());
-					refactoring.setValidationContext(null);
-				}		
-			}
-		};
-		BusyIndicator.showWhile(parent.getDisplay(), r);
-		if (canceled[0] != null)
-			throw canceled[0];
-		return result[0];
-	}
-	
-	//---- private helper methods -----------------------------------------------------------------
-	
-	private RefactoringStatus checkInitialConditions(Refactoring refactoring, Shell parent, String title) throws InterruptedException {		
-		try {
-			CheckConditionsOperation cco= new CheckConditionsOperation(refactoring, CheckConditionsOperation.INITIAL_CONDITONS);
-			IProgressService service= PlatformUI.getWorkbench().getProgressService();
-			service.busyCursorWhile(new WorkbenchRunnableAdapter(cco, ResourcesPlugin.getWorkspace().getRoot()));
-			return cco.getStatus();
-		} catch (InvocationTargetException e) {
-			ExceptionHandler.handle(e, parent, title, 
-				RefactoringUIMessages.getString("RefactoringUI.open.unexpected_exception"));//$NON-NLS-1$
-			return RefactoringStatus.createFatalErrorStatus(
-				RefactoringUIMessages.getString("RefactoringUI.open.unexpected_exception"));//$NON-NLS-1$
-		}
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizardPage.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizardPage.java
deleted file mode 100644
index c396df7..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/RefactoringWizardPage.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardPage;
-
-import org.eclipse.ltk.core.refactoring.Refactoring;
-
-/**
- * An abstract base implementation of a refactoring wizard page. The class
- * provides access to the refactoring wizard and to the refactoring itself.
- * Refactoring wizard pages can only be added to a
- * {@link org.eclipse.ltk.ui.refactoring.RefactoringWizard RefactoringWizard}.
- * Adding them to a normal {@linkplain org.eclipse.jface.wizard.Wizard wizard}
- * result in an exception.
- * <p> 
- * Note: this class is not intended to be subclassed by clients. Clients should
- * extend {@link org.eclipse.ltk.ui.refactoring.UserInputWizardPage}.
- * </p>
- * 
- * @see RefactoringWizard
- * @see org.eclipse.ltk.core.refactoring.Refactoring
- */
-public abstract class RefactoringWizardPage extends WizardPage {
-
-	public static final String REFACTORING_SETTINGS= "org.eclipse.ltk.ui.refactoring.settings"; //$NON-NLS-1$
-
-	/**
-	 * Creates a new refactoring wizard page.
-	 * 
-	 * @param name the page's name.
-	 * @see org.eclipse.jface.wizard.IWizardPage#getName()
-	 */
-	protected RefactoringWizardPage(String name) {
-		super(name);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * This method asserts that the wizard passed as a parameter is of 
-	 * type <code>RefactoringWizard</code>.
-	 */
-	public void setWizard(IWizard newWizard) {
-		Assert.isTrue(newWizard instanceof RefactoringWizard);
-		super.setWizard(newWizard);
-	}
-
-	/**
-	 * Returns the refactoring associated with this wizard page. Returns
-	 * <code>null</code> if the page isn't been added to any refactoring
-	 * wizard yet.
-	 * 
-	 * @return the refactoring associated with this refactoring wizard page
-	 *  or <code>null</code>
-	 */
-	protected Refactoring getRefactoring() {
-		RefactoringWizard wizard= getRefactoringWizard();
-		if (wizard == null)
-			return null;
-		return wizard.getRefactoring();
-	}
-	
-	/**
-	 * Returns the page's refactoring wizard.
-	 * 
-	 * @return the page's refactoring wizard or <code>null</code> if
-	 *  the wizard hasn't been set yet
-	 */
-	protected RefactoringWizard getRefactoringWizard() {
-		return (RefactoringWizard)getWizard();
-	}
-	
-	/**
-	 * Performs any actions appropriate in response to the user having pressed
-	 * the Finish button, or refuse if finishing now is not permitted. This
-	 * method is called by the refactoring wizard on the currently active
-	 * refactoring wizard page.
-	 * 
-	 * @return <code>true</code> to indicate the finish request was accepted,
-	 *         and <code>false</code> to indicate that the finish request was
-	 *         refused
-	 */
-	protected boolean performFinish() {
-		return true;
-	}
-	
-	/**
-	 * Returns the refactoring wizard's dialog settings.
-	 * 
-	 * @return the refactoring wizard's dialog settings or <code>null</code>
-	 *  if no settings are associated with the refactoring wizard dialog
-	 */
-	protected IDialogSettings getRefactoringSettings() {
-		IDialogSettings settings= getDialogSettings();
-		if (settings == null)
-			return null;
-		IDialogSettings result= settings.getSection(REFACTORING_SETTINGS);
-		if (result == null) {
-			result= new DialogSettings(REFACTORING_SETTINGS);
-			settings.addSection(result); 
-		}
-		return result;
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/TextStatusContextViewer.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/TextStatusContextViewer.java
deleted file mode 100644
index 0905586..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/TextStatusContextViewer.java
+++ /dev/null

@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.source.SourceViewer;
-
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringUIMessages;
-
-/**
- * An abstract base implementation of a status context viewer that presents
- * textual context information.
- * <p>
- * Subclasses need to implement {@link #createSourceViewer(Composite)} to create
- * the correct source viewer. They should use the method {@link #updateTitle(IAdaptable)}
- * and {@link #setInput(IDocument, IRegion)} to set the title text and image and to
- * populate the source viewer.
- * </p>
- * 
- * @since 3.0
- */
-public abstract class TextStatusContextViewer implements IStatusContextViewer {
-
-	private SourceViewer fSourceViewer;
-	private ViewForm fForm;
-	private CLabel fLabel;
-	private Image fPaneImage;
-
-	/**
-	 * Returns the internal source viewer.
-	 * 
-	 * @return the internal source viewer or <code>null</code> if the
-	 *  source viewer hasn't been created yet
-	 */
-	protected SourceViewer getSourceViewer() {
-		return fSourceViewer;
-	}
-	
-	/**
-	 * Hook to create the source viewer used to present the textual context
-	 * information.
-	 * 
-	 * @param parent the composite to be used as the source viewer's
-	 *  parent
-	 * @return the source viewer to be used
-	 */
-	protected abstract SourceViewer createSourceViewer(Composite parent);
-
-	//---- Helper methods to populate viewer -------------------------------
-
-	/**
-	 * Updates the title image and text of the pane surrounding the source
-	 * viewer. The image and text is determined by retrieving the <code>
-	 * IWorkbenchAdapter</code> for the given element. If the element doen't
-	 * provide a <code>IWorkbenchAdapter</code> or if the element is <code>
-	 * null</code> the image is reseted and a default label is shown.  
-	 * 
-	 * @param element the element providing the image and label for the title.
-	 *  Can be <code>null</code> to reset the image and text
-	 */
-	protected void updateTitle(IAdaptable element) {
-		String title= null;
-		ImageDescriptor imageDescriptor= null;
-		if (element != null) {
-			IWorkbenchAdapter adapter= (IWorkbenchAdapter)element.getAdapter(IWorkbenchAdapter.class);
-			if (adapter != null) {
-				title= adapter.getLabel(element);
-				imageDescriptor= adapter.getImageDescriptor(element);
-			}
-		}
-		if (title == null || title.length() == 0)
-			title= RefactoringUIMessages.getString("RefactoringStatusViewer.Problem_context"); //$NON-NLS-1$
-		fLabel.setText(title);
-		if (fPaneImage != null) {
-			fPaneImage.dispose();
-			fPaneImage= null;
-		}
-		if (imageDescriptor != null) {
-			fPaneImage= imageDescriptor.createImage(getControl().getDisplay());
-		}
-		fLabel.setImage(fPaneImage);
-	}
-	
-	/**
-	 * Sets the input of the source viewer to the given document and reveals the
-	 * region determined by the given parameter region.
-	 * 
-	 * @param document the document to present
-	 * @param region the region to reveal.
-	 */
-	protected void setInput(IDocument document, IRegion region) {
-		Control ctrl= getControl();
-		if (ctrl != null && ctrl.isDisposed())
-			ctrl= null;
-		try {
-			if (ctrl != null)
-				ctrl.setRedraw(false);
-			fSourceViewer.setInput(document);
-			if (region != null && document != null) {
-				int offset= region.getOffset();
-				int length= region.getLength();
-				if (offset >= 0 && length >= 0) {
-					fSourceViewer.setSelectedRange(offset, length);
-					fSourceViewer.revealRange(offset, length);
-				}
-			}
-		} finally {
-			if (ctrl != null)
-				ctrl.setRedraw(true);
-		}
-	}
-	
-	//---- Methods defined in IStatusContextViewer -------------------------------
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void createControl(Composite parent) {
-		fForm= new ViewForm(parent, SWT.BORDER | SWT.FLAT);
-		fForm.marginWidth= 0;
-		fForm.marginHeight= 0;
-		fLabel= new CLabel(fForm, SWT.NONE);
-		fForm.setTopLeft(fLabel);
-		fForm.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				if (fPaneImage != null)
-					fPaneImage.dispose();
-			}
-		});
-		
-		fSourceViewer= createSourceViewer(fForm);
-		fSourceViewer.setEditable(false);
-		fForm.setContent(fSourceViewer.getControl());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Control getControl() {
-		return fForm;
-	}
-}
-

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/UndoRefactoringAction.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/UndoRefactoringAction.java
deleted file mode 100644
index 0b43ee5..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/UndoRefactoringAction.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ltk.ui.refactoring;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.IValidationCheckResultQuery;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.UndoManagerAdapter;
-import org.eclipse.ltk.internal.ui.refactoring.RefactoringUIMessages;
-import org.eclipse.ltk.internal.ui.refactoring.UndoManagerAction;
-
-/**
- * The refactoring undo action. When executed the action performs 
- * the top most change from the refactoring undo manager's undo
- * stack.
- * <p>
- * The action is typically added to a global refactoring menu via
- * the <code>org.eclipse.ui.actionSets</code> extension point.
- * </p>
- * <p>
- * Note: this class isn't intended to be subclassed. Clients are only
- * allowed to instantiate the class or to reference it from an action 
- * set.
- * </p>
- *  
- * @since 3.0
- */
-public class UndoRefactoringAction extends UndoManagerAction implements IWorkbenchWindowActionDelegate {
-
-	private int fPatternLength;
-
-	/**
-	 * Creates a new undo refactoring action.
-	 */
-	public UndoRefactoringAction() {
-	}
-
-	/* (non-Javadoc)
-	 * Method declared in UndoManagerAction
-	 */
-	protected String getName() {
-		// PR: 1GEWDUH: ITPJCORE:WINNT - Refactoring - Unable to undo refactor change
-		return RefactoringUIMessages.getString("UndoRefactoringAction.name"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in UndoManagerAction
-	 */
-	protected IRunnableWithProgress createOperation(Shell parent) {
-		final IValidationCheckResultQuery query= new Query(parent, RefactoringUIMessages.getString("UndoRefactoringAction.error.title")) { //$NON-NLS-1$
-			protected String getFullMessage(String errorMessage) {
-				return RefactoringUIMessages.getFormattedString(
-					"UndoRefactoringAction.error.message",  //$NON-NLS-1$
-					errorMessage);
-			}
-		};
-		return new IRunnableWithProgress(){
-			public void run(IProgressMonitor pm) throws InvocationTargetException {
-				try {
-					RefactoringCore.getUndoManager().performUndo(query, pm);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);			
-				}
-			}
-		};
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in UndoManagerAction
-	 */
-	protected UndoManagerAdapter createUndoManagerListener() {
-		return new UndoManagerAdapter() {
-			public void undoStackChanged(IUndoManager manager) {
-				IAction action= getAction();
-				if (action == null)
-					return;
-				boolean enabled= false;
-				String text= null;
-				if (manager.anythingToUndo()) {
-					enabled= true;
-					text= getActionText();
-				} else {
-					text= RefactoringUIMessages.getString("UndoRefactoringAction.label"); //$NON-NLS-1$
-				}
-				action.setEnabled(enabled);
-				action.setText(text);
-			}
-		};
-	}	
-	
-	/* (non-Javadoc)
-	 * Method declared in IActionDelegate
-	 */
-	public void selectionChanged(IAction action, ISelection s) {
-		if (!isHooked()) {
-			hookListener(action);
-			fPatternLength= RefactoringUIMessages.getString("UndoRefactoringAction.extendedLabel").length(); //$NON-NLS-1$
-			IUndoManager undoManager = RefactoringCore.getUndoManager();
-			if (undoManager.anythingToUndo()) {
-				if (undoManager.peekUndoName() != null)
-					action.setText(getActionText());
-				action.setEnabled(true);
-			} else {
-				action.setEnabled(false);
-			}
-		}
-	}	
-	
-	private String getActionText() {
-		return shortenText(RefactoringUIMessages.getFormattedString(
-			"UndoRefactoringAction.extendedLabel", //$NON-NLS-1$
-			RefactoringCore.getUndoManager().peekUndoName()), fPatternLength);
-	}	
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/UserInputWizardPage.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/UserInputWizardPage.java
deleted file mode 100644
index fb9b8cd..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/UserInputWizardPage.java
+++ /dev/null

@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ltk.ui.refactoring;
-
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.jface.wizard.IWizardPage;
-
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.internal.ui.refactoring.ErrorWizardPage;
-import org.eclipse.ltk.internal.ui.refactoring.FinishResult;
-import org.eclipse.ltk.internal.ui.refactoring.InternalAPI;
-import org.eclipse.ltk.internal.ui.refactoring.UIPerformChangeOperation;
-
-/**
- * An abstract wizard page that is to be used to implement user input pages presented 
- * inside a {@link org.eclipse.ltk.ui.refactoring.RefactoringWizard refactoring wizard}.
- * User input pages are shown at the beginning of a wizard. As soon as the last input
- * page is left the refactoring's condition checking is performed. Depending on the 
- * outcome an error page or the preview page is shown. 
- * <p>
- * Clients may extend this class.
- * </p>
- * @since 3.0
- */
-public abstract class UserInputWizardPage extends RefactoringWizardPage {
-
-	private boolean fIsLastUserInputPage;
-	
-	/**
-	 * Creates a new user input page.
-	 * @param name the page's name.
-	 */
-	public UserInputWizardPage(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Returns <code>true</code> if this is the last user input page in the stack
-	 * of input pages; <code>false</code> otherwise. The last user input page is not
-	 * necessarily the page after which the refactoring's precondition has to be
-	 * triggered. For wizards implementing a dynamic work flow, this may happen for
-	 * other pages as well.
-	 * 
-	 * @return whether this is the last user input page or not.
-	 */
-	public boolean isLastUserInputPage() {
-		return fIsLastUserInputPage;
-	}
-	
-	/**
-	 * Triggers the refactoring's condition checking and returns either the
-	 * error wizard page or a preview page, depending on the outcome of the
-	 * precondition checking.
-	 * 
-	 * @return either the error or the preview page, depending on the refactoring's
-	 *  precondition checking
-	 */
-	protected final IWizardPage computeSuccessorPage() {
-		return getRefactoringWizard().computeUserInputSuccessorPage(this, getContainer());
-	}
-
-	/**
-	 * Sets the page's complete status depending on the given <tt>
-	 * ReactoringStatus</tt>.
-	 * 
-	 * @param status the <tt>RefactoringStatus</tt>
-	 */
-	public void setPageComplete(RefactoringStatus status) {
-		getRefactoringWizard().setConditionCheckingStatus(status);
-
-		int severity= status.getSeverity();
-		if (severity == RefactoringStatus.FATAL){
-			setPageComplete(false);
-			setErrorMessage(status.getMessageMatchingSeverity(severity));	
-		} else {
-			setPageComplete(true);
-			setErrorMessage(null);
-			if (severity == RefactoringStatus.OK)
-				setMessage(null, NONE);
-			else	
-				setMessage(status.getMessageMatchingSeverity(severity), getCorrespondingIStatusSeverity(severity));	
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setVisible(boolean visible) {
-		if (visible)
-			getRefactoringWizard().internalSetChange(InternalAPI.INSTANCE, null);
-		super.setVisible(visible);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public IWizardPage getNextPage() {
-		if (fIsLastUserInputPage) 
-			return computeSuccessorPage();
-		else
-			return super.getNextPage();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean canFlipToNextPage() {
-		if (fIsLastUserInputPage) {
-			// we can't call getNextPage to determine if flipping is allowed since computing
-			// the next page is quite expensive (checking preconditions and creating a
-			// change). So we say yes if the page is complete.
-			return isPageComplete();
-		} else {
-			return super.canFlipToNextPage();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	protected boolean performFinish() {
-		RefactoringWizard wizard= getRefactoringWizard();
-		int threshold= RefactoringCore.getConditionCheckingFailedSeverity();
-		RefactoringStatus activationStatus= wizard.getInitialConditionCheckingStatus();
-		RefactoringStatus inputStatus= null;
-		RefactoringStatus status= new RefactoringStatus();
-		Refactoring refactoring= getRefactoring();
-		
-		if (activationStatus != null && activationStatus.getSeverity() >= threshold) {
-			if (!activationStatus.hasFatalError())
-				inputStatus= wizard.checkFinalConditions();
-		} else {
-			CreateChangeOperation create= new CreateChangeOperation(
-				new CheckConditionsOperation(refactoring, CheckConditionsOperation.FINAL_CONDITIONS),
-				threshold);
-			PerformChangeOperation perform= new UIPerformChangeOperation(getShell().getDisplay(), create, getContainer());
-			
-			FinishResult result= wizard.internalPerformFinish(InternalAPI.INSTANCE, perform);
-			wizard.internalSetChange(InternalAPI.INSTANCE, create.getChange());
-			if (result.isException())
-				return true;
-			if (result.isInterrupted())
-				return false;
-			inputStatus= new RefactoringStatus();
-			inputStatus.merge(create.getConditionCheckingStatus());
-			RefactoringStatus validationStatus= perform.getValidationStatus();
-			// only merge this in if we have a fatal error. In all other cases
-			// the change got executed
-			if (validationStatus != null && validationStatus.hasFatalError())
-				inputStatus.merge(perform.getValidationStatus());
-		}
-		
-		status.merge(activationStatus);
-		status.merge(inputStatus);
-		
-		if (status.getSeverity() >= threshold) {
-			wizard.setConditionCheckingStatus(status);
-			IWizardPage nextPage= wizard.getPage(ErrorWizardPage.PAGE_NAME);
-			wizard.getContainer().showPage(nextPage);
-			return false;
-		}
-		
-		return true;	
-	}
-	
-	/* package */ void markAsLastUserInputPage() {
-		fIsLastUserInputPage= true;
-	}
-	
-	private static int getCorrespondingIStatusSeverity(int severity) {
-		if (severity == RefactoringStatus.FATAL)
-			return IStatus.ERROR;
-		if (severity == RefactoringStatus.ERROR)
-			return IStatus.WARNING;
-		if (severity == RefactoringStatus.WARNING)
-			return IStatus.WARNING;
-		if (severity == RefactoringStatus.INFO)
-			return IStatus.INFO;
-		return IStatus.OK;			
-	}
-}

diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/package.html b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/package.html
deleted file mode 100644
index fe1745a..0000000
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/package.html
+++ /dev/null

@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-                    
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-                    
-  <meta name="Author" content="IBM">
-                    
-  <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-  <title>Package-level Javadoc</title>
-    
-</head>
-<body>
-Application programmer interface to implement a wizard based user interface for refactorings.
-</body>
-</html>

diff --git a/org.junit/.classpath b/org.junit/.classpath
deleted file mode 100644
index e0b26de..0000000
--- a/org.junit/.classpath
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry exported="true" kind="lib" path="junit.jar" sourcepath="/org.junit/junitsrc.zip"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="output" path=""/>
-</classpath>

diff --git a/org.junit/.project b/org.junit/.project
deleted file mode 100644
index 29a06e7..0000000
--- a/org.junit/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.junit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.junit/about.html b/org.junit/about.html
deleted file mode 100644
index 173b5b1..0000000
--- a/org.junit/about.html
+++ /dev/null

@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>29th March, 2004</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as follows:</p>
-
-<p><b>JUnit 3.8.1</b></p>
-
-<p>The plug-in is accompanied by software developed by JUnit.org.  The JUnit 3.8.1 code included with the plug-in includes no modifications.
-Your use of JUnit 3.8.1 in both source and binary code form contained in the plug-in is subject to the terms and conditions of the CPL.
-The binary code is located in junit.jar and the source code is located in src.jar.</p>
-
-<p>i) IBM effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;</p>
-
-<p>ii) IBM effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;</p>
-
-<p>iii) IBM states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.junit/build.properties b/org.junit/build.properties
deleted file mode 100644
index c308cec..0000000
--- a/org.junit/build.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               junit.jar
-               
-src.includes = *.zip,about.html
-
-

diff --git a/org.junit/junit.jar b/org.junit/junit.jar
deleted file mode 100644
index 674d71e..0000000
--- a/org.junit/junit.jar
+++ /dev/null
Binary files differ

diff --git a/org.junit/junitsrc.zip b/org.junit/junitsrc.zip
deleted file mode 100644
index 8804909..0000000
--- a/org.junit/junitsrc.zip
+++ /dev/null
Binary files differ

diff --git a/org.junit/plugin.properties b/org.junit/plugin.properties
deleted file mode 100644
index 7e995ae..0000000
--- a/org.junit/plugin.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName=JUnit Testing Framework
-providerName=Eclipse.org

diff --git a/org.junit/plugin.xml b/org.junit/plugin.xml
deleted file mode 100644
index 83150ac..0000000
--- a/org.junit/plugin.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-  name="%pluginName"
-  id="org.junit"
-  version="3.8.1"
-  provider-name="%providerName">
-
-  <runtime>
-    <library name="junit.jar">
-      <export name="*"/>
-    </library>
-  </runtime>
-</plugin>

diff --git a/org.junit/scripts/exportplugin.xml b/org.junit/scripts/exportplugin.xml
deleted file mode 100644
index 5574c67..0000000
--- a/org.junit/scripts/exportplugin.xml
+++ /dev/null

@@ -1,26 +0,0 @@
-<!-- build script to create JUnit Plugin -->
-<project name="org.junit" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.junit" />
-		<property name="dest"  value="${destdir}/${plugin}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-
-		<copy file="junit.jar" todir="${dest}"/>
-		<copy file="junitsrc.zip" todir="${dest}"/>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="about.html" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-				
-	</target>
-</project>
commit	b172d9f9511cd18238f650ce4b73ffd32df67ec7	[log] [tgz]
author	cvs2svn <platform-releng-dev@eclipse.org>	Thu Sep 23 14:34:56 2004 +0000
committer	cvs2svn <platform-releng-dev@eclipse.org>	Thu Sep 23 14:34:56 2004 +0000
tree	d5db9539ef6c86677780e30c124dfb65cc69dc3f
parent	a222b4f61e4f2706e670c8cef9e6f52494012de3 [diff]